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

[YAMAMOTO Mitsuharu]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.114 emacs/src/macterm.c:1.115
*** emacs/src/macterm.c:1.114   Fri May  6 08:03:24 2005
--- emacs/src/macterm.c Fri May 13 08:42:38 2005
***************
*** 3271,3281 ****
    BLOCK_INPUT;
    XClearWindow (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f));
  
- #if 0  /* Clearing frame on Mac OS clears scroll bars.  */
    /* We have to clear the scroll bars, too.  If we have changed
       colors or something like that, then they should be notified.  */
    x_scroll_bar_clear (f);
- #endif
  
    XFlush (FRAME_MAC_DISPLAY (f));
    UNBLOCK_INPUT;
--- 3271,3279 ----
***************
*** 4135,4146 ****
  static pascal void scroll_bar_timer_callback P_ ((EventLoopTimerRef, void *));
  static OSStatus install_scroll_bar_timer P_ ((void));
  static OSStatus set_scroll_bar_timer P_ ((EventTimerInterval));
! static int control_part_code_to_scroll_bar_part P_((ControlPartCode));
  static void construct_scroll_bar_click P_ ((struct scroll_bar *, int,
                                            unsigned long,
                                            struct input_event *));
! static OSErr get_control_part_bound P_((ControlHandle, ControlPartCode,
!                                       Rect *));
  static void x_scroll_bar_handle_press P_ ((struct scroll_bar *,
                                           ControlPartCode,
                                           unsigned long,
--- 4133,4144 ----
  static pascal void scroll_bar_timer_callback P_ ((EventLoopTimerRef, void *));
  static OSStatus install_scroll_bar_timer P_ ((void));
  static OSStatus set_scroll_bar_timer P_ ((EventTimerInterval));
! static int control_part_code_to_scroll_bar_part P_ ((ControlPartCode));
  static void construct_scroll_bar_click P_ ((struct scroll_bar *, int,
                                            unsigned long,
                                            struct input_event *));
! static OSErr get_control_part_bounds P_ ((ControlHandle, ControlPartCode,
!                                         Rect *));
  static void x_scroll_bar_handle_press P_ ((struct scroll_bar *,
                                           ControlPartCode,
                                           unsigned long,
***************
*** 4267,4273 ****
  }
  
  static OSErr
! get_control_part_bound (ch, part_code, rect)
       ControlHandle ch;
       ControlPartCode part_code;
       Rect *rect;
--- 4265,4271 ----
  }
  
  static OSErr
! get_control_part_bounds (ch, part_code, rect)
       ControlHandle ch;
       ControlPartCode part_code;
       Rect *rect;
***************
*** 4340,4347 ****
        int top, top_range;
        Rect r;
  
!       get_control_part_bound (SCROLL_BAR_CONTROL_HANDLE (bar),
!                             kControlIndicatorPart, &r);
  
        if (GC_NILP (bar->dragging))
        XSETINT (bar->dragging, mouse_pos.v - r.top);
--- 4338,4345 ----
        int top, top_range;
        Rect r;
  
!       get_control_part_bounds (SCROLL_BAR_CONTROL_HANDLE (bar),
!                              kControlIndicatorPart, &r);
  
        if (GC_NILP (bar->dragging))
        XSETINT (bar->dragging, mouse_pos.v - r.top);
***************
*** 4669,4681 ****
        BLOCK_INPUT;
  
        /* If already correctly positioned, do nothing.  */
!       if (XINT (bar->left) == sb_left
!           && XINT (bar->top) == top
!           && XINT (bar->width) == sb_width
!           && XINT (bar->height) == height)
!         Draw1Control (ch);
!       else
!         {
          /* Clear areas not covered by the scroll bar because it's not as
             wide as the area reserved for it .  This makes sure a
             previous mode line display is cleared after C-x 2 C-x 1, for
--- 4667,4677 ----
        BLOCK_INPUT;
  
        /* If already correctly positioned, do nothing.  */
!       if (!(XINT (bar->left) == sb_left
!           && XINT (bar->top) == top
!           && XINT (bar->width) == sb_width
!           && XINT (bar->height) == height))
!       {
          /* Clear areas not covered by the scroll bar because it's not as
             wide as the area reserved for it .  This makes sure a
             previous mode line display is cleared after C-x 2 C-x 1, for
***************
*** 4724,4734 ****
  
        /* Move the scroll bar thumb to the top.  */
        SetControl32BitValue (ch, 0);
!       get_control_part_bound (ch, kControlIndicatorPart, &r0);
  
        /* Move the scroll bar thumb to the bottom.  */
        SetControl32BitValue (ch, 1);
!       get_control_part_bound (ch, kControlIndicatorPart, &r1);
  
        UnionRect (&r0, &r1, &r0);
        XSETINT (bar->track_top, r0.top);
--- 4720,4730 ----
  
        /* Move the scroll bar thumb to the top.  */
        SetControl32BitValue (ch, 0);
!       get_control_part_bounds (ch, kControlIndicatorPart, &r0);
  
        /* Move the scroll bar thumb to the bottom.  */
        SetControl32BitValue (ch, 1);
!       get_control_part_bounds (ch, kControlIndicatorPart, &r1);
  
        UnionRect (&r0, &r1, &r0);
        XSETINT (bar->track_top, r0.top);
***************
*** 4876,4882 ****
  static void
  x_scroll_bar_handle_click (bar, part_code, er, bufp)
       struct scroll_bar *bar;
!      int part_code;
       EventRecord *er;
       struct input_event *bufp;
  {
--- 4872,4878 ----
  static void
  x_scroll_bar_handle_click (bar, part_code, er, bufp)
       struct scroll_bar *bar;
!      ControlPartCode part_code;
       EventRecord *er;
       struct input_event *bufp;
  {
***************
*** 5034,5039 ****
--- 5030,5050 ----
  
    *time = last_mouse_movement_time;
  }
+ 
+ 
+ /* The screen has been cleared so we may have changed foreground or
+    background colors, and the scroll bars may need to be redrawn.
+    Clear out the scroll bars, and ask for expose events, so we can
+    redraw them.  */
+ 
+ void
+ x_scroll_bar_clear (f)
+      FRAME_PTR f;
+ {
+   XTcondemn_scroll_bars (f);
+   XTjudge_scroll_bars (f);
+ }
+ 
  
  /***********************************************************************
                             Text Cursor
***************
*** 7498,7504 ****
  
  extern void init_emacs_passwd_dir ();
  extern int emacs_main (int, char **, char **);
- extern void check_alarm ();
  
  extern void initialize_applescript();
  extern void terminate_applescript();
--- 7509,7514 ----
***************
*** 8650,8672 ****
  #endif
  
  /* These few functions implement Emacs as a normal Mac application
!    (almost): set up the heap and the Toolbox, handle necessary
!    system events plus a few simple menu events.  They also set up
!    Emacs's access to functions defined in the rest of this file.
!    Emacs uses function hooks to perform all its terminal I/O.  A
!    complete list of these functions appear in termhooks.h.  For what
!    they do, read the comments there and see also w32term.c and
!    xterm.c.  What's noticeably missing here is the event loop, which
!    is normally present in most Mac application.  After performing the
!    necessary Mac initializations, main passes off control to
!    emacs_main (corresponding to main in emacs.c).  Emacs_main calls
!    mac_read_socket (defined further below) to read input.  This is
!    where WaitNextEvent is called to process Mac events.  This is also
!    where check_alarm in sysdep.c is called to simulate alarm signals.
!    This makes the cursor jump back to its correct position after
!    briefly jumping to that of the matching parenthesis, print useful
!    hints and prompts in the minibuffer after the user stops typing for
!    a wait, etc.  */
  
  #ifdef MAC_OS8
  #undef main
--- 8660,8677 ----
  #endif
  
  /* These few functions implement Emacs as a normal Mac application
!    (almost): set up the heap and the Toolbox, handle necessary system
!    events plus a few simple menu events.  They also set up Emacs's
!    access to functions defined in the rest of this file.  Emacs uses
!    function hooks to perform all its terminal I/O.  A complete list of
!    these functions appear in termhooks.h.  For what they do, read the
!    comments there and see also w32term.c and xterm.c.  What's
!    noticeably missing here is the event loop, which is normally
!    present in most Mac application.  After performing the necessary
!    Mac initializations, main passes off control to emacs_main
!    (corresponding to main in emacs.c).  Emacs_main calls XTread_socket
!    (defined further below) to read input.  This is where
!    WaitNextEvent/ReceiveNextEvent is called to process Mac events.  */
  
  #ifdef MAC_OS8
  #undef main
***************
*** 8929,8935 ****
        case mouseUp:
          {
            WindowPtr window_ptr;
!           SInt16 part_code;
            int tool_bar_p = 0;
  
  #if USE_CARBON_EVENTS
--- 8934,8940 ----
        case mouseUp:
          {
            WindowPtr window_ptr;
!           ControlPartCode part_code;
            int tool_bar_p = 0;
  
  #if USE_CARBON_EVENTS
***************
*** 8973,8979 ****
                  SelectWindow (window_ptr);
                else
                  {
!                   SInt16 control_part_code;
                    ControlHandle ch;
                    Point mouse_loc = er.where;
  #ifdef MAC_OSX
--- 8978,8984 ----
                  SelectWindow (window_ptr);
                else
                  {
!                   ControlPartCode control_part_code;
                    ControlHandle ch;
                    Point mouse_loc = er.where;
  #ifdef MAC_OSX
***************
*** 9548,9557 ****
        pending_autoraise_frame = 0;
      }
  
- #if !TARGET_API_MAC_CARBON
-   check_alarm ();  /* simulate the handling of a SIGALRM */
- #endif
- 
    UNBLOCK_INPUT;
    return count;
  }
--- 9553,9558 ----