Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-153
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-154
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-155
   Remove nick-abbrevs stuff from rcirc.el

 * emacs@sv.gnu.org/emacs--devo--0--patch-156
   rcirc.el update from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-157
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-158
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-159
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-532

10 files changed, 320 insertions, 71 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 389538b1617..f6edc410276 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,61 @@
+2006-03-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_uncatch_errors): Block input for entire function.
+
+2006-03-12  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (Fx_create_frame): Remove call to
+        Qface_set_after_frame_default. (from xfns.c 2003-05-26)
+
+        * w32menu.c (Fx_popup_menu): Call w32_free_menu_strings when
+        finished with the menu.
+
+        * w32term.c: Sync 2005-10-24 xterm.c changes.
+        (last_mouse_glyph_frame): New var.
+        (note_mouse_movement): Say mouse moved if current frame differs
+        from last_mouse_glyph_frame, and update last_mouse_glyph_frame.
+        (w32_mouse_position): Set last_mouse_glyph_frame.
+         Remove OLD_REDISPLAY_CODE block.
+
+2006-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macgui.h [USE_ATSUI && MAC_OSX]: Define USE_CG_TEXT_DRAWING to 1.
+
+        * macterm.h (struct mac_output) [USE_CG_DRAWING]: New member cg_context.
+        (mac_prepare_for_quickdraw) [USE_CG_DRAWING]: Add prototype.
+
+        * mac.c (sys_select) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.
+
+        * macfns.c (x_create_tip_frame): Apply 2006-03-11 change for xfns.c.
+
+        * macterm.c (mac_draw_rectangle, x_draw_glyph_string_foreground)
+        (x_draw_composite_glyph_string_foreground)
+        (x_draw_image_foreground): Undo previous changes.
+        (x_draw_hollow_cursor): Likewise.  Subtract 1 from the last
+        argument of mac_draw_rectangle.
+        (CG_SET_FILL_COLOR, CG_SET_STROKE_COLOR): New macros.
+        (mac_draw_string_common, mac_draw_image_string_cg): Use them.
+        (FRAME_CG_CONTEXT) [USE_CG_DRAWING]: New macro.
+        (mac_begin_cg_clip, mac_end_cg_clip, mac_prepare_for_quickdraw)
+        [USE_CG_DRAWING]: New functions.
+        (mac_draw_line, mac_erase_rectangle, mac_clear_window)
+        (mac_fill_rectangle, mac_draw_rectangle, mac_draw_string_common)
+        (mac_draw_image_string_cg) [USE_CG_DRAWING]: Add Quartz 2D drawing part.
+        (mac_draw_bitmap, mac_invert_rectangle, mac_draw_string_common)
+        (mac_copy_area, mac_scroll_area, x_scroll_bar_create)
+        (x_scroll_bar_remove, XTset_vertical_scroll_bar, x_set_window_size)
+        (XTread_socket) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.
+
+2006-03-12  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+
+        * xfns.c (x_icon): Disable redundant call to `x_wm_set_window_state'.
+
+2006-03-11  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (signal_user_input): New function.
+        (post_character_message): Use it for keyboard input.
+        (w32_msg_pump): Use it for mouse input.
+
 2006-03-11  Luc Teirlinck  <teirllm@auburn.edu>
 
         * window.c: Rename preserve_y to window_scroll_pixel_based_preserve_y.
@@ -95,7 +153,7 @@
 
         * image.c [MAC_OS] (XPutPixel): Set alpha channel bits if pixmap
         depth is 32.
-         [MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap
+        [MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap
         depth is 32.
 
 2006-03-06  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/src/mac.c b/src/mac.c
index a71194f9aee..40bbacf15ce 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -4829,6 +4829,9 @@ sys_select (n, rfds, wfds, efds, timeout)
             return 0;
         }
 
+#if USE_CG_DRAWING
+      mac_prepare_for_quickdraw (NULL);
+#endif
       /* Avoid initial overhead of RunLoop setup for the case that
          some input is already available.  */
       EMACS_SET_SECS_USECS (select_timeout, 0, 0);
diff --git a/src/macfns.c b/src/macfns.c
index 92a78a7319b..8e241205cd4 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -3591,6 +3591,7 @@ x_create_tip_frame (dpyinfo, parms, text)
 
   check_mac ();
 
+  parms = Fcopy_alist (parms);
 
 #ifdef MULTI_KBOARD
   kb = dpyinfo->kboard;
diff --git a/src/macgui.h b/src/macgui.h
index a84fea1ae91..7eb6c9942ab 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -79,6 +79,18 @@ typedef unsigned long Time;
 #include <Gestalt.h>
 #endif /* not HAVE_CARBON */
 
+#ifndef USE_CG_TEXT_DRAWING
+#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+#define USE_CG_TEXT_DRAWING 1
+#endif
+#endif
+
+#ifndef USE_CG_DRAWING
+#if USE_ATSUI && defined (MAC_OSX)
+#define USE_CG_DRAWING 1
+#endif
+#endif
+
 typedef WindowPtr Window;
 typedef GWorldPtr Pixmap;
 
@@ -92,12 +104,6 @@ typedef GWorldPtr Pixmap;
 #endif
 
 
-#ifndef USE_CG_TEXT_DRAWING
-#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
-#define USE_CG_TEXT_DRAWING 1
-#endif
-#endif
-
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
diff --git a/src/macterm.c b/src/macterm.c
index 9252d3bd914..d3510dbf516 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -268,6 +268,72 @@ extern void menubar_selection_callback (FRAME_PTR, int);
 #define GC_BACK_COLOR(gc)       (&(gc)->back_color)
 #define GC_FONT(gc)             ((gc)->xgcv.font)
 #define FRAME_NORMAL_GC(f)      ((f)->output_data.mac->normal_gc)
+#define CG_SET_FILL_COLOR(context, color)                       \
+  CGContextSetRGBFillColor (context,                                    \
+                            RED_FROM_ULONG (color) / 255.0f,            \
+                            GREEN_FROM_ULONG (color) / 255.0f,          \
+                            BLUE_FROM_ULONG (color) / 255.0f, 1.0f)
+#define CG_SET_STROKE_COLOR(context, color)             \
+  CGContextSetRGBStrokeColor (context,                                  \
+                              RED_FROM_ULONG (color) / 255.0f,          \
+                              GREEN_FROM_ULONG (color) / 255.0f,        \
+                              BLUE_FROM_ULONG (color) / 255.0f, 1.0f)
+#if USE_CG_DRAWING
+#define FRAME_CG_CONTEXT(f)     ((f)->output_data.mac->cg_context)
+
+static CGContextRef
+mac_begin_cg_clip (f, gc)
+     struct frame *f;
+     GC gc;
+{
+  CGContextRef context = FRAME_CG_CONTEXT (f);
+
+  if (!context)
+    {
+      QDBeginCGContext (GetWindowPort (FRAME_MAC_WINDOW (f)), &context);
+      FRAME_CG_CONTEXT (f) = context;
+    }
+
+  CGContextSaveGState (context);
+  CGContextTranslateCTM (context, 0, FRAME_PIXEL_HEIGHT (f));
+  CGContextScaleCTM (context, 1, -1);
+  if (gc && gc->n_clip_rects)
+    CGContextClipToRects (context, gc->clip_rects, gc->n_clip_rects);
+
+  return context;
+}
+
+static void
+mac_end_cg_clip (f)
+     struct frame *f;
+{
+  CGContextRestoreGState (FRAME_CG_CONTEXT (f));
+}
+
+void
+mac_prepare_for_quickdraw (f)
+     struct frame *f;
+{
+  if (f == NULL)
+    {
+      Lisp_Object rest, frame;
+      FOR_EACH_FRAME (rest, frame)
+        if (FRAME_MAC_P (XFRAME (frame)))
+          mac_prepare_for_quickdraw (XFRAME (frame));
+    }
+  else
+    {
+      CGContextRef context = FRAME_CG_CONTEXT (f);
+
+      if (context)
+        {
+          CGContextSynchronize (context);
+          QDEndCGContext (GetWindowPort (FRAME_MAC_WINDOW (f)),
+                          &FRAME_CG_CONTEXT (f));
+        }
+    }
+}
+#endif
 
 static RgnHandle saved_port_clip_region = NULL;
 
@@ -318,6 +384,18 @@ mac_draw_line (f, gc, x1, y1, x2, y2)
      GC gc;
      int x1, y1, x2, y2;
 {
+#if USE_CG_DRAWING
+  CGContextRef context;
+
+  context = mac_begin_cg_clip (f, gc);
+  CG_SET_STROKE_COLOR (context, gc->xgcv.foreground);
+  CGContextBeginPath (context);
+  CGContextMoveToPoint (context, x1 + 0.5f, y1 + 0.5f);
+  CGContextAddLineToPoint (context, x2 + 0.5f, y2 + 0.5f);
+  CGContextClosePath (context);
+  CGContextStrokePath (context);
+  mac_end_cg_clip (f);
+#else
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   RGBForeColor (GC_FORE_COLOR (gc));
@@ -326,6 +404,7 @@ mac_draw_line (f, gc, x1, y1, x2, y2)
   MoveTo (x1, y1);
   LineTo (x2, y2);
   mac_end_clip (gc);
+#endif
 }
 
 void
@@ -359,6 +438,14 @@ mac_erase_rectangle (f, gc, x, y, width, height)
      int x, y;
      unsigned int width, height;
 {
+#if USE_CG_DRAWING
+  CGContextRef context;
+
+  context = mac_begin_cg_clip (f, gc);
+  CG_SET_FILL_COLOR (context, gc->xgcv.background);
+  CGContextFillRect (context, CGRectMake (x, y, width, height));
+  mac_end_cg_clip (f);
+#else
   Rect r;
 
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
@@ -371,6 +458,7 @@ mac_erase_rectangle (f, gc, x, y, width, height)
   mac_end_clip (gc);
 
   RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
+#endif
 }
 
 
@@ -391,6 +479,16 @@ static void
 mac_clear_window (f)
      struct frame *f;
 {
+#if USE_CG_DRAWING
+  CGContextRef context;
+  GC gc = FRAME_NORMAL_GC (f);
+
+  context = mac_begin_cg_clip (f, NULL);
+  CG_SET_FILL_COLOR (context, gc->xgcv.background);
+  CGContextFillRect (context, CGRectMake (0, 0, FRAME_PIXEL_WIDTH (f),
+                                          FRAME_PIXEL_HEIGHT (f)));
+  mac_end_cg_clip (f);
+#else
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
@@ -405,6 +503,7 @@ mac_clear_window (f)
 #else /* not TARGET_API_MAC_CARBON */
   EraseRect (&(FRAME_MAC_WINDOW (f)->portRect));
 #endif /* not TARGET_API_MAC_CARBON */
+#endif
 }
 
 
@@ -425,6 +524,9 @@ mac_draw_bitmap (f, gc, x, y, width, height, bits, overlay_p)
   bitmap.baseAddr = (char *)bits;
   SetRect (&(bitmap.bounds), 0, 0, width, height);
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   RGBForeColor (GC_FORE_COLOR (gc));
@@ -571,6 +673,14 @@ mac_fill_rectangle (f, gc, x, y, width, height)
      int x, y;
      unsigned int width, height;
 {
+#if USE_CG_DRAWING
+  CGContextRef context;
+
+  context = mac_begin_cg_clip (f, gc);
+  CG_SET_FILL_COLOR (context, gc->xgcv.foreground);
+  CGContextFillRect (context, CGRectMake (x, y, width, height));
+  mac_end_cg_clip (f);
+#else
   Rect r;
 
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
@@ -581,6 +691,7 @@ mac_fill_rectangle (f, gc, x, y, width, height)
   mac_begin_clip (gc);
   PaintRect (&r); /* using foreground color of gc */
   mac_end_clip (gc);
+#endif
 }
 
 
@@ -593,16 +704,26 @@ mac_draw_rectangle (f, gc, x, y, width, height)
      int x, y;
      unsigned int width, height;
 {
+#if USE_CG_DRAWING
+  CGContextRef context;
+
+  context = mac_begin_cg_clip (f, gc);
+  CG_SET_STROKE_COLOR (context, gc->xgcv.foreground);
+  CGContextStrokeRect (context,
+                       CGRectMake (x + 0.5f, y + 0.5f, width, height));
+  mac_end_cg_clip (f);
+#else
   Rect r;
 
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   RGBForeColor (GC_FORE_COLOR (gc));
-  SetRect (&r, x, y, x + width, y + height);
+  SetRect (&r, x, y, x + width + 1, y + height + 1);
 
   mac_begin_clip (gc);
   FrameRect (&r); /* using foreground color of gc */
   mac_end_clip (gc);
+#endif
 }
 
 
@@ -672,6 +793,9 @@ mac_invert_rectangle (f, x, y, width, height)
 {
   Rect r;
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   SetRect (&r, x, y, x + width, y + height);
@@ -717,6 +841,9 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
       if (!mac_use_core_graphics)
         {
 #endif
+#if USE_CG_DRAWING
+          mac_prepare_for_quickdraw (f);
+#endif
           mac_begin_clip (gc);
           RGBForeColor (GC_FORE_COLOR (gc));
           if (bg_width)
@@ -745,6 +872,9 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
           ByteCount sizes[] = {sizeof (CGContextRef)};
           ATSUAttributeValuePtr values[] = {&context};
 
+#if USE_CG_DRAWING
+          context = mac_begin_cg_clip (f, gc);
+#else
           GetPort (&port);
           QDBeginCGContext (port, &context);
           if (gc->n_clip_rects || bg_width)
@@ -754,14 +884,10 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
               if (gc->n_clip_rects)
                 CGContextClipToRects (context, gc->clip_rects,
                                       gc->n_clip_rects);
+#endif
               if (bg_width)
                 {
-                  CGContextSetRGBFillColor
-                    (context,
-                     RED_FROM_ULONG (gc->xgcv.background) / 255.0f,
-                     GREEN_FROM_ULONG (gc->xgcv.background) / 255.0f,
-                     BLUE_FROM_ULONG (gc->xgcv.background) / 255.0f,
-                     1.0);
+                  CG_SET_FILL_COLOR (context, gc->xgcv.background);
                   CGContextFillRect
                     (context,
                      CGRectMake (x, y - FONT_BASE (GC_FONT (gc)),
@@ -769,13 +895,10 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
                 }
               CGContextScaleCTM (context, 1, -1);
               CGContextTranslateCTM (context, 0, -port_height);
+#if !USE_CG_DRAWING
             }
-          CGContextSetRGBFillColor
-            (context,
-             RED_FROM_ULONG (gc->xgcv.foreground) / 255.0f,
-             GREEN_FROM_ULONG (gc->xgcv.foreground) / 255.0f,
-             BLUE_FROM_ULONG (gc->xgcv.foreground) / 255.0f,
-             1.0);
+#endif
+          CG_SET_FILL_COLOR (context, gc->xgcv.foreground);
           err = ATSUSetLayoutControls (text_layout,
                                        sizeof (tags) / sizeof (tags[0]),
                                        tags, sizes, values);
@@ -783,8 +906,13 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
             ATSUDrawText (text_layout,
                           kATSUFromTextBeginning, kATSUToTextEnd,
                           Long2Fix (x), Long2Fix (port_height - y));
+#if USE_CG_DRAWING
+          mac_end_cg_clip (f);
+          context = NULL;
+#else
           CGContextSynchronize (context);
           QDEndCGContext (port, &context);
+#endif
 #if 0
           /* This doesn't work on Mac OS X 10.1.  */
           ATSUClearLayoutControls (text_layout,
@@ -806,6 +934,9 @@ mac_draw_string_common (f, gc, x, y, buf, nchars, bg_width, bytes_per_char)
       if (mac_use_core_graphics)
         savedFlags = SwapQDTextFlags (kQDUseCGTextRendering);
 #endif
+#if USE_CG_DRAWING
+      mac_prepare_for_quickdraw (f);
+#endif
       mac_begin_clip (gc);
       RGBForeColor (GC_FORE_COLOR (gc));
 #ifdef MAC_OS8
@@ -1113,6 +1244,9 @@ mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
       buf++;
     }
 
+#if USE_CG_DRAWING
+  context = mac_begin_cg_clip (f, gc);
+#else
   QDBeginCGContext (port, &context);
   if (gc->n_clip_rects || bg_width)
     {
@@ -1120,14 +1254,10 @@ mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
       CGContextScaleCTM (context, 1, -1);
       if (gc->n_clip_rects)
         CGContextClipToRects (context, gc->clip_rects, gc->n_clip_rects);
+#endif
       if (bg_width)
         {
-          CGContextSetRGBFillColor
-            (context,
-             RED_FROM_ULONG (gc->xgcv.background) / 255.0f,
-             GREEN_FROM_ULONG (gc->xgcv.background) / 255.0f,
-             BLUE_FROM_ULONG (gc->xgcv.background) / 255.0f,
-             1.0);
+          CG_SET_FILL_COLOR (context, gc->xgcv.background);
           CGContextFillRect
             (context,
              CGRectMake (gx, y - FONT_BASE (GC_FONT (gc)),
@@ -1135,12 +1265,10 @@ mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
         }
       CGContextScaleCTM (context, 1, -1);
       CGContextTranslateCTM (context, 0, -port_height);
+#if !USE_CG_DRAWING
     }
-  CGContextSetRGBFillColor (context,
-                            RED_FROM_ULONG (gc->xgcv.foreground) / 255.0f,
-                            GREEN_FROM_ULONG (gc->xgcv.foreground) / 255.0f,
-                            BLUE_FROM_ULONG (gc->xgcv.foreground) / 255.0f,
-                            1.0);
+#endif
+  CG_SET_FILL_COLOR (context, gc->xgcv.foreground);
   CGContextSetFont (context, GC_FONT (gc)->cg_font);
   CGContextSetFontSize (context, GC_FONT (gc)->mac_fontsize);
   if (GC_FONT (gc)->mac_fontsize <= cg_text_anti_aliasing_threshold)
@@ -1155,8 +1283,12 @@ mac_draw_image_string_cg (f, gc, x, y, buf, nchars, bg_width)
       gx += advances[i].width;
     }
 #endif
+#if USE_CG_DRAWING
+  mac_end_cg_clip (f);
+#else
   CGContextSynchronize (context);
   QDEndCGContext (port, &context);
+#endif
 
   return 1;
 }
@@ -1176,6 +1308,9 @@ mac_copy_area (src, f, gc, src_x, src_y, width, height, dest_x, dest_y)
 {
   Rect src_r, dest_r;
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   SetRect (&src_r, src_x, src_y, src_x + width, src_y + height);
@@ -1220,6 +1355,9 @@ mac_copy_area_with_mask (src, mask, f, gc, src_x, src_y,
 {
   Rect src_r, dest_r;
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   SetRect (&src_r, src_x, src_y, src_x + width, src_y + height);
@@ -1269,6 +1407,9 @@ mac_scroll_area (f, gc, src_x, src_y, width, height, dest_x, dest_y)
   RgnHandle dummy = NewRgn ();  /* For avoiding update events.  */
 
   SetRect (&src_r, src_x, src_y, src_x + width, src_y + height);
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   ScrollWindowRect (FRAME_MAC_WINDOW (f),
                     &src_r, dest_x - src_x, dest_y - src_y,
                     kScrollWindowNoOptions, dummy);
@@ -1527,6 +1668,9 @@ x_flush (f)
 {
 #if TARGET_API_MAC_CARBON
   BLOCK_INPUT;
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   if (f)
     QDFlushPortBuffer (GetWindowPort (FRAME_MAC_WINDOW (f)), NULL);
   else
@@ -2436,7 +2580,7 @@ x_draw_glyph_string_foreground (s)
         {
           struct glyph *g = s->first_glyph + i;
           mac_draw_rectangle (s->f, s->gc, x, s->y,
-                              g->pixel_width, s->height);
+                              g->pixel_width - 1, s->height - 1);
           x += g->pixel_width;
         }
     }
@@ -2515,7 +2659,7 @@ x_draw_composite_glyph_string_foreground (s)
     {
       if (s->gidx == 0)
         mac_draw_rectangle (s->f, s->gc, x, s->y,
-                            s->width, s->height);
+                            s->width - 1, s->height - 1);
     }
   else
     {
@@ -3068,15 +3212,15 @@ x_draw_image_foreground (s)
               int r = s->img->relief;
               if (r < 0) r = -r;
               mac_draw_rectangle (s->f, s->gc, x - r, y - r,
-                                  s->slice.width + r*2,
-                                  s->slice.height + r*2);
+                                  s->slice.width + r*2 - 1,
+                                  s->slice.height + r*2 - 1);
             }
         }
     }
   else
     /* Draw a rectangle if image could not be loaded.  */
     mac_draw_rectangle (s->f, s->gc, x, y,
-                        s->slice.width, s->slice.height);
+                        s->slice.width - 1, s->slice.height - 1);
 }
 
 
@@ -4593,6 +4737,9 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
   r.right = left + width;
   r.bottom = disp_top + disp_height;
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
 #if TARGET_API_MAC_CARBON
   ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p",
 #if USE_TOOLKIT_SCROLL_BARS
@@ -4719,6 +4866,9 @@ x_scroll_bar_remove (bar)
 
   BLOCK_INPUT;
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   /* Destroy the Mac scroll bar control  */
   DisposeControl (SCROLL_BAR_CONTROL_HANDLE (bar));
 
@@ -4815,6 +4965,9 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
              for them on the frame, we have to clear "under" them.  */
           mac_clear_area (f, left, top, width, height);
 
+#if USE_CG_DRAWING
+          mac_prepare_for_quickdraw (f);
+#endif
           HideControl (ch);
           MoveControl (ch, sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, disp_top);
           SizeControl (ch, sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
@@ -5245,7 +5398,7 @@ x_draw_hollow_cursor (w, row)
   /* Compute frame-relative coordinates for phys cursor.  */
   x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
   y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
-  wd = w->phys_cursor_width + 1;
+  wd = w->phys_cursor_width;
 
   /* The foreground of cursor_gc is typically the same as the normal
      background color, which can cause the cursor box to be invisible.  */
@@ -5259,7 +5412,7 @@ x_draw_hollow_cursor (w, row)
 
   /* Set clipping, draw the rectangle, and reset clipping again.  */
   x_clip_to_row (w, row, TEXT_AREA, gc);
-  mac_draw_rectangle (f, gc, x, y, wd, h);
+  mac_draw_rectangle (f, gc, x, y, wd, h - 1);
   mac_reset_clip_rectangles (dpy, gc);
 }
 
@@ -5786,8 +5939,13 @@ x_set_window_size (f, change_gravity, cols, rows)
   SizeWindow (FRAME_MAC_WINDOW (f), pixelwidth, pixelheight, 0);
 #if TARGET_API_MAC_CARBON
   if (f->output_data.mac->hourglass_control)
-    MoveControl (f->output_data.mac->hourglass_control,
-                 pixelwidth - HOURGLASS_WIDTH, 0);
+    {
+#if USE_CG_DRAWING
+      mac_prepare_for_quickdraw (f);
+#endif
+      MoveControl (f->output_data.mac->hourglass_control,
+                   pixelwidth - HOURGLASS_WIDTH, 0);
+    }
 #endif
 
   /* Now, strictly speaking, we can't be sure that this is accurate,
@@ -9672,7 +9830,11 @@ XTread_socket (sd, expected, hold_quit)
 #if USE_CARBON_EVENTS
   toolbox_dispatcher = GetEventDispatcherTarget ();
 
-  while (!ReceiveNextEvent (0, NULL, kEventDurationNoWait,
+  while (
+#if USE_CG_DRAWING
+         mac_prepare_for_quickdraw (NULL),
+#endif
+         !ReceiveNextEvent (0, NULL, kEventDurationNoWait,
                             kEventRemoveFromQueue, &eventRef))
 #else /* !USE_CARBON_EVENTS */
   while (mac_wait_next_event (&er, 0, true))
diff --git a/src/macterm.h b/src/macterm.h
index 42020811e6c..f6807d93487 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -334,6 +334,11 @@ struct mac_output {
 
   /* Hints for the size and the position of a window.  */
   XSizeHints *size_hints;
+
+#if USE_CG_DRAWING
+  /* Quartz 2D graphics context.  */
+  CGContextRef cg_context;
+#endif
 };
 
 typedef struct mac_output mac_output;
@@ -563,6 +568,9 @@ extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *));
 extern OSErr install_window_handler P_ ((WindowPtr));
 extern void remove_window_handler P_ ((WindowPtr));
 extern Lisp_Object mac_make_lispy_event_code P_ ((int));
+#if USE_CG_DRAWING
+extern void mac_prepare_for_quickdraw P_ ((struct frame *));
+#endif
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
diff --git a/src/w32fns.c b/src/w32fns.c
index c116c51603b..08b6ed8b1a4 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2695,6 +2695,24 @@ w32_msg_worker (dw)
 }
 
 static void
+signal_user_input ()
+{
+  /* Interrupt any lisp that wants to be interrupted by input.  */
+  if (!NILP (Vthrow_on_input))
+    {
+      Vquit_flag = Vthrow_on_input;
+      /* If we're inside a function that wants immediate quits,
+         do it now.  */
+      if (immediate_quit && NILP (Vinhibit_quit))
+        {
+          immediate_quit = 0;
+          QUIT;
+        }
+    }
+}
+
+
+static void
 post_character_message (hwnd, msg, wParam, lParam, modifiers)
      HWND hwnd;
      UINT msg;
@@ -2751,6 +2769,8 @@ post_character_message (hwnd, msg, wParam, lParam, modifiers)
            to receive C-g to interrupt the lisp thread.  */
         cancel_all_deferred_msgs ();
       }
+    else
+      signal_user_input ();
   }
 
   my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
@@ -3270,6 +3290,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
 
       wmsg.dwModifiers = w32_get_modifiers ();
       my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+      signal_user_input ();
 
       /* Need to return true for XBUTTON messages, false for others,
          to indicate that we processed the message.  */
@@ -3324,11 +3345,13 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
     case WM_MOUSEWHEEL:
       wmsg.dwModifiers = w32_get_modifiers ();
       my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+      signal_user_input ();
       return 0;
 
     case WM_DROPFILES:
       wmsg.dwModifiers = w32_get_modifiers ();
       my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+      signal_user_input ();
       return 0;
 
     case WM_TIMER:
@@ -3338,6 +3361,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
           if (saved_mouse_button_msg.msg.hwnd)
             {
               post_msg (&saved_mouse_button_msg);
+              signal_user_input ();
               saved_mouse_button_msg.msg.hwnd = 0;
             }
           KillTimer (hwnd, mouse_button_timer);
@@ -3840,6 +3864,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
         {
           wmsg.dwModifiers = w32_get_modifiers ();
           my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+          signal_user_input ();
           return 0;
         }
 
@@ -4344,17 +4369,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
   x_wm_set_size_hint (f, window_prompting, 0);
   UNBLOCK_INPUT;
 
-  /* Avoid a bug that causes the new frame to never become visible if
-     an echo area message is displayed during the following call1.  */
-  specbind(Qredisplay_dont_pause, Qt);
-
-  /* Set up faces after all frame parameters are known.  This call
-     also merges in face attributes specified for new frames.  If we
-     don't do this, the `menu' face for instance won't have the right
-     colors, and the menu bar won't appear in the specified colors for
-     new frames.  */
-  call1 (Qface_set_after_frame_default, frame);
-
   /* Make the window appear on the frame and enable display, unless
      the caller says not to.  However, with explicit parent, Emacs
      cannot control visibility, so don't try.  */
