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

[Richard M. Stallman]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.443 emacs/src/window.c:1.444
*** emacs/src/window.c:1.443    Tue Jun  3 07:12:48 2003
--- emacs/src/window.c  Wed Jun  4 20:36:28 2003
***************
*** 654,659 ****
--- 654,663 ----
            return ON_VERTICAL_BORDER;
        }
  
+       /* Convert X and Y to window relative coordinates.
+        Mode line starts at left edge of window.  */
+       *x -= x0;
+       *y -= top_y;
        return part;
      }
  
***************
*** 703,709 ****
          && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
              ? (*x >= left_x + WINDOW_LEFT_FRINGE_WIDTH (w))
              : (*x < left_x + lmargin_width)))
!       return ON_LEFT_MARGIN;
  
        /* Convert X and Y to window-relative pixel coordinates.  */
        *x -= left_x;
--- 707,719 ----
          && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
              ? (*x >= left_x + WINDOW_LEFT_FRINGE_WIDTH (w))
              : (*x < left_x + lmargin_width)))
!       {
!         *x -= x0;
!         if (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w))
!           *x -= WINDOW_LEFT_FRINGE_WIDTH (w);
!         *y -= top_y;
!         return ON_LEFT_MARGIN;
!       }
  
        /* Convert X and Y to window-relative pixel coordinates.  */
        *x -= left_x;
***************
*** 717,723 ****
          && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
              ? (*x < right_x - WINDOW_RIGHT_FRINGE_WIDTH (w))
              : (*x >= right_x - rmargin_width)))
!       return ON_RIGHT_MARGIN;
  
        /* Convert X and Y to window-relative pixel coordinates.  */
        *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w);
--- 727,739 ----
          && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
              ? (*x < right_x - WINDOW_RIGHT_FRINGE_WIDTH (w))
              : (*x >= right_x - rmargin_width)))
!       {
!         *x -= right_x;
!         if (!WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w))
!           *x -= WINDOW_RIGHT_FRINGE_WIDTH (w);
!         *y -= top_y;
!         return ON_RIGHT_MARGIN;
!       }
  
        /* Convert X and Y to window-relative pixel coordinates.  */
        *x -= left_x + WINDOW_LEFT_FRINGE_WIDTH (w);