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

[Kim F. Storm]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.128 emacs/src/w32term.c:1.129
*** emacs/src/w32term.c:1.128   Wed Nov 28 15:36:12 2001
--- emacs/src/w32term.c Fri Nov 30 20:25:42 2001
***************
*** 84,92 ****
     `indicate-empty-lines' is non-nil.  */
  
  #define zv_width 8
! #define zv_height 8
! static unsigned short zv_bits[] = {
!    0x00, 0x00, 0x78, 0x78, 0x78, 0x78, 0x00, 0x00};
  static HBITMAP zv_bmp;
  
  /* An arrow like this: `<-'.  */
--- 84,100 ----
     `indicate-empty-lines' is non-nil.  */
  
  #define zv_width 8
! #define zv_height 72
! #define zv_period 3
! static unsigned char zv_bits[] = {
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
!   0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00};
  static HBITMAP zv_bmp;
  
  /* An arrow like this: `<-'.  */
***************
*** 400,406 ****
  void x_display_cursor P_ ((struct window *w, int, int, int, int, int));
  void x_display_and_set_cursor P_ ((struct window *, int, int, int, int, int));
  static void w32_draw_fringe_bitmap P_ ((struct window *, HDC hdc, struct 
glyph_row *, 
!                                       enum fringe_bitmap_type));
  static void w32_clip_to_row P_ ((struct window *, struct glyph_row *,
                                   HDC, int));
  static int x_phys_cursor_in_rect_p P_ ((struct window *, RECT *));
--- 408,414 ----
  void x_display_cursor P_ ((struct window *w, int, int, int, int, int));
  void x_display_and_set_cursor P_ ((struct window *, int, int, int, int, int));
  static void w32_draw_fringe_bitmap P_ ((struct window *, HDC hdc, struct 
glyph_row *, 
!                                       enum fringe_bitmap_type, int left_p));
  static void w32_clip_to_row P_ ((struct window *, struct glyph_row *,
                                   HDC, int));
  static int x_phys_cursor_in_rect_p P_ ((struct window *, RECT *));
***************
*** 810,825 ****
     drawn.  */
  
  static void
