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

[YAMAMOTO Mitsuharu]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.132 emacs/src/macterm.c:1.133
*** emacs/src/macterm.c:1.132   Fri Oct  7 07:39:37 2005
--- emacs/src/macterm.c Sat Oct  8 02:28:09 2005
***************
*** 270,277 ****
--- 270,307 ----
  #define GC_FORE_COLOR(gc)     (&(gc)->fore_color)
  #define GC_BACK_COLOR(gc)     (&(gc)->back_color)
  #define GC_FONT(gc)           ((gc)->xgcv.font)
+ #define GC_CLIP_REGION(gc)    ((gc)->clip_region)
  #define MAC_WINDOW_NORMAL_GC(w)       (((mac_output *) GetWRefCon 
(w))->normal_gc)
  
+ static RgnHandle saved_port_clip_region = NULL;
+ 
+ static void
+ mac_begin_clip (region)
+      RgnHandle region;
+ {
+   static RgnHandle new_region = NULL;
+ 
+   if (saved_port_clip_region == NULL)
+     saved_port_clip_region = NewRgn ();
+   if (new_region == NULL)
+     new_region = NewRgn ();
+ 
+   if (region)
+     {
+       GetClip (saved_port_clip_region);
+       SectRgn (saved_port_clip_region, region, new_region);
+       SetClip (new_region);
+     }
+ }
+ 
+ static void
+ mac_end_clip (region)
+      RgnHandle region;
+ {
+   if (region)
+     SetClip (saved_port_clip_region);
+ }
+ 
  
  /* X display function emulation */
  
***************
*** 297,304 ****
--- 327,336 ----
  
    RGBForeColor (GC_FORE_COLOR (gc));
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
    MoveTo (x1, y1);
    LineTo (x2, y2);
+   mac_end_clip (GC_CLIP_REGION (gc));
  }
  
  void
***************
*** 339,345 ****
--- 371,379 ----
    RGBBackColor (GC_BACK_COLOR (gc));
    SetRect (&r, x, y, x + width, y + height);
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
    EraseRect (&r);
+   mac_end_clip (GC_CLIP_REGION (gc));
  
    RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (w)));
  }
***************
*** 406,411 ****
--- 440,446 ----
    RGBBackColor (GC_BACK_COLOR (gc));
    SetRect (&r, x, y, x + width, y + height);
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
  #if TARGET_API_MAC_CARBON
    LockPortBits (GetWindowPort (w));
    CopyBits (&bitmap, GetPortBitMapForCopyBits (GetWindowPort (w)),
***************
*** 415,455 ****
    CopyBits (&bitmap, &(w->portBits), &(bitmap.bounds), &r,
            overlay_p ? srcOr : srcCopy, 0);
  #endif /* not TARGET_API_MAC_CARBON */
  
    RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (w)));
  }
  
  
- /* Mac replacement for XSetClipRectangles.  */
- 
- static void
- mac_set_clip_rectangle (display, w, r)
-      Display *display;
-      WindowPtr w;
-      Rect *r;
- {
-   SetPortWindowPort (w);
- 
-   ClipRect (r);
- }
- 
- 
- /* Mac replacement for XSetClipMask.  */
- 
- static void
- mac_reset_clipping (display, w)
-      Display *display;
-      WindowPtr w;
- {
-   Rect r;
- 
-   SetPortWindowPort (w);
- 
-   SetRect (&r, -32767, -32767, 32767, 32767);
-   ClipRect (&r);
- }
- 
- 
  /* Mac replacement for XCreateBitmapFromBitmapData.  */
  
  static void
--- 450,461 ----
    CopyBits (&bitmap, &(w->portBits), &(bitmap.bounds), &r,
            overlay_p ? srcOr : srcCopy, 0);
  #endif /* not TARGET_API_MAC_CARBON */
+   mac_end_clip (GC_CLIP_REGION (gc));
  
    RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (w)));
  }
  
  
  /* Mac replacement for XCreateBitmapFromBitmapData.  */
  
  static void
***************
*** 577,583 ****
--- 583,591 ----
    RGBForeColor (GC_FORE_COLOR (gc));
    SetRect (&r, x, y, x + width, y + height);
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
    PaintRect (&r); /* using foreground color of gc */
