[Emacs-diffs] Changes to emacs/src/macterm.c,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/10/09 08:52:58

Index: src/macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -b -r1.233 -r1.234
--- src/macterm.c       13 Sep 2007 22:24:42 -0000      1.233
+++ src/macterm.c       9 Oct 2007 08:52:51 -0000       1.234
@@ -2360,6 +2360,9 @@
 
   for (i = 0; i < h; i++)
     bits[i] = ~bits[i];
+
+  BLOCK_INPUT;
+
   provider = CGDataProviderCreateWithData (NULL, bits,
                                           sizeof (unsigned short) * h, NULL);
   if (provider)
@@ -2369,6 +2372,8 @@
                                             provider, NULL, 0);
       CGDataProviderRelease (provider);
     }
+
+  UNBLOCK_INPUT;
 }
 
 static void
@@ -2379,7 +2384,11 @@
     return;
 
   if (fringe_bmp[which])
+    {
+      BLOCK_INPUT;
     CGImageRelease (fringe_bmp[which]);
+      UNBLOCK_INPUT;
+    }
   fringe_bmp[which] = 0;
 }
 #endif
@@ -8757,7 +8766,7 @@
 
       font_id = atsu_find_font_from_family_name (family);
       if (font_id == kATSUInvalidFontID)
-       return;
+       return NULL;
       size_fixed = Long2Fix (size);
       bold_p = (fontface & bold) != 0;
       italic_p = (fontface & italic) != 0;
@@ -12148,7 +12157,13 @@
                             will be selected only when it is active.  */
                          if (WINDOWP (window)
                              && !EQ (window, last_window)
-                             && !EQ (window, selected_window))
+                             && !EQ (window, selected_window)
+                             /* For click-to-focus window managers
+                                create event iff we don't leave the
+                                selected frame.  */
+                             && (focus_follows_mouse
+                                 || (EQ (XWINDOW (window)->frame,
+                                         XWINDOW (selected_window)->frame))))
                            {
                              inev.kind = SELECT_WINDOW_EVENT;
                              inev.frame_or_window = window;