! w32_draw_fringe_bitmap (w, hdc, row, which)
       struct window *w;
       HDC hdc;
       struct glyph_row *row;
       enum fringe_bitmap_type which;
  {
    struct frame *f = XFRAME (WINDOW_FRAME (w));
    Window window = FRAME_W32_WINDOW (f);
    HDC compat_hdc;
    int x, y, wd, h, dy;
    HBITMAP pixmap;
    HANDLE horig_obj;
    struct face *face;
--- 818,835 ----
     drawn.  */
  
  static void
! w32_draw_fringe_bitmap (w, hdc, row, which, left_p)
       struct window *w;
       HDC hdc;
       struct glyph_row *row;
       enum fringe_bitmap_type which;
+      int left_p;
  {
    struct frame *f = XFRAME (WINDOW_FRAME (w));
    Window window = FRAME_W32_WINDOW (f);
    HDC compat_hdc;
    int x, y, wd, h, dy;
+   int b1, b2;
    HBITMAP pixmap;
    HANDLE horig_obj;
    struct face *face;
***************
*** 827,898 ****
    /* Must clip because of partially visible lines.  */
    w32_clip_to_row (w, row, hdc, 1);
  
    switch (which)
      {
      case LEFT_TRUNCATION_BITMAP:
        wd = left_width;
        h = left_height;
        pixmap = left_bmp;
-       x = (WINDOW_TO_FRAME_PIXEL_X (w, 0)
-          - wd
-          - (FRAME_X_LEFT_FRINGE_WIDTH (f) - wd) / 2);
        break;
        
      case OVERLAY_ARROW_BITMAP:
        wd = ov_width;
        h = ov_height;
        pixmap = ov_bmp;
-       x = (WINDOW_TO_FRAME_PIXEL_X (w, 0)
-          - wd
-          - (FRAME_X_LEFT_FRINGE_WIDTH (f) - wd) / 2);
        break;
        
      case RIGHT_TRUNCATION_BITMAP:
        wd = right_width;
        h = right_height;
        pixmap = right_bmp;
-       x = window_box_right (w, -1);
-       x += (FRAME_X_RIGHT_FRINGE_WIDTH (f) - wd) / 2;
        break;
  
      case CONTINUED_LINE_BITMAP:
        wd = continued_width;
        h = continued_height;
        pixmap = continued_bmp;
-       x = window_box_right (w, -1);
-       x += (FRAME_X_RIGHT_FRINGE_WIDTH (f) - wd) / 2;
        break;
        
      case CONTINUATION_LINE_BITMAP:
        wd = continuation_width;
        h = continuation_height;
        pixmap = continuation_bmp;
-       x = (WINDOW_TO_FRAME_PIXEL_X (w, 0)
-          - wd
-          - (FRAME_X_LEFT_FRINGE_WIDTH (f) - wd) / 2);
        break;
  
      case ZV_LINE_BITMAP:
        wd = zv_width;
!       h = zv_height;
        pixmap = zv_bmp;
-       x = (WINDOW_TO_FRAME_PIXEL_X (w, 0)
-          - wd
-          - (FRAME_X_LEFT_FRINGE_WIDTH (f) - wd) / 2);
        break;
  
      default:
        abort ();
      }
  
!   /* Convert to frame coordinates.  Set dy to the offset in the row to
!      start drawing the bitmap.  */
!   y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
    dy = (row->height - h) / 2;
  
    /* Draw the bitmap.  */
    face = FACE_FROM_ID (f, FRINGE_FACE_ID);
  
    compat_hdc = CreateCompatibleDC (hdc);
    SaveDC (hdc);
  
--- 837,955 ----
    /* Must clip because of partially visible lines.  */
    w32_clip_to_row (w, row, hdc, 1);
  
+   /* Convert row to frame coordinates.  */
+   y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
+ 
    switch (which)
      {
+     case NO_FRINGE_BITMAP:
+       wd = 0;
+       h = 0;
+       break;
+ 
      case LEFT_TRUNCATION_BITMAP:
        wd = left_width;
        h = left_height;
        pixmap = left_bmp;
        break;
        
      case OVERLAY_ARROW_BITMAP:
        wd = ov_width;
        h = ov_height;
        pixmap = ov_bmp;
        break;
        
      case RIGHT_TRUNCATION_BITMAP:
        wd = right_width;
        h = right_height;
        pixmap = right_bmp;
        break;
  
      case CONTINUED_LINE_BITMAP:
        wd = continued_width;
        h = continued_height;
        pixmap = continued_bmp;
        break;
        
      case CONTINUATION_LINE_BITMAP:
        wd = continuation_width;
        h = continuation_height;
        pixmap = continuation_bmp;
        break;
  
      case ZV_LINE_BITMAP:
        wd = zv_width;
!       h = zv_height - (y % zv_period);
        pixmap = zv_bmp;
        break;
  
      default:
        abort ();
      }
  
!   /* Clip bitmap if too high.  */
!   if (h > row->height)
!     h = row->height;
! 
!   /* Set dy to the offset in the row to start drawing the bitmap.  */
    dy = (row->height - h) / 2;
  
    /* Draw the bitmap.  */
    face = FACE_FROM_ID (f, FRINGE_FACE_ID);
+   PREPARE_FACE_FOR_DISPLAY (f, face);
  
+   /* Clear left fringe if no bitmap to draw or if bitmap doesn't fill
+      the fringe.  */
+   b1 = -1;
+   if (left_p)
+     {
+       if (wd > FRAME_X_LEFT_FRINGE_WIDTH (f))
+       wd = FRAME_X_LEFT_FRINGE_WIDTH (f);
+       x = (WINDOW_TO_FRAME_PIXEL_X (w, 0)
+          - wd
+          - (FRAME_X_LEFT_FRINGE_WIDTH (f) - wd) / 2);
+       if (wd < FRAME_X_LEFT_FRINGE_WIDTH (f) || row->height > h)
+       {
+         /* If W has a vertical border to its left, don't draw over it.  */
+         int border = ((XFASTINT (w->left) > 0
+                        && !FRAME_HAS_VERTICAL_SCROLL_BARS (f))
+                       ? 1 : 0);
+         b1 = (window_box_left (w, -1)
+               - FRAME_X_LEFT_FRINGE_WIDTH (f)
+               + border);
+         b2 = (FRAME_X_LEFT_FRINGE_WIDTH (f) - border);
+       }
+     }
+   else
+     {
+       if (wd > FRAME_X_RIGHT_FRINGE_WIDTH (f))
+       wd = FRAME_X_RIGHT_FRINGE_WIDTH (f);
+       x = (window_box_right (w, -1)
+          + (FRAME_X_RIGHT_FRINGE_WIDTH (f) - wd) / 2);
+       /* Clear right fringe if no bitmap to draw of if bitmap doesn't fill
+        the fringe.  */
+       if (wd < FRAME_X_RIGHT_FRINGE_WIDTH (f) || row->height > h)
+       {
+         b1 = window_box_right (w, -1);
+         b2 = FRAME_X_RIGHT_FRINGE_WIDTH (f);
+       }
+     }
+ 
+   if (b1 >= 0)
+     {
+       int header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
+       
+       w32_fill_area (f, hdc, face->background,
+                      b1,
+                      WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
+                                                       row->y)),
+                      b2,
+                      row->visible_height);
+     }
+ 
+   if (which == NO_FRINGE_BITMAP)
+     return;
+ 
    compat_hdc = CreateCompatibleDC (hdc);
    SaveDC (hdc);
  