+   mac_end_clip (GC_CLIP_REGION (gc));
  }
  
  
***************
*** 625,631 ****
--- 633,641 ----
    RGBForeColor (GC_FORE_COLOR (gc));
    SetRect (&r, x, y, x + width + 1, y + height + 1);
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
    FrameRect (&r); /* using foreground color of gc */
+   mac_end_clip (GC_CLIP_REGION (gc));
  }
  
  
***************
*** 678,684 ****
  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
        kATSLineDisableAllLayoutOperations  | kATSLineUseDeviceMetrics
  #else
!       kATSLineIsDisplayOnly
  #endif
        ;
        ATSUAttributeValuePtr values[] = {&line_layout};
--- 688,694 ----
  #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
        kATSLineDisableAllLayoutOperations  | kATSLineUseDeviceMetrics
  #else
!       kATSLineIsDisplayOnly | kATSLineFractDisable
  #endif
        ;
        ATSUAttributeValuePtr values[] = {&line_layout};
***************
*** 782,791 ****
--- 792,803 ----
          if (NILP (Vmac_use_core_graphics))
            {
  #endif
+             mac_begin_clip (GC_CLIP_REGION (gc));
              MoveTo (x, y);
              ATSUDrawText (text_layout,
                            kATSUFromTextBeginning, kATSUToTextEnd,
                            kATSUUseGrafPortPenLoc, kATSUUseGrafPortPenLoc);
+             mac_end_clip (GC_CLIP_REGION (gc));
  #ifdef MAC_OSX
            }
          else
***************
*** 793,799 ****
              CGrafPtr port;
              CGContextRef context;
              Rect rect;
-             RgnHandle region = NewRgn ();
              float port_height;
              ATSUAttributeTag tags[] = {kATSUCGContextTag};
              ByteCount sizes[] = {sizeof (CGContextRef)};
--- 805,810 ----
***************
*** 803,818 ****
              QDBeginCGContext (port, &context);
              GetPortBounds (port, &rect);
              port_height = rect.bottom - rect.top;
!             GetClip (region);
!             GetRegionBounds (region, &rect);
!             /* XXX: This is not correct if the clip region is not a
!                simple rectangle.  */
!             CGContextClipToRect (context,
!                                  CGRectMake (rect.left,
!                                              port_height - rect.bottom,
!                                              rect.right - rect.left,
!                                              rect.bottom - rect.top));
!             DisposeRgn (region);
              CGContextSetRGBFillColor
                (context,
                 RED_FROM_ULONG (gc->xgcv.foreground) / 255.0,
--- 814,828 ----
              QDBeginCGContext (port, &context);
              GetPortBounds (port, &rect);
              port_height = rect.bottom - rect.top;
!             if (gc->n_clip_rects)
!               {
!                 CGContextTranslateCTM (context, 0, port_height);
!                 CGContextScaleCTM (context, 1, -1);
!                 CGContextClipToRects (context, gc->clip_rects,
!                                       gc->n_clip_rects);
!                 CGContextScaleCTM (context, 1, -1);
!                 CGContextTranslateCTM (context, 0, -port_height);
!               }
              CGContextSetRGBFillColor
                (context,
                 RED_FROM_ULONG (gc->xgcv.foreground) / 255.0,
***************
*** 843,850 ****
--- 853,862 ----
    TextFace (GC_FONT (gc)->mac_fontface);
    TextMode (mode);
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
    MoveTo (x, y);
    DrawText (buf, 0, nchars * bytes_per_char);
+   mac_end_clip (GC_CLIP_REGION (gc));
  #if USE_ATSUI
      }
  #endif
***************
*** 943,948 ****
--- 955,961 ----
    ForeColor (blackColor);
    BackColor (whiteColor);
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
    LockPixels (GetGWorldPixMap (src));
  #if TARGET_API_MAC_CARBON
    LockPortBits (GetWindowPort (dest));
***************
*** 955,960 ****
--- 968,974 ----
            &src_r, &dest_r, srcCopy, 0);
  #endif /* not TARGET_API_MAC_CARBON */
    UnlockPixels (GetGWorldPixMap (src));
