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

[Gerd Moellmann]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.410 emacs/src/window.c:1.411
*** emacs/src/window.c:1.410    Sat Mar 30 18:49:39 2002
--- emacs/src/window.c  Fri Apr 12 05:36:21 2002
***************
*** 1,6 ****
  /* Window creation, deletion and examination for GNU Emacs.
     Does not include redisplay.
!    Copyright (C) 1985,86,87,93,94,95,96,97,1998,2000, 2001
     Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
--- 1,6 ----
  /* Window creation, deletion and examination for GNU Emacs.
     Does not include redisplay.
!    Copyright (C) 1985,86,87,93,94,95,96,97,1998,2000, 2001, 2002
     Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
***************
*** 58,69 ****
    ON_VERTICAL_BORDER,
    ON_HEADER_LINE,
    ON_LEFT_FRINGE,
!   ON_RIGHT_FRINGE
  };
  
  
  Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
  Lisp_Object Qwindow_size_fixed;
  extern Lisp_Object Qheight, Qwidth;
  
  static int displayed_window_lines P_ ((struct window *));
--- 58,72 ----
    ON_VERTICAL_BORDER,
    ON_HEADER_LINE,
    ON_LEFT_FRINGE,
!   ON_RIGHT_FRINGE,
!   ON_LEFT_MARGIN,
!   ON_RIGHT_MARGIN
  };
  
  
  Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
  Lisp_Object Qwindow_size_fixed;
+ extern Lisp_Object Qleft_margin, Qright_margin;
  extern Lisp_Object Qheight, Qwidth;
  
  static int displayed_window_lines P_ ((struct window *));
***************
*** 509,515 ****
        return 3.
     if it is on the window's top line, return 4;
     if it is in left or right fringe of the window,
!    return 5 or 6, and convert *X and *Y to window-relative corrdinates.
  
     X and Y are frame relative pixel coordinates.  */
  
--- 512,520 ----
        return 3.
     if it is on the window's top line, return 4;
     if it is in left or right fringe of the window,
!    return 5 or 6, and convert *X and *Y to window-relative coordinates;
!    if it is in the marginal area to the left/right of the window,
!    return 7 or 8, and convert *X and *Y to window-relative coordinates.
  
     X and Y are frame relative pixel coordinates.  */
  
***************
*** 623,631 ****
        }
        else
        {
!         *x -= left_x;
!         *y -= top_y;
!         part = ON_TEXT;
        }
      }
    else
--- 628,643 ----
        }
        else
        {
!         if (*x <= window_box_right (w, LEFT_MARGIN_AREA))
!           part = ON_LEFT_MARGIN;
!         else if (*x >= window_box_left (w, RIGHT_MARGIN_AREA))
!           part = ON_RIGHT_MARGIN;
!         else
!           {
!             part = ON_TEXT;
!             *x -= left_x;
!             *y -= top_y;
!           }
        }
      }
    else
***************
*** 653,662 ****
        }
        else
        {
!         /* Convert X and Y to window-relative pixel coordinates.  */
!         *x -= left_x;
!         *y -= top_y;
!         part = ON_TEXT;
        }
      }
  
--- 665,681 ----
        }
        else
        {
!         if (*x <= window_box_right (w, LEFT_MARGIN_AREA))
!           part = ON_LEFT_MARGIN;
!         else if (*x >= window_box_left (w, RIGHT_MARGIN_AREA))
!           part = ON_RIGHT_MARGIN;
!         else
!           {
!             part = ON_TEXT;
!             /* Convert X and Y to window-relative pixel coordinates.  */
!             *x -= left_x;
!             *y -= top_y;
!           }
        }
      }
  
***************
*** 678,684 ****
  If they are in the left fringe of WINDOW, `left-fringe' is returned.
  If they are in the right fringe of WINDOW, `right-fringe' is returned.
  If they are on the border between WINDOW and its right sibling,
!   `vertical-line' is returned.  */)
       (coordinates, window)
       register Lisp_Object coordinates, window;
  {
--- 697,705 ----
  If they are in the left fringe of WINDOW, `left-fringe' is returned.
  If they are in the right fringe of WINDOW, `right-fringe' is returned.
  If they are on the border between WINDOW and its right sibling,
!   `vertical-line' is returned.
! If they are in the windows's left or right marginal areas, `left-margin'\n\
!   or `right-margin' is returned.  */)
       (coordinates, window)
       register Lisp_Object coordinates, window;
  {
***************
*** 723,728 ****
--- 744,755 ----
        
      case ON_RIGHT_FRINGE:
        return Qright_fringe;
+ 
+     case ON_LEFT_MARGIN:
+       return Qleft_margin;
+       
+     case ON_RIGHT_MARGIN:
+       return Qright_margin;
  
      default:
        abort ();