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

Diff of /emacs/src/window.c

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

revision 1.478 by rms, Thu Sep 9 02:10:40 2004 UTC revision 1.479 by kfstorm, Mon Oct 4 13:46:19 2004 UTC
# Line 607  coordinates_in_window (w, x, y) Line 607  coordinates_in_window (w, x, y)
607    int grabbable_width = ux;    int grabbable_width = ux;
608    int lmargin_width, rmargin_width, text_left, text_right;    int lmargin_width, rmargin_width, text_left, text_right;
609    
   if (*x < x0 || *x >= x1)  
     return ON_NOTHING;  
   
610    /* In what's below, we subtract 1 when computing right_x because we    /* In what's below, we subtract 1 when computing right_x because we
611       want the rightmost pixel, which is given by left_pixel+width-1.  */       want the rightmost pixel, which is given by left_pixel+width-1.  */
612    if (w->pseudo_window_p)    if (w->pseudo_window_p)
# Line 659  coordinates_in_window (w, x, y) Line 656  coordinates_in_window (w, x, y)
656              return ON_VERTICAL_BORDER;              return ON_VERTICAL_BORDER;
657          }          }
658    
659          if (*x < x0 || *x >= x1)
660            return ON_NOTHING;
661    
662        /* Convert X and Y to window relative coordinates.        /* Convert X and Y to window relative coordinates.
663           Mode line starts at left edge of window.  */           Mode line starts at left edge of window.  */
664        *x -= x0;        *x -= x0;
# Line 673  coordinates_in_window (w, x, y) Line 673  coordinates_in_window (w, x, y)
673        goto header_vertical_border_check;        goto header_vertical_border_check;
674      }      }
675    
676      if (*x < x0 || *x >= x1)
677        return ON_NOTHING;
678    
679    /* Outside any interesting column?  */    /* Outside any interesting column?  */
680    if (*x < left_x || *x > right_x)    if (*x < left_x || *x > right_x)
681      return ON_SCROLL_BAR;      return ON_SCROLL_BAR;
# Line 6034  display marginal areas and the text area Line 6037  display marginal areas and the text area
6037    struct window *w = decode_window (window);    struct window *w = decode_window (window);
6038    
6039    if (!NILP (left))    if (!NILP (left))
6040      CHECK_NUMBER (left);      CHECK_NATNUM (left);
6041    if (!NILP (right))    if (!NILP (right))
6042      CHECK_NUMBER (right);      CHECK_NATNUM (right);
6043    
6044    if (!EQ (w->left_fringe_width, left)    if (!EQ (w->left_fringe_width, left)
6045        || !EQ (w->right_fringe_width, right)        || !EQ (w->right_fringe_width, right)
# Line 6096  If TYPE is t, use the frame's scroll-bar Line 6099  If TYPE is t, use the frame's scroll-bar
6099    struct window *w = decode_window (window);    struct window *w = decode_window (window);
6100    
6101    if (!NILP (width))    if (!NILP (width))
6102      CHECK_NUMBER (width);      CHECK_NATNUM (width);
6103    
6104    if (XINT (width) == 0)    if (XINT (width) == 0)
6105      vertical_type = Qnil;      vertical_type = Qnil;

Legend:
Removed from v.1.478  
changed lines
  Added in v.1.479

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