+   mac_end_clip (GC_CLIP_REGION (gc));
  
    RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (dest)));
  }
***************
*** 981,986 ****
--- 995,1001 ----
    ForeColor (blackColor);
    BackColor (whiteColor);
  
+   mac_begin_clip (GC_CLIP_REGION (gc));
    LockPixels (GetGWorldPixMap (src));
    LockPixels (GetGWorldPixMap (mask));
  #if TARGET_API_MAC_CARBON
***************
*** 995,1000 ****
--- 1010,1016 ----
  #endif /* not TARGET_API_MAC_CARBON */
    UnlockPixels (GetGWorldPixMap (mask));
    UnlockPixels (GetGWorldPixMap (src));
+   mac_end_clip (GC_CLIP_REGION (gc));
  
    RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (dest)));
  }
***************
*** 1031,1037 ****
--- 1047,1055 ----
       color mapping in CopyBits.  Otherwise, it will be slow.  */
    ForeColor (blackColor);
    BackColor (whiteColor);
+   mac_begin_clip (GC_CLIP_REGION (gc));
    CopyBits (&(w->portBits), &(w->portBits), &src_r, &dest_r, srcCopy, 0);
+   mac_end_clip (GC_CLIP_REGION (gc));
  
    RGBBackColor (GC_BACK_COLOR (MAC_WINDOW_NORMAL_GC (w)));
  #endif /* not TARGET_API_MAC_CARBON */
***************
*** 1166,1171 ****
--- 1184,1191 ----
       Display *display;
       GC gc;
  {
+   if (gc->clip_region)
+     DisposeRgn (gc->clip_region);
    xfree (gc);
  }
  
***************
*** 1236,1241 ****
--- 1256,1325 ----
  }
  
  
+ /* Mac replacement for XSetClipRectangles.  */
+ 
+ static void
+ mac_set_clip_rectangles (display, gc, rectangles, n)
+      Display *display;
+      GC gc;
+      Rect *rectangles;
+      int n;
+ {
+   int i;
+ 
+   if (n < 0 || n > MAX_CLIP_RECTS)
+     abort ();
+   if (n == 0)
+     {
+       if (gc->clip_region)
+       {
+         DisposeRgn (gc->clip_region);
+         gc->clip_region = NULL;
+       }
+     }
+   else
+     {
+       if (gc->clip_region == NULL)
+       gc->clip_region = NewRgn ();
+       RectRgn (gc->clip_region, rectangles);
+       if (n > 1)
+       {
+         RgnHandle region = NewRgn ();
+ 
+         for (i = 1; i < n; i++)
+           {
+             RectRgn (region, rectangles + i);
+             UnionRgn (gc->clip_region, region, gc->clip_region);
+           }
+         DisposeRgn (region);
+       }
+     }
+ #if defined (MAC_OSX) && USE_ATSUI
+   gc->n_clip_rects = n;
+ 
+   for (i = 0; i < n; i++)
+     {
+       Rect *rect = rectangles + i;
+ 
+       gc->clip_rects[i] = CGRectMake (rect->left, rect->top,
+                                     rect->right - rect->left,
+                                     rect->bottom - rect->top);
+     }
+ #endif
+ }
+ 
+ 
+ /* Mac replacement for XSetClipMask.  */
+ 
+ static INLINE void
+ mac_reset_clip_rectangles (display, gc)
+      Display *display;
+      GC gc;
+ {
+   mac_set_clip_rectangles (display, gc, NULL, 0);
+ }
+ 
+ 
  /* Mac replacement for XSetWindowBackground.  */
  
  void
***************
*** 1647,1653 ****
        XSetForeground (display, face->gc, gcv.foreground);
      }
  
!   mac_reset_clipping (display, window);
  }
  
  
--- 1731,1737 ----
        XSetForeground (display, face->gc, gcv.foreground);
      }
  
!   mac_reset_clip_rectangles (display, gc);
  }
  
  
***************
*** 2122,2130 ****
  x_set_glyph_string_clipping (s)
       struct glyph_string *s;
  {
!   Rect r;
!   get_glyph_string_clip_rect (s, &r);
!   mac_set_clip_rectangle (s->display, s->window, &r);
  }
  
  