***************
*** 900,906 ****
    SetTextColor (hdc, face->background);
    SetBkColor (hdc, face->foreground);
  
!   BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, SRCCOPY);
  
    SelectObject (compat_hdc, horig_obj);
    DeleteDC (compat_hdc);
--- 957,965 ----
    SetTextColor (hdc, face->background);
    SetBkColor (hdc, face->foreground);
  
!   BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0,
!         (which == ZV_LINE_BITMAP ? (row->y % zv_period) : 0),
!         SRCCOPY);
  
    SelectObject (compat_hdc, horig_obj);
    DeleteDC (compat_hdc);
***************
*** 918,925 ****
  {
    struct frame *f = XFRAME (w->frame);
    enum fringe_bitmap_type bitmap;
-   struct face *face;
-   int header_line_height = -1;
    HDC hdc;
  
    xassert (interrupt_input_blocked);
--- 977,982 ----
***************
*** 929,1009 ****
    if (row->visible_height <= 0)
      return;
  
-   face = FACE_FROM_ID (f, FRINGE_FACE_ID);
-   PREPARE_FACE_FOR_DISPLAY (f, face);
- 
-   /* Decide which bitmap to draw in the left fringe.  */
-   if (row->overlay_arrow_p)
-     bitmap = OVERLAY_ARROW_BITMAP;
-   else if (row->truncated_on_left_p)
-     bitmap = LEFT_TRUNCATION_BITMAP;
-   else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
-     bitmap = CONTINUATION_LINE_BITMAP;
-   else if (row->indicate_empty_line_p)
-     bitmap = ZV_LINE_BITMAP;
-   else
-     bitmap = NO_FRINGE_BITMAP;
- 
    hdc = get_frame_dc (f);
  
!   /* Clear left fringe if no bitmap to draw or if bitmap doesn't fill
!      the fringe.  */
!   if (bitmap == NO_FRINGE_BITMAP
!       || FRAME_FRINGE_BITMAP_WIDTH (f) < FRAME_X_LEFT_FRINGE_WIDTH (f)
!       || row->height > FRAME_FRINGE_BITMAP_HEIGHT (f))
!     {
!       /* If W has a vertical border to its left, don't draw over it.  */
!       int border = ((XFASTINT (w->left) > 0
!                    && !FRAME_HAS_VERTICAL_SCROLL_BARS (f))
!                   ? 1 : 0);
!       int left = window_box_left (w, -1);
  
!       if (header_line_height < 0)
!       header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
!       
!       w32_fill_area (f, hdc, face->background,
!                      left - FRAME_X_LEFT_FRINGE_WIDTH (f) + border,
!                      WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
!                                                       row->y)),
!                      FRAME_X_LEFT_FRINGE_WIDTH (f) - border,
!                      row->visible_height);
      }
