/[emacs]/emacs/src/xterm.c
ViewVC logotype

Diff of /emacs/src/xterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.842 by monnier, Sat Sep 18 21:36:02 2004 UTC revision 1.843 by kfstorm, Mon Oct 4 14:07:06 2004 UTC
# Line 5046  XTset_vertical_scroll_bar (w, portion, w Line 5046  XTset_vertical_scroll_bar (w, portion, w
5046    /* Compute the left edge of the scroll bar.  */    /* Compute the left edge of the scroll bar.  */
5047  #ifdef USE_TOOLKIT_SCROLL_BARS  #ifdef USE_TOOLKIT_SCROLL_BARS
5048    if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))    if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
5049      sb_left = left + width - sb_width - (width - sb_width) / 2;      sb_left = (left +
5050                   (WINDOW_RIGHTMOST_P (w)
5051                    ? width - sb_width - (width - sb_width) / 2
5052                    : 0));
5053    else    else
5054      sb_left = left + (width - sb_width) / 2;      sb_left = (left +
5055                   (WINDOW_LEFTMOST_P (w)
5056                    ? (width - sb_width) / 2
5057                    : width - sb_width));
5058  #else  #else
5059    if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))    if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
5060      sb_left = left + width - sb_width;      sb_left = left + width - sb_width;
# Line 5101  XTset_vertical_scroll_bar (w, portion, w Line 5107  XTset_vertical_scroll_bar (w, portion, w
5107                                   width);                                   width);
5108  #else /* not USE_GTK */  #else /* not USE_GTK */
5109    
       /* Since toolkit scroll bars are smaller than the space reserved  
          for them on the frame, we have to clear "under" them.  */  
       if (width > 0 && height > 0)  
         x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),  
                           left, top, width, height, False);  
5110        /* Move/size the scroll bar widget.  */        /* Move/size the scroll bar widget.  */
5111        if (mask)        if (mask)
5112            {
5113              /* Since toolkit scroll bars are smaller than the space reserved
5114                 for them on the frame, we have to clear "under" them.  */
5115              if (width > 0 && height > 0)
5116                x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
5117                              left, top, width, height, False);
5118            XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar),            XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar),
5119                               sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,                               sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
5120                               top,                               top,
5121                               sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,                               sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
5122                               max (height, 1), 0);                               max (height, 1), 0);
5123            }
5124  #endif /* not USE_GTK */  #endif /* not USE_GTK */
5125  #else /* not USE_TOOLKIT_SCROLL_BARS */  #else /* not USE_TOOLKIT_SCROLL_BARS */
5126    

Legend:
Removed from v.1.842  
changed lines
  Added in v.1.843

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26