/[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.472 by kfstorm, Wed Jul 21 21:08:45 2004 UTC revision 1.472.2.1 by miles, Sat Sep 4 12:01:19 2004 UTC
# Line 579  display margins, fringes, header line, a Line 579  display margins, fringes, header line, a
579     if it is on the window's modeline, return ON_MODE_LINE;     if it is on the window's modeline, return ON_MODE_LINE;
580     if it is on the border between the window and its right sibling,     if it is on the border between the window and its right sibling,
581        return ON_VERTICAL_BORDER.        return ON_VERTICAL_BORDER.
582       if it is on a scroll bar,
583          return ON_SCROLL_BAR.
584     if it is on the window's top line, return ON_HEADER_LINE;     if it is on the window's top line, return ON_HEADER_LINE;
585     if it is in left or right fringe of the window,     if it is in left or right fringe of the window,
586        return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y        return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y
# Line 673  coordinates_in_window (w, x, y) Line 675  coordinates_in_window (w, x, y)
675    
676    /* Outside any interesting column?  */    /* Outside any interesting column?  */
677    if (*x < left_x || *x > right_x)    if (*x < left_x || *x > right_x)
678      return ON_VERTICAL_BORDER;      return ON_SCROLL_BAR;
679    
680    lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);    lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
681    rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);    rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
# Line 783  If they are in the windows's left or rig Line 785  If they are in the windows's left or rig
785    ly = Fcdr (coordinates);    ly = Fcdr (coordinates);
786    CHECK_NUMBER_OR_FLOAT (lx);    CHECK_NUMBER_OR_FLOAT (lx);
787    CHECK_NUMBER_OR_FLOAT (ly);    CHECK_NUMBER_OR_FLOAT (ly);
788    x = FRAME_PIXEL_X_FROM_CANON_X (f, lx);    x = FRAME_PIXEL_X_FROM_CANON_X (f, lx) + FRAME_INTERNAL_BORDER_WIDTH (f);
789    y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly);    y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly) + FRAME_INTERNAL_BORDER_WIDTH (f);
790    
791    switch (coordinates_in_window (w, &x, &y))    switch (coordinates_in_window (w, &x, &y))
792      {      {
# Line 818  If they are in the windows's left or rig Line 820  If they are in the windows's left or rig
820      case ON_RIGHT_MARGIN:      case ON_RIGHT_MARGIN:
821        return Qright_margin;        return Qright_margin;
822    
823        case ON_SCROLL_BAR:
824          /* Historically we are supposed to return nil in this case.  */
825          return Qnil;
826    
827      default:      default:
828        abort ();        abort ();
829      }      }
# Line 938  column 0.  */) Line 944  column 0.  */)
944    CHECK_NUMBER_OR_FLOAT (y);    CHECK_NUMBER_OR_FLOAT (y);
945    
946    return window_from_coordinates (f,    return window_from_coordinates (f,
947                                    FRAME_PIXEL_X_FROM_CANON_X (f, x),                                    (FRAME_PIXEL_X_FROM_CANON_X (f, x)
948                                    FRAME_PIXEL_Y_FROM_CANON_Y (f, y),                                     + FRAME_INTERNAL_BORDER_WIDTH (f)),
949                                      (FRAME_PIXEL_Y_FROM_CANON_Y (f, y)
950                                       + FRAME_INTERNAL_BORDER_WIDTH (f)),
951                                    0, 0, 0, 0);                                    0, 0, 0, 0);
952  }  }
953    
# Line 1820  window_list_1 (window, minibuf, all_fram Line 1828  window_list_1 (window, minibuf, all_fram
1828    rest = Fmemq (window, list);    rest = Fmemq (window, list);
1829    if (!NILP (rest) && !EQ (rest, list))    if (!NILP (rest) && !EQ (rest, list))
1830      {      {
1831        for (tail = list; XCDR (tail) != rest; tail = XCDR (tail))        for (tail = list; !EQ (XCDR (tail), rest); tail = XCDR (tail))
1832          ;          ;
1833        XSETCDR (tail, Qnil);        XSETCDR (tail, Qnil);
1834        list = nconc2 (rest, list);        list = nconc2 (rest, list);
# Line 4699  window_scroll_line_based (window, n, who Line 4707  window_scroll_line_based (window, n, who
4707    
4708    posit = *compute_motion (startpos, 0, 0, 0,    posit = *compute_motion (startpos, 0, 0, 0,
4709                             PT, ht, 0,                             PT, ht, 0,
4710                             window_box_text_cols (w), XINT (w->hscroll),                             -1, XINT (w->hscroll),
4711                             0, w);                             0, w);
4712    original_vpos = posit.vpos;    original_vpos = posit.vpos;
4713    

Legend:
Removed from v.1.472  
changed lines
  Added in v.1.472.2.1

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