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

[Kim F . Storm]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.78 emacs/src/macterm.c:1.79
*** emacs/src/macterm.c:1.78    Wed Oct  6 15:38:53 2004
--- emacs/src/macterm.c Thu Oct  7 21:59:39 2004
***************
*** 1291,1299 ****
                                output_cursor.vpos,
                                output_cursor.x, output_cursor.y);
  
!       x_draw_vertical_border (w);
! 
!       draw_window_fringes (w);
  
        UNBLOCK_INPUT;
      }
--- 1291,1298 ----
                                output_cursor.vpos,
                                output_cursor.x, output_cursor.y);
  
!       if (draw_window_fringes (w, 1))
!       x_draw_vertical_border (w);
  
        UNBLOCK_INPUT;
      }
***************
*** 5050,5056 ****
    GetWindowBounds (FRAME_MAC_WINDOW (f), kWindowStructureRgn, outer);
  #else /* not TARGET_API_MAC_CARBON */
    RgnHandle region = NewRgn ();
!     
    GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowContentRgn, region);
    *inner = (*region)->rgnBBox;
    GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowStructureRgn, region);
--- 5049,5055 ----
    GetWindowBounds (FRAME_MAC_WINDOW (f), kWindowStructureRgn, outer);
  #else /* not TARGET_API_MAC_CARBON */
    RgnHandle region = NewRgn ();
! 
    GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowContentRgn, region);
    *inner = (*region)->rgnBBox;
    GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowStructureRgn, region);
***************
*** 5143,5149 ****
    {
      Rect inner, outer, screen_rect, dummy;
      RgnHandle region = NewRgn ();
!     
      mac_get_window_bounds (f, &inner, &outer);
      f->x_pixels_diff = inner.left - outer.left;
      f->y_pixels_diff = inner.top - outer.top;
--- 5142,5148 ----
    {
      Rect inner, outer, screen_rect, dummy;
      RgnHandle region = NewRgn ();
! 
      mac_get_window_bounds (f, &inner, &outer);
      f->x_pixels_diff = inner.left - outer.left;
      f->y_pixels_diff = inner.top - outer.top;
***************
*** 8114,8120 ****
        switch (GetEventClass (eventRef))
          {
          case kEventClassWindow:
!           if (GetEventKind (eventRef) == kEventWindowBoundsChanged) 
              {
                WindowPtr window_ptr;
                GetEventParameter(eventRef, kEventParamDirectObject,
--- 8113,8119 ----
        switch (GetEventClass (eventRef))
          {
          case kEventClassWindow:
!           if (GetEventKind (eventRef) == kEventWindowBoundsChanged)
              {
                WindowPtr window_ptr;
                GetEventParameter(eventRef, kEventParamDirectObject,
***************
*** 8431,8437 ****
  
            if (!is_emacs_window (window_ptr))
              break;
!           
            f = mac_window_to_frame (window_ptr);
  
            if ((er.modifiers & activeFlag) != 0)
--- 8430,8436 ----
  
            if (!is_emacs_window (window_ptr))
              break;
! 
            f = mac_window_to_frame (window_ptr);
  
            if ((er.modifiers & activeFlag) != 0)