--- 2206,2216 ----
  x_set_glyph_string_clipping (s)
       struct glyph_string *s;
  {
!   Rect rects[MAX_CLIP_RECTS];
!   int n;
! 
!   n = get_glyph_string_clip_rects (s, rects, MAX_CLIP_RECTS);
!   mac_set_clip_rectangles (s->display, s->gc, rects, n);
  }
  
  
***************
*** 2341,2347 ****
        {
          if (s->two_byte_p)
            XDrawImageString16 (s->display, s->window, s->gc, x,
!                               s->ybase - boff, s->char2b, s->nchars);
          else
            XDrawImageString (s->display, s->window, s->gc, x,
                              s->ybase - boff, char1b, s->nchars);
--- 2427,2433 ----
        {
          if (s->two_byte_p)
            XDrawImageString16 (s->display, s->window, s->gc, x,
!                               s->ybase - boff, s->char2b, s->nchars);
          else
            XDrawImageString (s->display, s->window, s->gc, x,
                              s->ybase - boff, char1b, s->nchars);
***************
*** 2749,2755 ****
      gc = f->output_data.mac->white_relief.gc;
    else
      gc = f->output_data.mac->black_relief.gc;
!   mac_set_clip_rectangle (dpy, window, clip_rect);
  
    /* Top.  */
    if (top_p)
--- 2835,2841 ----
      gc = f->output_data.mac->white_relief.gc;
    else
      gc = f->output_data.mac->black_relief.gc;
!   mac_set_clip_rectangles (dpy, gc, clip_rect, 1);
  
    /* Top.  */
    if (top_p)
***************
*** 2764,2776 ****
        XDrawLine (dpy, window, gc,
                 left_x + i, top_y + i, left_x + i, bottom_y - i);
  
!   mac_reset_clipping (dpy, window);
    if (raised_p)
      gc = f->output_data.mac->black_relief.gc;
    else
      gc = f->output_data.mac->white_relief.gc;
!   mac_set_clip_rectangle (dpy, window,
!                         clip_rect);
  
    /* Bottom.  */
    if (bot_p)
--- 2850,2861 ----
        XDrawLine (dpy, window, gc,
                 left_x + i, top_y + i, left_x + i, bottom_y - i);
  
!   mac_reset_clip_rectangles (dpy, gc);
    if (raised_p)
      gc = f->output_data.mac->black_relief.gc;
    else
      gc = f->output_data.mac->white_relief.gc;
!   mac_set_clip_rectangles (dpy, gc, clip_rect, 1);
  
    /* Bottom.  */
    if (bot_p)
***************
*** 2785,2791 ****
        XDrawLine (dpy, window, gc,
                 right_x - i, top_y + i + 1, right_x - i, bottom_y - i - 1);
  
!   mac_reset_clipping (dpy, window);
  }
  
  
--- 2870,2876 ----
        XDrawLine (dpy, window, gc,
                 right_x - i, top_y + i + 1, right_x - i, bottom_y - i - 1);
  
!   mac_reset_clip_rectangles (dpy, gc);
  }
  
  
***************
*** 2807,2813 ****
  
    XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
    XSetForeground (s->display, s->gc, s->face->box_color);
!   mac_set_clip_rectangle (s->display, s->window, clip_rect);
  
    /* Top.  */
    XFillRectangle (s->display, s->window, s->gc,
--- 2892,2898 ----
  
    XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
    XSetForeground (s->display, s->gc, s->face->box_color);
!   mac_set_clip_rectangles (s->display, s->gc, clip_rect, 1);
  
    /* Top.  */
    XFillRectangle (s->display, s->window, s->gc,
***************
*** 2828,2834 ****
                    right_x - width + 1, top_y, width, bottom_y - top_y + 1);
  
    XSetForeground (s->display, s->gc, xgcv.foreground);
!   mac_reset_clipping (s->display, s->window);
  }
  
  
--- 2913,2919 ----
                    right_x - width + 1, top_y, width, bottom_y - top_y + 1);
  
    XSetForeground (s->display, s->gc, xgcv.foreground);
