aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2007-08-17 07:55:25 +0000
committerJan Djärv2007-08-17 07:55:25 +0000
commite8953ebf985f5a1e8033c56f07f0a47ab3beb089 (patch)
treeeeab9f09c1129bf8b5691bc4c27a96cc84fd50ce /src
parent5757dd514dd8b797e57c01fb0710c59a4952395f (diff)
downloademacs-e8953ebf985f5a1e8033c56f07f0a47ab3beb089.tar.gz
emacs-e8953ebf985f5a1e8033c56f07f0a47ab3beb089.zip
(handle_one_xevent): Remove check that mouse click is in
active frame.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c34
2 files changed, 20 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7909260228e..86a6ad61d2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-08-17 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xterm.c (handle_one_xevent): Remove check that mouse click is in
4 active frame.
5
12007-08-16 Richard Stallman <rms@gnu.org> 62007-08-16 Richard Stallman <rms@gnu.org>
2 7
3 * eval.c (Fcommandp): Add parens to clarify. 8 * eval.c (Fcommandp): Add parens to clarify.
diff --git a/src/xterm.c b/src/xterm.c
index a5bb506f035..fdff9b4f02e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6853,27 +6853,23 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
6853 } 6853 }
6854 6854
6855 if (!tool_bar_p) 6855 if (!tool_bar_p)
6856 if (!dpyinfo->x_focus_frame
6857 || f == dpyinfo->x_focus_frame)
6858 {
6859#if defined (USE_X_TOOLKIT) || defined (USE_GTK) 6856#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
6860 if (! popup_activated ()) 6857 if (! popup_activated ())
6861#endif 6858#endif
6862 { 6859 {
6863 if (ignore_next_mouse_click_timeout) 6860 if (ignore_next_mouse_click_timeout)
6864 { 6861 {
6865 if (event.type == ButtonPress 6862 if (event.type == ButtonPress
6866 && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) 6863 && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0)
6867 { 6864 {
6868 ignore_next_mouse_click_timeout = 0; 6865 ignore_next_mouse_click_timeout = 0;
6869 construct_mouse_click (&inev.ie, &event.xbutton, f); 6866 construct_mouse_click (&inev.ie, &event.xbutton, f);
6870 } 6867 }
6871 if (event.type == ButtonRelease) 6868 if (event.type == ButtonRelease)
6872 ignore_next_mouse_click_timeout = 0; 6869 ignore_next_mouse_click_timeout = 0;
6873 } 6870 }
6874 else 6871 else
6875 construct_mouse_click (&inev.ie, &event.xbutton, f); 6872 construct_mouse_click (&inev.ie, &event.xbutton, f);
6876 }
6877 } 6873 }
6878 } 6874 }
6879 else 6875 else