aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/window.c b/src/window.c
index 00e887436d3..83a8974e88d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -859,7 +859,7 @@ The inside edges do not include the space used by the WINDOW's scroll
859bar, display margins, fringes, header line, and/or mode line. */) 859bar, display margins, fringes, header line, and/or mode line. */)
860 (Lisp_Object window) 860 (Lisp_Object window)
861{ 861{
862 register struct window *w = decode_any_window (window); 862 register struct window *w = decode_window (window);
863 863
864 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_COL (w) 864 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_COL (w)
865 + WINDOW_LEFT_MARGIN_COLS (w) 865 + WINDOW_LEFT_MARGIN_COLS (w)
@@ -874,9 +874,9 @@ bar, display margins, fringes, header line, and/or mode line. */)
874} 874}
875 875
876DEFUN ("window-inside-pixel-edges", Fwindow_inside_pixel_edges, Swindow_inside_pixel_edges, 0, 1, 0, 876DEFUN ("window-inside-pixel-edges", Fwindow_inside_pixel_edges, Swindow_inside_pixel_edges, 0, 1, 0,
877 doc: /* Return a list of the edge pixel coordinates of WINDOW. 877 doc: /* Return a list of the edge pixel coordinates of WINDOW's text area.
878The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at 878The list has the form (LEFT TOP RIGHT BOTTOM), all relative to (0,0)
879the top left corner of the frame. 879at the top left corner of the frame's window area.
880 880
881RIGHT is one more than the rightmost x position of WINDOW's text area. 881RIGHT is one more than the rightmost x position of WINDOW's text area.
882BOTTOM is one more than the bottommost y position of WINDOW's text area. 882BOTTOM is one more than the bottommost y position of WINDOW's text area.
@@ -884,7 +884,7 @@ The inside edges do not include the space used by WINDOW's scroll bar,
884display margins, fringes, header line, and/or mode line. */) 884display margins, fringes, header line, and/or mode line. */)
885 (Lisp_Object window) 885 (Lisp_Object window)
886{ 886{
887 register struct window *w = decode_any_window (window); 887 register struct window *w = decode_window (window);
888 888
889 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w) 889 return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w)
890 + WINDOW_LEFT_MARGIN_WIDTH (w) 890 + WINDOW_LEFT_MARGIN_WIDTH (w)
@@ -901,9 +901,9 @@ display margins, fringes, header line, and/or mode line. */)
901DEFUN ("window-inside-absolute-pixel-edges", 901DEFUN ("window-inside-absolute-pixel-edges",
902 Fwindow_inside_absolute_pixel_edges, 902 Fwindow_inside_absolute_pixel_edges,
903 Swindow_inside_absolute_pixel_edges, 0, 1, 0, 903 Swindow_inside_absolute_pixel_edges, 0, 1, 0,
904 doc: /* Return a list of the edge pixel coordinates of WINDOW. 904 doc: /* Return a list of the edge pixel coordinates of WINDOW's text area.
905The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at 905The list has the form (LEFT TOP RIGHT BOTTOM), all relative to (0,0)
906the top left corner of the display. 906at the top left corner of the frame's window area.
907 907
908RIGHT is one more than the rightmost x position of WINDOW's text area. 908RIGHT is one more than the rightmost x position of WINDOW's text area.
909BOTTOM is one more than the bottommost y position of WINDOW's text area. 909BOTTOM is one more than the bottommost y position of WINDOW's text area.
@@ -911,7 +911,7 @@ The inside edges do not include the space used by WINDOW's scroll bar,
911display margins, fringes, header line, and/or mode line. */) 911display margins, fringes, header line, and/or mode line. */)
912 (Lisp_Object window) 912 (Lisp_Object window)
913{ 913{
914 register struct window *w = decode_any_window (window); 914 register struct window *w = decode_window (window);
915 int add_x, add_y; 915 int add_x, add_y;
916 calc_absolute_offset (w, &add_x, &add_y); 916 calc_absolute_offset (w, &add_x, &add_y);
917 917