[Emacs-diffs] trunk r114302: * xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114302
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-16 15:23:03 +0400
message:
  * xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.
  (ignore_next_mouse_click_timeout): Use Time as X does.
  (handle_one_xevent): Avoid cast and use unsigned comparison.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-16 10:41:41 +0000
+++ b/src/ChangeLog     2013-09-16 11:23:03 +0000
@@ -1,5 +1,11 @@
 2013-09-16  Dmitry Antipov  <address@hidden>
 
+       * xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.
+       (ignore_next_mouse_click_timeout): Use Time as X does.
+       (handle_one_xevent): Avoid cast and use unsigned comparison.
+
+2013-09-16  Dmitry Antipov  <address@hidden>
+
        Do not copy X event in handle_one_xevent except KeyPress case.
        Wnen XEvent is processed, it is unlikely to be changed except
        KeyPress case, so we can avoid copying and use const pointer to

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-09-16 10:41:41 +0000
+++ b/src/xterm.c       2013-09-16 11:23:03 +0000
@@ -160,20 +160,21 @@
 static struct frame *pending_autoraise_frame;
 
 #ifdef USE_X_TOOLKIT
+
 /* The application context for Xt use.  */
 XtAppContext Xt_app_con;
 static String Xt_default_resources[] = {0};
 
 /* Non-zero means user is interacting with a toolkit scroll bar.  */
+static bool toolkit_scroll_bar_interaction;
 
-static int toolkit_scroll_bar_interaction;
 #endif /* USE_X_TOOLKIT */
 
 /* Non-zero timeout value means ignore next mouse click if it arrives
    before that timeout elapses (i.e. as part of the same sequence of
    events resulting from clicking on a frame to select it).  */
 
-static unsigned long ignore_next_mouse_click_timeout;
+static Time ignore_next_mouse_click_timeout;
 
 /* Mouse movement.
 
@@ -6893,7 +6894,7 @@
                   if (ignore_next_mouse_click_timeout)
                     {
                       if (event->type == ButtonPress
-                          && (int)(event->xbutton.time - 
ignore_next_mouse_click_timeout) > 0)
+                          && event->xbutton.time > 
ignore_next_mouse_click_timeout)
                         {
                           ignore_next_mouse_click_timeout = 0;
                           construct_mouse_click (&inev.ie, &event->xbutton, f);