From 24aad44185871b6e1cd36265b10639bed9b97f1a Mon Sep 17 00:00:00 2001
From: Kim F. Storm
Date: Fri, 3 Jun 2005 23:02:03 +0000
Subject: (handle_one_xevent): Also ignore mouse motion just before a button
 release event.

---
 src/xterm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/xterm.c')

diff --git a/src/xterm.c b/src/xterm.c
index 4f9081425f3..8612d53fbee 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6776,12 +6776,6 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           {
             dpyinfo->grabbed |= (1 << event.xbutton.button);
             last_mouse_frame = f;
-            /* Ignore any mouse motion that happened
-               before this event; any subsequent mouse-movement
-               Emacs events should reflect only motion after
-               the ButtonPress.  */
-            if (f != 0)
-              f->mouse_moved = 0;
 
             if (!tool_bar_p)
               last_tool_bar_item = -1;
@@ -6789,6 +6783,12 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
         else
           dpyinfo->grabbed &= ~(1 << event.xbutton.button);
 
+	/* Ignore any mouse motion that happened before this event;
+	   any subsequent mouse-movement Emacs events should reflect
+	   only motion after the ButtonPress/Release.  */
+	if (f != 0)
+	  f->mouse_moved = 0;
+
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
         f = x_menubar_window_to_frame (dpyinfo, event.xbutton.window);
         /* For a down-event in the menu bar,
-- 
cgit v1.2.1


From 9cfc7da4248c20530326ba688dae2db837cf1ab8 Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Mon, 6 Jun 2005 21:27:50 +0000
Subject: (x_create_toolkit_scroll_bar): Use XtNarrowScrollbars if available.

---
 src/xterm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/xterm.c')

diff --git a/src/xterm.c b/src/xterm.c
index 8612d53fbee..4ab555974db 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4589,11 +4589,14 @@ x_create_toolkit_scroll_bar (f, bar)
     char *initial = "";
     char *val = initial;
     XtVaGetValues (widget, XtNscrollVCursor, (XtPointer) &val,
+#ifdef XtNarrowScrollbars
+		   XtNarrowScrollbars, (XtPointer) &xaw3d_arrow_scroll,
+#endif
 		   XtNpickTop, (XtPointer) &xaw3d_pick_top, NULL);
-    if (val == initial)
+    if (xaw3d_arrow_scroll || val == initial)
       {	/* ARROW_SCROLL */
 	xaw3d_arrow_scroll = True;
-	/* Isn't that just a personal preference ?   -sm */
+	/* Isn't that just a personal preference ?   --Stef */
 	XtVaSetValues (widget, XtNcursorName, "top_left_arrow", NULL);
       }
   }
-- 
cgit v1.2.1