Followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se.

* lisp/frame.el (blink-cursor-timer-function, blink-cursor-suspend):
  Add check for W32.
* src/keyboard.c (kbd_buffer_get_event):
* src/w32term.c (x_focus_changed): Port FOCUS_(IN|OUT)_EVENT changes to W32.

3 files changed, 22 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8a1c163998b..de80ac168bd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * keyboard.c (kbd_buffer_get_event):
+        * w32term.c (x_focus_changed): Port FOCUS_(IN|OUT)_EVENT changes to W32.
+        Followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se.
+
 2013-07-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         * filelock.c: Fix unlikely file descriptor leaks.
diff --git a/src/keyboard.c b/src/keyboard.c
index 07dce85ff29..f025d6c5dfa 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4066,7 +4066,7 @@ kbd_buffer_get_event (KBOARD **kbp,
         }
       else if (event->kind == FOCUS_OUT_EVENT)
         {
-#if defined(HAVE_NS) || defined (HAVE_X11)
+#if defined (HAVE_NS) || defined (HAVE_X11) || defined (WINDOWSNT)
 
 #ifdef HAVE_NS
           struct ns_display_info *di;
@@ -4076,11 +4076,11 @@ kbd_buffer_get_event (KBOARD **kbp,
           Lisp_Object frame = event->frame_or_window;
           bool focused = false;
 
-          for (di = x_display_list; di && ! focused; di = di->next)
-            focused = di->x_highlight_frame != 0;
+          for (di = x_display_list; di && ! focused; di = FRAME_X_DISPLAY_INFO (di)->next)
+            focused = FRAME_X_DISPLAY_INFO (di)->x_highlight_frame = 0;
 
           if (! focused) obj = make_lispy_focus_out (frame);
-#endif /* HAVE_NS || HAVE_X11 */
+#endif /* HAVE_NS || HAVE_X11 || WINDOWSNT */
 
           kbd_fetch_ptr = event + 1;
         }
diff --git a/src/w32term.c b/src/w32term.c
index 732a4f4bfef..2fe3fe07462 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2912,9 +2912,15 @@ x_focus_changed (int type, int state, struct w32_display_info *dpyinfo,
               && CONSP (Vframe_list)
               && !NILP (XCDR (Vframe_list)))
             {
-              bufp->kind = FOCUS_IN_EVENT;
-              XSETFRAME (bufp->frame_or_window, frame);
+              bufp->arg = Qt;
             }
+          else
+            {
+              bufp->arg = Qnil;
+            }
+
+          bufp->kind = FOCUS_IN_EVENT;
+          XSETFRAME (bufp->frame_or_window, frame);
         }
 
       frame->output_data.x->focus_state |= state;
@@ -2929,7 +2935,10 @@ x_focus_changed (int type, int state, struct w32_display_info *dpyinfo,
         {
           dpyinfo->w32_focus_event_frame = 0;
           x_new_focus_frame (dpyinfo, 0);
-        }
+
+          bufp->kind = FOCUS_OUT_EVENT;
+          XSETFRAME (bufp->frame_or_window, frame);
+      }
 
       /* TODO: IME focus?  */
     }