!   mac_reset_clip_rectangles (s->display, s->gc);
  }
  
  
***************
*** 3182,3188 ****
        x_set_glyph_string_clipping (s);
        mac_copy_area (s->display, pixmap, s->window, s->gc,
                     0, 0, s->background_width, s->height, s->x, s->y);
-       mac_reset_clipping (s->display, s->window);
        XFreePixmap (s->display, pixmap);
      }
    else
--- 3267,3272 ----
***************
*** 3234,3240 ****
            gc = s->face->gc;
  
          get_glyph_string_clip_rect (s, &r);
!         mac_set_clip_rectangle (s->display, s->window, &r);
  
  #if 0 /* MAC_TODO: stipple */
          if (s->face->stipple)
--- 3318,3324 ----
            gc = s->face->gc;
  
          get_glyph_string_clip_rect (s, &r);
!         mac_set_clip_rectangles (s->display, gc, &r, 1);
  
  #if 0 /* MAC_TODO: stipple */
          if (s->face->stipple)
***************
*** 3247,3254 ****
          else
  #endif /* MAC_TODO */
            mac_erase_rectangle (s->window, gc, x, y, w, h);
- 
-         mac_reset_clipping (s->display, s->window);
        }
      }
    else if (!s->background_filled_p)
--- 3331,3336 ----
***************
*** 3397,3403 ****
      }
  
    /* Reset clipping.  */
!   mac_reset_clipping (s->display, s->window);
  }
  
  /* Shift display to make room for inserted glyphs.   */
--- 3479,3485 ----
      }
  
    /* Reset clipping.  */
!   mac_reset_clip_rectangles (s->display, s->gc);
  }
  
  /* Shift display to make room for inserted glyphs.   */
***************
*** 5270,5276 ****
    clip_rect.right = clip_rect.left + window_width;
    clip_rect.bottom = clip_rect.top + row->visible_height;
  
!   mac_set_clip_rectangle (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f), 
&clip_rect);
  }
  
  
--- 5352,5358 ----
    clip_rect.right = clip_rect.left + window_width;
    clip_rect.bottom = clip_rect.top + row->visible_height;
  
!   mac_set_clip_rectangles (FRAME_MAC_DISPLAY (f), gc, &clip_rect, 1);
  }
  
  
***************
*** 5313,5319 ****
    /* Set clipping, draw the rectangle, and reset clipping again.  */
    x_clip_to_row (w, row, TEXT_AREA, gc);
    mac_draw_rectangle (dpy, FRAME_MAC_WINDOW (f), gc, x, y, wd, h);
!   mac_reset_clipping (dpy, FRAME_MAC_WINDOW (f));
  }
  
  
--- 5395,5401 ----
    /* Set clipping, draw the rectangle, and reset clipping again.  */
    x_clip_to_row (w, row, TEXT_AREA, gc);
    mac_draw_rectangle (dpy, FRAME_MAC_WINDOW (f), gc, x, y, wd, h);
!   mac_reset_clip_rectangles (dpy, gc);
  }
  
  
***************
*** 5397,5403 ****
                        cursor_glyph->pixel_width,
                        width);
  
!       mac_reset_clipping (dpy, FRAME_MAC_WINDOW (f));
      }
  }
  
--- 5479,5485 ----
                        cursor_glyph->pixel_width,
                        width);
  
!       mac_reset_clip_rectangles (dpy, gc);
      }
  }
  
***************
*** 7610,7616 ****
        ATSUFontFeatureType types[] = {kAllTypographicFeaturesType};
        ATSUFontFeatureSelector selectors[] = {kAllTypeFeaturesOffSelector};
        Lisp_Object font_id_cons;
!       
        font_id_cons = Fgethash (Fdowncase
                               (make_unibyte_string (mfontname,
                                                     strlen (mfontname))),
--- 7692,7698 ----
        ATSUFontFeatureType types[] = {kAllTypographicFeaturesType};
        ATSUFontFeatureSelector selectors[] = {kAllTypeFeaturesOffSelector};
        Lisp_Object font_id_cons;
! 
        font_id_cons = Fgethash (Fdowncase
                               (make_unibyte_string (mfontname,
                                                     strlen (mfontname))),