aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-07-27 16:08:03 +0300
committerEli Zaretskii2013-07-27 16:08:03 +0300
commite95da6d36ca628fd7ae4d1bd1affa11ff489daa4 (patch)
tree75156882754482f7206dd2265b2e55586ea4555e
parent5ab78d3d6a7efcb49d2a9be5b4bdb8eaf78f7a14 (diff)
downloademacs-e95da6d36ca628fd7ae4d1bd1affa11ff489daa4.tar.gz
emacs-e95da6d36ca628fd7ae4d1bd1affa11ff489daa4.zip
Fix focus-out events on MS-Windows.
src/w32term.c (w32_read_socket) <WM_KILLFOCUS>: Call w32_detect_focus_change instead of doing part of its job by hand. This fixes the problem whereby FOCUS_OUT events were not sent to the event queue.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/w32term.c7
2 files changed, 8 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 38fa72b0506..95fdd2da94e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12013-07-27 Eli Zaretskii <eliz@gnu.org>
2
3 * w32term.c (w32_read_socket) <WM_KILLFOCUS>: Call
4 w32_detect_focus_change instead of doing part of its job by hand.
5 This fixes the problem whereby FOCUS_OUT events were not sent to
6 the event queue.
7
12013-07-26 Eli Zaretskii <eliz@gnu.org> 82013-07-26 Eli Zaretskii <eliz@gnu.org>
2 9
3 * process.c (Fprocess_list): Doc fix. 10 * process.c (Fprocess_list): Doc fix.
diff --git a/src/w32term.c b/src/w32term.c
index 0b22fd178e4..a596a487f3d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4923,16 +4923,11 @@ w32_read_socket (struct terminal *terminal,
4923 break; 4923 break;
4924 4924
4925 case WM_KILLFOCUS: 4925 case WM_KILLFOCUS:
4926 w32_detect_focus_change (dpyinfo, &msg, &inev);
4926 f = x_top_window_to_frame (dpyinfo, msg.msg.hwnd); 4927 f = x_top_window_to_frame (dpyinfo, msg.msg.hwnd);
4927 4928
4928 if (f) 4929 if (f)
4929 { 4930 {
4930 if (f == dpyinfo->w32_focus_event_frame)
4931 dpyinfo->w32_focus_event_frame = 0;
4932
4933 if (f == dpyinfo->w32_focus_frame)
4934 x_new_focus_frame (dpyinfo, 0);
4935
4936 if (f == hlinfo->mouse_face_mouse_frame) 4931 if (f == hlinfo->mouse_face_mouse_frame)
4937 { 4932 {
4938 /* If we move outside the frame, then we're 4933 /* If we move outside the frame, then we're