diff --git a/src/w32menu.c b/src/w32menu.c
index 57db01ac9e9..389e6c5b856 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -819,8 +819,10 @@ cached information about equivalent key sequences.  */)
     }
 
 #ifdef HAVE_MENUS
-  /* If resources from a previous popup menu exist yet, does nothing
-     until the `menu_free_timer' has freed them (see w32fns.c).
+  /* If resources from a previous popup menu still exist, does nothing
+     until the `menu_free_timer' has freed them (see w32fns.c). This
+     can occur if you press ESC or click outside a menu without selecting
+     a menu item.
   */
   if (current_popup_menu)
     {
@@ -837,6 +839,8 @@ cached information about equivalent key sequences.  */)
   UNBLOCK_INPUT;
 
   discard_menu_items ();
+  w32_free_menu_strings (FRAME_W32_WINDOW (f));
+
 #endif /* HAVE_MENUS */
 
   UNGCPRO;
diff --git a/src/w32term.c b/src/w32term.c
index bd04f0cb4b5..d7c9bc8c159 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -183,6 +183,7 @@ int last_scroll_bar_drag_pos;
 /* Where the mouse was last time we reported a mouse event.  */
 
 static RECT last_mouse_glyph;
+static FRAME_PTR last_mouse_glyph_frame;
 static Lisp_Object last_mouse_press_frame;
 
 int w32_num_mouse_buttons;