- 
-   /* Draw the left bitmap.  */
-   if (bitmap != NO_FRINGE_BITMAP)
-     w32_draw_fringe_bitmap (w, hdc, row, bitmap);
- 
-   /* Decide which bitmap to draw in the right fringe.  */
-   if (row->truncated_on_right_p)
-     bitmap = RIGHT_TRUNCATION_BITMAP;
-   else if (row->continued_p)
-     bitmap = CONTINUED_LINE_BITMAP;
-   else
-     bitmap = NO_FRINGE_BITMAP;
  
!   /* Clear right fringe if no bitmap to draw of if bitmap doesn't fill
!      the fringe.  */
!   if (bitmap == NO_FRINGE_BITMAP
!       || FRAME_FRINGE_BITMAP_WIDTH (f) < FRAME_X_RIGHT_FRINGE_WIDTH (f)
!       || row->height > FRAME_FRINGE_BITMAP_HEIGHT (f))
      {
!       int right = window_box_right (w, -1);
! 
!       if (header_line_height < 0)
!       header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
  
!       w32_fill_area (f, hdc, face->background,
!                      right,
!                      WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
!                                                       row->y)),
!                      FRAME_X_RIGHT_FRINGE_WIDTH (f),
!                      row->visible_height);
      }
  
-   /* Draw the right bitmap.  */
-   if (bitmap != NO_FRINGE_BITMAP)
-     w32_draw_fringe_bitmap (w, hdc, row, bitmap);
- 
    release_frame_dc (f, hdc);
  }
  
--- 986,1025 ----
    if (row->visible_height <= 0)
      return;
  
    hdc = get_frame_dc (f);
  
!   if (FRAME_X_LEFT_FRINGE_WIDTH (f) != 0)
!     {
!       /* Decide which bitmap to draw in the left fringe.  */
!       if (row->overlay_arrow_p)
!       bitmap = OVERLAY_ARROW_BITMAP;
!       else if (row->truncated_on_left_p)
!       bitmap = LEFT_TRUNCATION_BITMAP;
!       else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
!       bitmap = CONTINUATION_LINE_BITMAP;
!       else if (row->indicate_empty_line_p)
!       bitmap = ZV_LINE_BITMAP;
!       else
!       bitmap = NO_FRINGE_BITMAP;
  
!       w32_draw_fringe_bitmap (w, hdc, row, bitmap, 1);
      }
  
!   if (FRAME_X_RIGHT_FRINGE_WIDTH (f) != 0)
      {
!       /* Decide which bitmap to draw in the right fringe.  */
!       if (row->truncated_on_right_p)
!       bitmap = RIGHT_TRUNCATION_BITMAP;
!       else if (row->continued_p)
!       bitmap = CONTINUED_LINE_BITMAP;
!       else if (row->indicate_empty_line_p && FRAME_X_LEFT_FRINGE_WIDTH (f) == 
0)
!       bitmap = ZV_LINE_BITMAP;
!       else
!       bitmap = NO_FRINGE_BITMAP;
  
!       w32_draw_fringe_bitmap (w, hdc, row, bitmap, 0);
      }
  
    release_frame_dc (f, hdc);
  }
  
***************
*** 4898,4904 ****
        /* X is relative to the left edge of W, without scroll bars
         or fringes.  */
        struct frame *f = XFRAME (WINDOW_FRAME (w));
-       /* int width = FRAME_FRINGE_WIDTH (f); */
        int window_left_x = WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f);
  
        x += window_left_x;
--- 4914,4919 ----
***************
*** 9887,9892 ****
--- 9902,9991 ----
    return build_string (fontsetname);
  }
  
