summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2007-08-17 07:52:08 +0000
committerJan Djärv <jan.h.d@swipnet.se>2007-08-17 07:52:08 +0000
commita33f5759a6c9f28882db8495ccff32748795dfd0 (patch)
tree921d9b91198fafa7d53c16ea8fe23f1bcc47a0b3
parent912651fc0caeb9b205042b627626f97bb8d8caa6 (diff)
downloademacs-a33f5759a6c9f28882db8495ccff32748795dfd0.tar.gz
(handle_one_xevent): Remove check that mouse click is in
active frame.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c40
2 files changed, 25 insertions, 20 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 42e5866f88c..89267c92f0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-17 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
+
+ * xterm.c (handle_one_xevent): Remove check that mouse click is in
+ active frame.
+
2007-08-15 Philippe Waroquiers <philippe.waroquiers@eurocontrol.int>
* term.c (tty_default_color_capabilities): Declare static
diff --git a/src/xterm.c b/src/xterm.c
index 512fff35f50..6c58cc39fd2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6751,7 +6751,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
f = last_mouse_frame;
else
f = x_window_to_frame (dpyinfo, event.xbutton.window);
-
+ if (event.type == ButtonPress)
+ {
+ static int xxx = 0;
+ fprintf (stderr, "%d, F: %p\n", xxx++, f);
+ }
if (f)
{
/* Is this in the tool-bar? */
@@ -6777,27 +6781,23 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
}
if (!tool_bar_p)
- if (!dpyinfo->x_focus_frame
- || f == dpyinfo->x_focus_frame)
- {
#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
- if (! popup_activated ())
+ if (! popup_activated ())
#endif
- {
- if (ignore_next_mouse_click_timeout)
- {
- if (event.type == ButtonPress
- && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0)
- {
- ignore_next_mouse_click_timeout = 0;
- construct_mouse_click (&inev.ie, &event.xbutton, f);
- }
- if (event.type == ButtonRelease)
- ignore_next_mouse_click_timeout = 0;
- }
- else
- construct_mouse_click (&inev.ie, &event.xbutton, f);
- }
+ {
+ if (ignore_next_mouse_click_timeout)
+ {
+ if (event.type == ButtonPress
+ && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0)
+ {
+ ignore_next_mouse_click_timeout = 0;
+ construct_mouse_click (&inev.ie, &event.xbutton, f);
+ }
+ if (event.type == ButtonRelease)
+ ignore_next_mouse_click_timeout = 0;
+ }
+ else
+ construct_mouse_click (&inev.ie, &event.xbutton, f);
}
}
else