procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-09-16 13:35:45 +02:00
commit 2f3ee26f12
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2013-09-16 Dmitry Antipov <dmantipov@yandex.ru>
* 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 <dmantipov@yandex.ru>
Do not copy X event in handle_one_xevent except KeyPress case.

7
src/xterm.c
View file

@ -163,20 +163,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.
@ -6902,7 +6903,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);