[Emacs-diffs] Changes to emacs/src/window.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.445.2.5 emacs/src/window.c:1.445.2.6
*** emacs/src/window.c:1.445.2.5        Fri Jul 23 04:30:43 2004
--- emacs/src/window.c  Wed Jul 28 07:05:52 2004
***************
*** 579,584 ****
--- 579,586 ----
     if it is on the window's modeline, return ON_MODE_LINE;
     if it is on the border between the window and its right sibling,
        return ON_VERTICAL_BORDER.
+    if it is on a scroll bar,
+       return ON_SCROLL_BAR.
     if it is on the window's top line, return ON_HEADER_LINE;
     if it is in left or right fringe of the window,
        return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y
***************
*** 673,679 ****
  
    /* Outside any interesting column?  */
    if (*x < left_x || *x > right_x)
!     return ON_VERTICAL_BORDER;
  
    lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
    rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
--- 675,681 ----
  
    /* Outside any interesting column?  */
    if (*x < left_x || *x > right_x)
!     return ON_SCROLL_BAR;
  
    lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
    rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
***************
*** 783,790 ****
    ly = Fcdr (coordinates);
    CHECK_NUMBER_OR_FLOAT (lx);
    CHECK_NUMBER_OR_FLOAT (ly);
!   x = FRAME_PIXEL_X_FROM_CANON_X (f, lx);
!   y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly);
  
    switch (coordinates_in_window (w, &x, &y))
      {
--- 785,792 ----
    ly = Fcdr (coordinates);
    CHECK_NUMBER_OR_FLOAT (lx);
    CHECK_NUMBER_OR_FLOAT (ly);
!   x = FRAME_PIXEL_X_FROM_CANON_X (f, lx) + FRAME_INTERNAL_BORDER_WIDTH (f);
!   y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly) + FRAME_INTERNAL_BORDER_WIDTH (f);
  
    switch (coordinates_in_window (w, &x, &y))
      {
***************
*** 818,823 ****
--- 820,829 ----
      case ON_RIGHT_MARGIN:
        return Qright_margin;
  
+     case ON_SCROLL_BAR:
+       /* Historically we are supposed to return nil in this case.  */
+       return Qnil;
+ 
      default:
        abort ();
      }
***************
*** 938,945 ****
    CHECK_NUMBER_OR_FLOAT (y);
  
    return window_from_coordinates (f,
!                                 FRAME_PIXEL_X_FROM_CANON_X (f, x),
!                                 FRAME_PIXEL_Y_FROM_CANON_Y (f, y),
                                  0, 0, 0, 0);
  }
  
--- 944,953 ----
    CHECK_NUMBER_OR_FLOAT (y);
  
    return window_from_coordinates (f,
!                                 (FRAME_PIXEL_X_FROM_CANON_X (f, x)
!                                  + FRAME_INTERNAL_BORDER_WIDTH (f)),
!                                 (FRAME_PIXEL_Y_FROM_CANON_Y (f, y)
!                                  + FRAME_INTERNAL_BORDER_WIDTH (f)),
                                  0, 0, 0, 0);
  }