+ /* Compute actual fringe widths */
+ 
+ void
+ x_compute_fringe_widths (f, redraw)
+      struct frame *f;
+      int redraw;
+ {
+   int o_left = f->output_data.w32->left_fringe_width;
+   int o_right = f->output_data.w32->right_fringe_width;
+   int o_cols = f->output_data.w32->fringe_cols;
+ 
+   Lisp_Object left_fringe = Fassq (Qleft_fringe, f->param_alist);
+   Lisp_Object right_fringe = Fassq (Qright_fringe, f->param_alist);
+   int left_fringe_width, right_fringe_width;
+ 
+   if (!NILP (left_fringe))
+     left_fringe = Fcdr (left_fringe);
+   if (!NILP (right_fringe))
+     right_fringe = Fcdr (right_fringe);
+ 
+   left_fringe_width = ((NILP (left_fringe) || !INTEGERP (left_fringe)) ? 8 :
+                      XINT (left_fringe));
+   right_fringe_width = ((NILP (right_fringe) || !INTEGERP (right_fringe)) ? 8 
:
+                       XINT (right_fringe));
+ 
+   if (left_fringe_width || right_fringe_width)
+     {
+       int left_wid = left_fringe_width >= 0 ? left_fringe_width : 
-left_fringe_width;
+       int right_wid = right_fringe_width >= 0 ? right_fringe_width : 
-right_fringe_width;
+       int conf_wid = left_wid + right_wid;
+       int font_wid = FONT_WIDTH (f->output_data.w32->font);
+       int cols = (left_wid + right_wid + font_wid-1) / font_wid;
+       int real_wid = cols * font_wid;
+       if (left_wid && right_wid)
+       {
+         if (left_fringe_width < 0)
+           {
+             /* Left fringe width is fixed, adjust right fringe if necessary */
+             f->output_data.w32->left_fringe_width = left_wid;
+             f->output_data.w32->right_fringe_width = real_wid - left_wid;
+           }
+         else if (right_fringe_width < 0)
+           {
+             /* Right fringe width is fixed, adjust left fringe if necessary */
+             f->output_data.w32->left_fringe_width = real_wid - right_wid;
+             f->output_data.w32->right_fringe_width = right_wid;
+           }
+         else
+           {
+             /* Adjust both fringes with an equal amount.
+                Note that we are doing integer arithmetic here, so don't
+                lose a pixel if the total width is an odd number.  */
+             int fill = real_wid - conf_wid;
+             f->output_data.w32->left_fringe_width = left_wid + fill/2;
+             f->output_data.w32->right_fringe_width = right_wid + fill - 
fill/2;
+           }
+       }
+       else if (left_fringe_width)
+       {
+         f->output_data.w32->left_fringe_width = real_wid;
+         f->output_data.w32->right_fringe_width = 0;
+       }
+       else
+       {
+         f->output_data.w32->left_fringe_width = 0;
+         f->output_data.w32->right_fringe_width = real_wid;
+       }
+       f->output_data.w32->fringe_cols = cols;
+       f->output_data.w32->fringes_extra = real_wid;
+     }
+   else
+     {
+       f->output_data.w32->left_fringe_width = 0;
+       f->output_data.w32->right_fringe_width = 0;
+       f->output_data.w32->fringe_cols = 0;
+       f->output_data.w32->fringes_extra = 0;
+     }
+ 
+   if (redraw && FRAME_VISIBLE_P (f))
+     if (o_left != f->output_data.w32->left_fringe_width ||
+       o_right != f->output_data.w32->right_fringe_width ||
+       o_cols != f->output_data.w32->fringe_cols)
+       redraw_frame (f);
+ }
  
  /***********************************************************************
        TODO: W32 Input Methods
***************
*** 10020,10027 ****
      = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
         ? 0
         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font)));
!   f->output_data.w32->fringes_extra
!     = FRAME_FRINGE_WIDTH (f);
    pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols);
    pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows);
    
--- 10119,10127 ----
      = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
         ? 0
         : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font)));
! 
!   x_compute_fringe_widths (f, 0);
! 
    pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols);
    pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows);