[Emacs-diffs] trunk r113450: Followup to revno:113431.

[Juanma Barranquero]

------------------------------------------------------------
revno: 113450
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2013-07-18 18:50:05 +0200
message:
  Followup to revno:113431.
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/frame.el                  frame.el-20091113204419-o5vbwnq5f7feedwu-275
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/keyboard.c                 keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-18 10:03:49 +0000
+++ b/lisp/ChangeLog    2013-07-18 16:50:05 +0000
@@ -1,3 +1,8 @@
+2013-07-18  Juanma Barranquero  <address@hidden>
+
+       * frame.el (blink-cursor-timer-function, blink-cursor-suspend):
+       Add check for W32 (followup to revno:113431).
+
 2013-07-18  Michael Albinus  <address@hidden>
 
        * filenotify.el (file-notify--library): Renamed from

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2013-07-16 11:41:06 +0000
+++ b/lisp/frame.el     2013-07-18 16:50:05 +0000
@@ -1709,7 +1709,7 @@
   "Timer function of timer `blink-cursor-timer'."
   (internal-show-cursor nil (not (internal-show-cursor-p)))
   ;; Each blink is two calls to this function.
-  (when (memq window-system '(x ns))
+  (when (memq window-system '(x ns w32))
     (setq blink-cursor-blinks-done (1+ blink-cursor-blinks-done))
     (when (and (> blink-cursor-blinks 0)
               (<= (* 2 blink-cursor-blinks) blink-cursor-blinks-done))
@@ -1729,11 +1729,11 @@
     (setq blink-cursor-timer nil)))
 
 (defun blink-cursor-suspend ()
-  "Suspend cursor blinking on NS and X.
+  "Suspend cursor blinking on NS, X and W32.
 This is called when no frame has focus and timers can be suspended.
 Timers are restarted by `blink-cursor-check', which is called when a
 frame receives focus."
-  (when (memq window-system '(x ns))
+  (when (memq window-system '(x ns w32))
     (blink-cursor-end)
     (when blink-cursor-idle-timer
       (cancel-timer blink-cursor-idle-timer)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-18 10:24:26 +0000
+++ b/src/ChangeLog     2013-07-18 16:50:05 +0000
@@ -1,3 +1,9 @@
+2013-07-18  Juanma Barranquero  <address@hidden>
+
+       * keyboard.c (kbd_buffer_get_event):
+       * w32term.c (x_focus_changed): Port FOCUS_(IN|OUT)_EVENT changes to W32.
+       Followup to revno:113431.
+
 2013-07-18  Paul Eggert  <address@hidden>
 
        * filelock.c: Fix unlikely file descriptor leaks.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2013-07-16 21:35:45 +0000
+++ b/src/keyboard.c    2013-07-18 16:50:05 +0000
@@ -4066,7 +4066,7 @@
         }
       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 @@
           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;
         }

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2013-07-13 14:21:01 +0000
+++ b/src/w32term.c     2013-07-18 16:50:05 +0000
@@ -2912,9 +2912,15 @@
               && 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 @@
         {
           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?  */
     }