@@ -3221,11 +3222,13 @@ note_mouse_movement (frame, msg)
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
       note_mouse_highlight (frame, -1, -1);
+      last_mouse_glyph_frame = 0;
       return 1;
     }
 
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
-  if (mouse_x < last_mouse_glyph.left
+  if (frame != last_mouse_glyph_frame
+      || mouse_x < last_mouse_glyph.left
       || mouse_x >= last_mouse_glyph.right
       || mouse_y < last_mouse_glyph.top
       || mouse_y >= last_mouse_glyph.bottom)
@@ -3238,6 +3241,7 @@ note_mouse_movement (frame, msg)
          to keep track of the mouse for help_echo and highlighting at
          other times.  */
       remember_mouse_glyph (frame, mouse_x, mouse_y, &last_mouse_glyph);
+      last_mouse_glyph_frame = frame;
       return 1;
     }
 
@@ -3361,19 +3365,9 @@ w32_mouse_position (fp, insist, bar_window, part, x, y, time)
                on it, i.e. into the same rectangles that matrices on
                the frame are divided into.  */
 
-#if OLD_REDISPLAY_CODE
-            int ignore1, ignore2;
-
-            ScreenToClient (FRAME_W32_WINDOW (f1), &pt);
-
-            pixel_to_glyph_coords (f1, pt.x, pt.y, &ignore1, &ignore2,
-                                   &last_mouse_glyph,
-                                   FRAME_W32_DISPLAY_INFO (f1)->grabbed
-                                   || insist);
-#else
             ScreenToClient (FRAME_W32_WINDOW (f1), &pt);
             remember_mouse_glyph (f1, pt.x, pt.y, &last_mouse_glyph);
-#endif
+            last_mouse_glyph_frame = f1;
 
             *bar_window = Qnil;
             *part = 0;
diff --git a/src/xterm.c b/src/xterm.c
index 80b8c914f5b..378373fe791 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7547,18 +7547,17 @@ x_uncatch_errors ()
 {
   struct x_error_message_stack *tmp;
 
+  BLOCK_INPUT;
+
   /* The display may have been closed before this function is called.
      Check if it is still open before calling XSync.  */
   if (x_display_info_for_display (x_error_message->dpy) != 0)
-    {
-      BLOCK_INPUT;
-      XSync (x_error_message->dpy, False);
-      UNBLOCK_INPUT;
-    }
+    XSync (x_error_message->dpy, False);
 
   tmp = x_error_message;
   x_error_message = x_error_message->prev;
   xfree (tmp);
+  UNBLOCK_INPUT;
 }
 
 /* If any X protocol errors have arrived since the last call to