From 83a119f8d892a790b25bd0d856df82fb25b0ba72 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 16 Sep 2013 15:23:03 +0400 Subject: [PATCH] * 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. --- src/ChangeLog | 6 ++++++ src/xterm.c | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4b862f27a02..d53f1414917 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-09-16 Dmitry Antipov + + * 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 Do not copy X event in handle_one_xevent except KeyPress case. diff --git a/src/xterm.c b/src/xterm.c index 830fe05e3b8..89f543abca6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -160,20 +160,21 @@ Lisp_Object x_display_name_list; 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 @@ handle_one_xevent (struct x_display_info *dpyinfo, 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); -- 2.39.2