/* Window creation, deletion and examination for GNU Emacs.
Does not include redisplay.
- Copyright (C) 1985-1987, 1993-1998, 2000-2012
- Free Software Foundation, Inc.
+ Copyright (C) 1985-1987, 1993-1998, 2000-2013 Free Software
+ Foundation, Inc.
This file is part of GNU Emacs.
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
+#define WINDOW_INLINE EXTERN_INLINE
+
#include <stdio.h>
-#include <setjmp.h>
#include "lisp.h"
#include "character.h"
#ifdef HAVE_X_WINDOWS
#include "xterm.h"
#endif /* HAVE_X_WINDOWS */
-#ifdef WINDOWSNT
+#ifdef HAVE_NTGUI
#include "w32term.h"
#endif
#ifdef MSDOS
#endif
Lisp_Object Qwindowp, Qwindow_live_p;
+static Lisp_Object Qwindow_valid_p;
static Lisp_Object Qwindow_configuration_p, Qrecord_window_buffer;
static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer;
static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;
static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically;
static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
-static Lisp_Object Qsafe, Qabove, Qbelow;
-static Lisp_Object Qauto_buffer_name, Qclone_of;
+static Lisp_Object Qsafe, Qabove, Qbelow, Qwindow_size, Qclone_of;
static int displayed_window_lines (struct window *);
-static struct window *decode_window (Lisp_Object);
static int count_windows (struct window *);
static int get_leaf_windows (struct window *, struct window **, int);
static void window_scroll (Lisp_Object, EMACS_INT, int, int);
static EMACS_INT window_scroll_preserve_hpos;
static EMACS_INT window_scroll_preserve_vpos;
\f
-static struct window *
-decode_window (register Lisp_Object window)
+/* These setters are used only in this file, so they can be private. */
+static void
+wset_combination_limit (struct window *w, Lisp_Object val)
+{
+ w->combination_limit = val;
+}
+static void
+wset_dedicated (struct window *w, Lisp_Object val)
+{
+ w->dedicated = val;
+}
+static void
+wset_display_table (struct window *w, Lisp_Object val)
+{
+ w->display_table = val;
+}
+static void
+wset_hchild (struct window *w, Lisp_Object val)
+{
+ w->hchild = val;
+}
+static void
+wset_left_fringe_width (struct window *w, Lisp_Object val)
+{
+ w->left_fringe_width = val;
+}
+static void
+wset_left_margin_cols (struct window *w, Lisp_Object val)
+{
+ w->left_margin_cols = val;
+}
+static void
+wset_new_normal (struct window *w, Lisp_Object val)
+{
+ w->new_normal = val;
+}
+static void
+wset_new_total (struct window *w, Lisp_Object val)
+{
+ w->new_total = val;
+}
+static void
+wset_normal_cols (struct window *w, Lisp_Object val)
+{
+ w->normal_cols = val;
+}
+static void
+wset_normal_lines (struct window *w, Lisp_Object val)
+{
+ w->normal_lines = val;
+}
+static void
+wset_parent (struct window *w, Lisp_Object val)
+{
+ w->parent = val;
+}
+static void
+wset_pointm (struct window *w, Lisp_Object val)
+{
+ w->pointm = val;
+}
+static void
+wset_right_fringe_width (struct window *w, Lisp_Object val)
+{
+ w->right_fringe_width = val;
+}
+static void
+wset_right_margin_cols (struct window *w, Lisp_Object val)
+{
+ w->right_margin_cols = val;
+}
+static void
+wset_scroll_bar_width (struct window *w, Lisp_Object val)
+{
+ w->scroll_bar_width = val;
+}
+static void
+wset_start (struct window *w, Lisp_Object val)
+{
+ w->start = val;
+}
+static void
+wset_temslot (struct window *w, Lisp_Object val)
+{
+ w->temslot = val;
+}
+static void
+wset_vchild (struct window *w, Lisp_Object val)
+{
+ w->vchild = val;
+}
+static void
+wset_vertical_scroll_bar_type (struct window *w, Lisp_Object val)
+{
+ w->vertical_scroll_bar_type = val;
+}
+static void
+wset_window_parameters (struct window *w, Lisp_Object val)
+{
+ w->window_parameters = val;
+}
+
+struct window *
+decode_live_window (register Lisp_Object window)
{
if (NILP (window))
return XWINDOW (selected_window);
CHECK_WINDOW (window);
w = XWINDOW (window);
- /* The following test throws up every time a tooltip frame is displayed. */
- /* CHECK_LIVE_FRAME (w->frame); */
+ return w;
+}
+
+static struct window *
+decode_valid_window (register Lisp_Object window)
+{
+ struct window *w;
+
+ if (NILP (window))
+ return XWINDOW (selected_window);
+
+ CHECK_VALID_WINDOW (window);
+ w = XWINDOW (window);
return w;
}
return WINDOWP (object) ? Qt : Qnil;
}
+DEFUN ("window-valid-p", Fwindow_valid_p, Swindow_valid_p, 1, 1, 0,
+ doc: /* Return t if OBJECT is a valid window and nil otherwise.
+A valid window is either a window that displays a buffer or an internal
+window. Deleted windows are not live. */)
+ (Lisp_Object object)
+{
+ return WINDOW_VALID_P (object) ? Qt : Qnil;
+}
+
DEFUN ("window-live-p", Fwindow_live_p, Swindow_live_p, 1, 1, 0,
doc: /* Return t if OBJECT is a live window and nil otherwise.
A live window is a window that displays a buffer.
/* Frames and windows. */
DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0,
doc: /* Return the frame that window WINDOW is on.
-If WINDOW is omitted or nil, it defaults to the selected window. */)
+WINDOW must be a valid window and defaults to the selected one. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), frame);
+ return decode_valid_window (window)->frame;
}
DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0,
Lisp_Object window;
if (NILP (frame_or_window))
- window = FVAR (SELECTED_FRAME (), root_window);
- else if (WINDOWP (frame_or_window))
- window = FVAR (XFRAME (WINDOW_FRAME (XWINDOW (frame_or_window))), root_window);
+ window = SELECTED_FRAME ()->root_window;
+ else if (WINDOW_VALID_P (frame_or_window))
+ window = XFRAME (XWINDOW (frame_or_window)->frame)->root_window;
else
{
CHECK_LIVE_FRAME (frame_or_window);
- window = FVAR (XFRAME (frame_or_window), root_window);
+ window = XFRAME (frame_or_window)->root_window;
}
return window;
DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p,
Swindow_minibuffer_p, 0, 1, 0,
doc: /* Return non-nil if WINDOW is a minibuffer window.
-If WINDOW is omitted or nil, it defaults to the selected window. */)
+WINDOW must be a valid window and defaults to the selected one. */)
(Lisp_Object window)
{
- return MINI_WINDOW_P (decode_any_window (window)) ? Qt : Qnil;
+ return MINI_WINDOW_P (decode_valid_window (window)) ? Qt : Qnil;
}
/* Don't move this to window.el - this must be a safe routine. */
DEFUN ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0,
doc: /* Return the topmost, leftmost live window on FRAME-OR-WINDOW.
If omitted, FRAME-OR-WINDOW defaults to the currently selected frame.
-Else if FRAME-OR-WINDOW denotes any window, return the first window of
-that window's frame. If FRAME-OR-WINDOW denotes a live frame, return
+Else if FRAME-OR-WINDOW denotes a valid window, return the first window
+of that window's frame. If FRAME-OR-WINDOW denotes a live frame, return
the first window of that frame. */)
(Lisp_Object frame_or_window)
{
Lisp_Object window;
if (NILP (frame_or_window))
- window = FVAR (SELECTED_FRAME (), root_window);
- else if (WINDOWP (frame_or_window))
- window = FVAR (XFRAME (WINDOW_FRAME (XWINDOW (frame_or_window))), root_window);
+ window = SELECTED_FRAME ()->root_window;
+ else if (WINDOW_VALID_P (frame_or_window))
+ window = XFRAME (WINDOW_FRAME (XWINDOW (frame_or_window)))->root_window;
else
{
CHECK_LIVE_FRAME (frame_or_window);
- window = FVAR (XFRAME (frame_or_window), root_window);
+ window = XFRAME (frame_or_window)->root_window;
}
- while (NILP (WVAR (XWINDOW (window), buffer)))
+ while (NILP (XWINDOW (window)->buffer))
{
- if (! NILP (WVAR (XWINDOW (window), hchild)))
- window = WVAR (XWINDOW (window), hchild);
- else if (! NILP (WVAR (XWINDOW (window), vchild)))
- window = WVAR (XWINDOW (window), vchild);
+ if (! NILP (XWINDOW (window)->hchild))
+ window = XWINDOW (window)->hchild;
+ else if (! NILP (XWINDOW (window)->vchild))
+ window = XWINDOW (window)->vchild;
else
- abort ();
+ emacs_abort ();
}
return window;
Sframe_selected_window, 0, 1, 0,
doc: /* Return the selected window of FRAME-OR-WINDOW.
If omitted, FRAME-OR-WINDOW defaults to the currently selected frame.
-Else if FRAME-OR-WINDOW denotes any window, return the selected window
-of that window's frame. If FRAME-OR-WINDOW denotes a live frame, return
-the selected window of that frame. */)
+Else if FRAME-OR-WINDOW denotes a valid window, return the selected
+window of that window's frame. If FRAME-OR-WINDOW denotes a live frame,
+return the selected window of that frame. */)
(Lisp_Object frame_or_window)
{
Lisp_Object window;
if (NILP (frame_or_window))
- window = FVAR (SELECTED_FRAME (), selected_window);
- else if (WINDOWP (frame_or_window))
- window = FVAR (XFRAME (WINDOW_FRAME (XWINDOW (frame_or_window))),
- selected_window);
+ window = SELECTED_FRAME ()->selected_window;
+ else if (WINDOW_VALID_P (frame_or_window))
+ window = XFRAME (WINDOW_FRAME (XWINDOW (frame_or_window)))->selected_window;
else
{
CHECK_LIVE_FRAME (frame_or_window);
- window = FVAR (XFRAME (frame_or_window), selected_window);
+ window = XFRAME (frame_or_window)->selected_window;
}
return window;
if (EQ (frame, selected_frame))
return Fselect_window (window, norecord);
else
- return FVAR (XFRAME (frame), selected_window) = window;
+ {
+ fset_selected_window (XFRAME (frame), window);
+ return window;
+ }
}
DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0,
if (NILP (norecord))
{
w->use_time = ++window_select_count;
- record_buffer (WVAR (w, buffer));
+ record_buffer (w->buffer);
}
+ /* Make the selected window's buffer current. */
+ Fset_buffer (w->buffer);
+
if (EQ (window, selected_window) && !inhibit_point_swap)
return window;
sf = SELECTED_FRAME ();
if (XFRAME (WINDOW_FRAME (w)) != sf)
{
- FVAR (XFRAME (WINDOW_FRAME (w)), selected_window) = window;
+ fset_selected_window (XFRAME (WINDOW_FRAME (w)), window);
/* Use this rather than Fhandle_switch_frame
so that FRAME_FOCUS_FRAME is moved appropriately as we
move around in the state where a minibuffer in a separate
return window;
}
else
- FVAR (sf, selected_window) = window;
+ fset_selected_window (sf, window);
- /* Store the current buffer's actual point into the
- old selected window. It belongs to that window,
- and when the window is not selected, must be in the window. */
+ /* Store the old selected window's buffer's point in pointm of the old
+ selected window. It belongs to that window, and when the window is
+ not selected, must be in the window. */
if (!inhibit_point_swap)
{
ow = XWINDOW (selected_window);
- if (! NILP (WVAR (ow, buffer)))
- set_marker_both (WVAR (ow, pointm), WVAR (ow, buffer),
- BUF_PT (XBUFFER (WVAR (ow, buffer))),
- BUF_PT_BYTE (XBUFFER (WVAR (ow, buffer))));
+ if (! NILP (ow->buffer))
+ set_marker_both (ow->pointm, ow->buffer,
+ BUF_PT (XBUFFER (ow->buffer)),
+ BUF_PT_BYTE (XBUFFER (ow->buffer)));
}
selected_window = window;
-
- Fset_buffer (WVAR (w, buffer));
-
- BVAR (XBUFFER (WVAR (w, buffer)), last_selected_window) = window;
+ bset_last_selected_window (XBUFFER (w->buffer), window);
/* Go to the point recorded in the window.
This is important when the buffer is in more
redisplay_window has altered point after scrolling,
because it makes the change only in the window. */
{
- register ptrdiff_t new_point = marker_position (WVAR (w, pointm));
+ register ptrdiff_t new_point = marker_position (w->pointm);
if (new_point < BEGV)
SET_PT (BEGV);
else if (new_point > ZV)
}
DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
- doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer.
-Also make WINDOW's buffer current and make WINDOW the frame's selected
-window. Return WINDOW.
+ doc: /* Select WINDOW which must be a live window.
+Also make WINDOW's frame the selected frame and WINDOW that frame's
+selected window. In addition, make WINDOW's buffer current and set that
+buffer's value of `point' to the value of WINDOW's `window-point'.
+Return WINDOW.
Optional second arg NORECORD non-nil means do not put this buffer at the
front of the buffer list and do not make this window the most recently
Return nil for an internal window or a deleted window. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), buffer);
+ return decode_any_window (window)->buffer;
}
DEFUN ("window-parent", Fwindow_parent, Swindow_parent, 0, 1, 0,
doc: /* Return the parent window of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
Return nil for a window with no parent (e.g. a root window). */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), parent);
+ return decode_valid_window (window)->parent;
}
DEFUN ("window-top-child", Fwindow_top_child, Swindow_top_child, 1, 1, 0,
doc: /* Return the topmost child window of window WINDOW.
+WINDOW must be a valid window and defaults to the selected one.
Return nil if WINDOW is a live window (live windows have no children).
Return nil if WINDOW is an internal window whose children form a
horizontal combination. */)
(Lisp_Object window)
{
CHECK_WINDOW (window);
- return WVAR (decode_any_window (window), vchild);
+ return decode_valid_window (window)->vchild;
}
DEFUN ("window-left-child", Fwindow_left_child, Swindow_left_child, 1, 1, 0,
doc: /* Return the leftmost child window of window WINDOW.
+WINDOW must be a valid window and defaults to the selected one.
Return nil if WINDOW is a live window (live windows have no children).
Return nil if WINDOW is an internal window whose children form a
vertical combination. */)
(Lisp_Object window)
{
CHECK_WINDOW (window);
- return WVAR (decode_any_window (window), hchild);
+ return decode_valid_window (window)->hchild;
}
DEFUN ("window-next-sibling", Fwindow_next_sibling, Swindow_next_sibling, 0, 1, 0,
doc: /* Return the next sibling window of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
Return nil if WINDOW has no next sibling. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), next);
+ return decode_valid_window (window)->next;
}
DEFUN ("window-prev-sibling", Fwindow_prev_sibling, Swindow_prev_sibling, 0, 1, 0,
doc: /* Return the previous sibling window of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
Return nil if WINDOW has no previous sibling. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), prev);
+ return decode_valid_window (window)->prev;
}
DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
doc: /* Return combination limit of window WINDOW.
-If the return value is nil, child windows of WINDOW can be recombined with
-WINDOW's siblings. A return value of t means that child windows of
-WINDOW are never \(re-)combined with WINDOW's siblings. */)
+If the return value is nil, child windows of WINDOW can be recombined
+with WINDOW's siblings. A return value of t means that child windows of
+WINDOW are never \(re-)combined with WINDOW's siblings.
+
+WINDOW must be a valid window. The return value is meaningful for
+internal windows only. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), combination_limit);
+ return decode_valid_window (window)->combination_limit;
}
DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT.
-If LIMIT is nil, child windows of WINDOW can be recombined with
-WINDOW's siblings. LIMIT t means that child windows of WINDOW are
-never \(re-)combined with WINDOW's siblings. Other values are reserved
-for future use. */)
+If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's
+siblings. LIMIT t means that child windows of WINDOW are never
+\(re-)combined with WINDOW's siblings. Other values are reserved for
+future use.
+
+WINDOW must be a valid window. Setting the combination limit is
+meaningful for internal windows only. */)
(Lisp_Object window, Lisp_Object limit)
{
- register struct window *w = decode_any_window (window);
- WVAR (w, combination_limit) = limit;
- return WVAR (w, combination_limit);
+ wset_combination_limit (decode_valid_window (window), limit);
+ return limit;
}
DEFUN ("window-use-time", Fwindow_use_time, Swindow_use_time, 0, 1, 0,
doc: /* Return the use time of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
The window with the highest use time is the most recently selected
one. The window with the lowest use time is the least recently
selected one. */)
(Lisp_Object window)
{
- return make_number (decode_window (window)->use_time);
+ return make_number (decode_live_window (window)->use_time);
}
\f
DEFUN ("window-total-height", Fwindow_total_height, Swindow_total_height, 0, 1, 0,
doc: /* Return the total height, in lines, of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
The return value includes the mode line and header line, if any.
If WINDOW is an internal window, the total height is the height
integer multiple of the default character height. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), total_lines);
+ return decode_valid_window (window)->total_lines;
}
DEFUN ("window-total-width", Fwindow_total_width, Swindow_total_width, 0, 1, 0,
doc: /* Return the total width, in columns, of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
The return value includes any vertical dividers or scroll bars
belonging to WINDOW. If WINDOW is an internal window, the total width
integer multiple of the default character width. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), total_cols);
+ return decode_valid_window (window)->total_cols;
}
DEFUN ("window-new-total", Fwindow_new_total, Swindow_new_total, 0, 1, 0,
doc: /* Return the new total size of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window. */)
+WINDOW must be a valid window and defaults to the selected one. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), new_total);
+ return decode_valid_window (window)->new_total;
}
DEFUN ("window-normal-size", Fwindow_normal_size, Swindow_normal_size, 0, 2, 0,
doc: /* Return the normal height of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a valid window and defaults to the selected one.
If HORIZONTAL is non-nil, return the normal width of WINDOW. */)
(Lisp_Object window, Lisp_Object horizontal)
{
- if (NILP (horizontal))
- return WVAR (decode_any_window (window), normal_lines);
- else
- return WVAR (decode_any_window (window), normal_cols);
+ struct window *w = decode_valid_window (window);
+
+ return NILP (horizontal) ? w->normal_lines : w->normal_cols;
}
DEFUN ("window-new-normal", Fwindow_new_normal, Swindow_new_normal, 0, 1, 0,
doc: /* Return new normal size of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window. */)
+WINDOW must be a valid window and defaults to the selected one. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), new_normal);
+ return decode_valid_window (window)->new_normal;
}
DEFUN ("window-left-column", Fwindow_left_column, Swindow_left_column, 0, 1, 0,
the left edge of the frame's window area. For instance, the return
value is 0 if there is no window to the left of WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window. */)
+WINDOW must be a valid window and defaults to the selected one. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), left_col);
+ return decode_valid_window (window)->left_col;
}
DEFUN ("window-top-line", Fwindow_top_line, Swindow_top_line, 0, 1, 0,
of the frame's window area. For instance, the return value is 0 if
there is no window above WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window. */)
+WINDOW must be a valid window and defaults to the selected one. */)
(Lisp_Object window)
{
- return WVAR (decode_any_window (window), top_line);
+ return decode_valid_window (window)->top_line;
}
/* Return the number of lines of W's body. Don't count any mode or
static int
window_body_lines (struct window *w)
{
- int height = XFASTINT (WVAR (w, total_lines));
+ int height = XFASTINT (w->total_lines);
if (!MINI_WINDOW_P (w))
{
window_body_cols (struct window *w)
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
- int width = XINT (WVAR (w, total_cols));
+ int width = XINT (w->total_cols);
if (WINDOW_HAS_VERTICAL_SCROLL_BAR (w))
/* Scroll bars occupy a few columns. */
DEFUN ("window-body-height", Fwindow_body_height, Swindow_body_height, 0, 1, 0,
doc: /* Return the height, in lines, of WINDOW's text area.
-If WINDOW is omitted or nil, it defaults to the selected window.
-Signal an error if the window is not live.
+WINDOW must be a live window and defaults to the selected one.
The returned height does not include the mode line or header line.
On a graphical display, the height is expressed as an integer multiple
exclude partially-visible lines, use `window-text-height'. */)
(Lisp_Object window)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
return make_number (window_body_lines (w));
}
DEFUN ("window-body-width", Fwindow_body_width, Swindow_body_width, 0, 1, 0,
doc: /* Return the width, in columns, of WINDOW's text area.
-If WINDOW is omitted or nil, it defaults to the selected window.
-Signal an error if the window is not live.
+WINDOW must be a live window and defaults to the selected one.
The return value does not include any vertical dividers, fringe or
marginal areas, or scroll bars. On a graphical display, the width is
expressed as an integer multiple of the default character width. */)
(Lisp_Object window)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
return make_number (window_body_cols (w));
}
WINDOW must be a live window and defaults to the selected one. */)
(Lisp_Object window)
{
- return make_number (decode_window (window)->hscroll);
+ return make_number (decode_live_window (window)->hscroll);
}
/* Set W's horizontal scroll amount to HSCROLL clipped to a reasonable
/* Prevent redisplay shortcuts when changing the hscroll. */
if (w->hscroll != new_hscroll)
- XBUFFER (WVAR (w, buffer))->prevent_redisplay_optimizations_p = 1;
+ XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
w->hscroll = new_hscroll;
return make_number (new_hscroll);
DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0,
doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL.
-If WINDOW is nil, the selected window is used.
+WINDOW must be a live window and defaults to the selected one.
Clip the number to a reasonable value if out of range.
Return the new number. NCOL should be zero or positive.
window so that the location of point moves off-window. */)
(Lisp_Object window, Lisp_Object ncol)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
CHECK_NUMBER (ncol);
return set_window_hscroll (w, XINT (ncol));
DEFUN ("window-redisplay-end-trigger", Fwindow_redisplay_end_trigger,
Swindow_redisplay_end_trigger, 0, 1, 0,
doc: /* Return WINDOW's redisplay end trigger value.
-WINDOW defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
See `set-window-redisplay-end-trigger' for more information. */)
(Lisp_Object window)
{
- return WVAR (decode_window (window), redisplay_end_trigger);
+ return decode_live_window (window)->redisplay_end_trigger;
}
DEFUN ("set-window-redisplay-end-trigger", Fset_window_redisplay_end_trigger,
Sset_window_redisplay_end_trigger, 2, 2, 0,
doc: /* Set WINDOW's redisplay end trigger value to VALUE.
-VALUE should be a buffer position (typically a marker) or nil.
-If it is a buffer position, then if redisplay in WINDOW reaches a position
-beyond VALUE, the functions in `redisplay-end-trigger-functions' are called
-with two arguments: WINDOW, and the end trigger value.
-Afterwards the end-trigger value is reset to nil. */)
+WINDOW must be a live window and defaults to the selected one. VALUE
+should be a buffer position (typically a marker) or nil. If it is a
+buffer position, then if redisplay in WINDOW reaches a position beyond
+VALUE, the functions in `redisplay-end-trigger-functions' are called
+with two arguments: WINDOW, and the end trigger value. Afterwards the
+end-trigger value is reset to nil. */)
(register Lisp_Object window, Lisp_Object value)
{
- register struct window *w;
-
- w = decode_window (window);
- WVAR (w, redisplay_end_trigger) = value;
+ wset_redisplay_end_trigger (decode_live_window (window), value);
return value;
}
DEFUN ("window-edges", Fwindow_edges, Swindow_edges, 0, 1, 0,
doc: /* Return a list of the edge coordinates of WINDOW.
-The list has the form (LEFT TOP RIGHT BOTTOM).
-TOP and BOTTOM count by lines, and LEFT and RIGHT count by columns,
-all relative to 0, 0 at top left corner of frame.
-
-RIGHT is one more than the rightmost column occupied by WINDOW.
-BOTTOM is one more than the bottommost row occupied by WINDOW.
-The edges include the space used by WINDOW's scroll bar, display
-margins, fringes, header line, and/or mode line. For the edges of
-just the text area, use `window-inside-edges'. */)
+WINDOW must be a valid window and defaults to the selected one.
+
+The returned list has the form (LEFT TOP RIGHT BOTTOM). TOP and BOTTOM
+count by lines, and LEFT and RIGHT count by columns, all relative to 0,
+0 at top left corner of frame.
+
+RIGHT is one more than the rightmost column occupied by WINDOW. BOTTOM
+is one more than the bottommost row occupied by WINDOW. The edges
+include the space used by WINDOW's scroll bar, display margins, fringes,
+header line, and/or mode line. For the edges of just the text area, use
+`window-inside-edges'. */)
(Lisp_Object window)
{
- register struct window *w = decode_any_window (window);
+ register struct window *w = decode_valid_window (window);
return Fcons (make_number (WINDOW_LEFT_EDGE_COL (w)),
Fcons (make_number (WINDOW_TOP_EDGE_LINE (w)),
DEFUN ("window-pixel-edges", Fwindow_pixel_edges, Swindow_pixel_edges, 0, 1, 0,
doc: /* Return a list of the edge pixel coordinates of WINDOW.
-The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at
-the top left corner of the frame.
+WINDOW must be a valid window and defaults to the selected one.
+
+The returned list has the form (LEFT TOP RIGHT BOTTOM), all relative to
+0, 0 at the top left corner of the frame.
RIGHT is one more than the rightmost x position occupied by WINDOW.
BOTTOM is one more than the bottommost y position occupied by WINDOW.
of just the text area, use `window-inside-pixel-edges'. */)
(Lisp_Object window)
{
- register struct window *w = decode_any_window (window);
+ register struct window *w = decode_valid_window (window);
return Fcons (make_number (WINDOW_LEFT_EDGE_X (w)),
Fcons (make_number (WINDOW_TOP_EDGE_Y (w)),
static void
calc_absolute_offset (struct window *w, int *add_x, int *add_y)
{
- struct frame *f = XFRAME (WVAR (w, frame));
+ struct frame *f = XFRAME (w->frame);
*add_y = f->top_pos;
#ifdef FRAME_MENUBAR_HEIGHT
*add_y += FRAME_MENUBAR_HEIGHT (f);
DEFUN ("window-absolute-pixel-edges", Fwindow_absolute_pixel_edges,
Swindow_absolute_pixel_edges, 0, 1, 0,
doc: /* Return a list of the edge pixel coordinates of WINDOW.
-The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at
-the top left corner of the display.
+WINDOW must be a valid window and defaults to the selected one.
+
+The returned list has the form (LEFT TOP RIGHT BOTTOM), all relative to
+0, 0 at the top left corner of the display.
RIGHT is one more than the rightmost x position occupied by WINDOW.
BOTTOM is one more than the bottommost y position occupied by WINDOW.
of just the text area, use `window-inside-absolute-pixel-edges'. */)
(Lisp_Object window)
{
- register struct window *w = decode_any_window (window);
+ register struct window *w = decode_valid_window (window);
int add_x, add_y;
calc_absolute_offset (w, &add_x, &add_y);
DEFUN ("window-inside-edges", Fwindow_inside_edges, Swindow_inside_edges, 0, 1, 0,
doc: /* Return a list of the edge coordinates of WINDOW.
-The list has the form (LEFT TOP RIGHT BOTTOM).
-TOP and BOTTOM count by lines, and LEFT and RIGHT count by columns,
-all relative to 0, 0 at top left corner of frame.
+WINDOW must be a live window and defaults to the selected one.
+
+The returned list has the form (LEFT TOP RIGHT BOTTOM). TOP and BOTTOM
+count by lines, and LEFT and RIGHT count by columns, all relative to 0,
+0 at top left corner of frame.
RIGHT is one more than the rightmost column of WINDOW's text area.
-BOTTOM is one more than the bottommost row of WINDOW's text area.
-The inside edges do not include the space used by the WINDOW's scroll
-bar, display margins, fringes, header line, and/or mode line. */)
+BOTTOM is one more than the bottommost row of WINDOW's text area. The
+inside edges do not include the space used by the WINDOW's scroll bar,
+display margins, fringes, header line, and/or mode line. */)
(Lisp_Object window)
{
- register struct window *w = decode_window (window);
+ register struct window *w = decode_live_window (window);
return list4 (make_number (WINDOW_BOX_LEFT_EDGE_COL (w)
+ WINDOW_LEFT_MARGIN_COLS (w)
DEFUN ("window-inside-pixel-edges", Fwindow_inside_pixel_edges, Swindow_inside_pixel_edges, 0, 1, 0,
doc: /* Return a list of the edge pixel coordinates of WINDOW's text area.
-The list has the form (LEFT TOP RIGHT BOTTOM), all relative to (0,0)
-at the top left corner of the frame's window area.
+WINDOW must be a live window and defaults to the selected one.
+
+The returned list has the form (LEFT TOP RIGHT BOTTOM), all relative to
+(0,0) at the top left corner of the frame's window area.
RIGHT is one more than the rightmost x position of WINDOW's text area.
BOTTOM is one more than the bottommost y position of WINDOW's text area.
display margins, fringes, header line, and/or mode line. */)
(Lisp_Object window)
{
- register struct window *w = decode_window (window);
+ register struct window *w = decode_live_window (window);
return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w)
+ WINDOW_LEFT_MARGIN_WIDTH (w)
Fwindow_inside_absolute_pixel_edges,
Swindow_inside_absolute_pixel_edges, 0, 1, 0,
doc: /* Return a list of the edge pixel coordinates of WINDOW's text area.
-The list has the form (LEFT TOP RIGHT BOTTOM), all relative to (0,0)
-at the top left corner of the frame's window area.
+WINDOW must be a live window and defaults to the selected one.
+
+The returned list has the form (LEFT TOP RIGHT BOTTOM), all relative to
+(0,0) at the top left corner of the frame's window area.
RIGHT is one more than the rightmost x position of WINDOW's text area.
BOTTOM is one more than the bottommost y position of WINDOW's text area.
display margins, fringes, header line, and/or mode line. */)
(Lisp_Object window)
{
- register struct window *w = decode_window (window);
+ register struct window *w = decode_live_window (window);
int add_x, add_y;
calc_absolute_offset (w, &add_x, &add_y);
DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p,
Scoordinates_in_window_p, 2, 2, 0,
doc: /* Return non-nil if COORDINATES are in WINDOW.
-WINDOW must be a live window.
+WINDOW must be a live window and defaults to the selected one.
COORDINATES is a cons of the form (X . Y), X and Y being distances
measured in characters from the upper-left corner of the frame.
\(0 . 0) denotes the character in the upper left corner of the
int x, y;
Lisp_Object lx, ly;
- CHECK_LIVE_WINDOW (window);
- w = XWINDOW (window);
- f = XFRAME (WVAR (w, frame));
+ w = decode_live_window (window);
+ f = XFRAME (w->frame);
CHECK_CONS (coordinates);
lx = Fcar (coordinates);
ly = Fcdr (coordinates);
return Qnil;
default:
- abort ();
+ emacs_abort ();
}
}
bar exists. */
if (NILP (window)
&& tool_bar_p
- && WINDOWP (FVAR (f, tool_bar_window))
- && WINDOW_TOTAL_LINES (XWINDOW (FVAR (f, tool_bar_window))) > 0
- && (coordinates_in_window (XWINDOW (FVAR (f, tool_bar_window)), x, y)
+ && WINDOWP (f->tool_bar_window)
+ && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)) > 0
+ && (coordinates_in_window (XWINDOW (f->tool_bar_window), x, y)
!= ON_NOTHING))
{
*part = ON_TEXT;
- window = FVAR (f, tool_bar_window);
+ window = f->tool_bar_window;
}
return window;
doc: /* Return current value of point in WINDOW.
WINDOW must be a live window and defaults to the selected one.
-For a nonselected window, this is the value point would have
-if that window were selected.
+For a nonselected window, this is the value point would have if that
+window were selected.
-Note that, when WINDOW is the selected window and its buffer
-is also currently selected, the value returned is the same as (point).
-It would be more strictly correct to return the `top-level' value
-of point, outside of any save-excursion forms.
-But that is hard to define. */)
+Note that, when WINDOW is selected, the value returned is the same as
+that returned by `point' for WINDOW's buffer. It would be more strictly
+correct to return the `top-level' value of `point', outside of any
+`save-excursion' forms. But that is hard to define. */)
(Lisp_Object window)
{
- register struct window *w = decode_window (window);
+ register struct window *w = decode_live_window (window);
- if (w == XWINDOW (selected_window)
- && current_buffer == XBUFFER (WVAR (w, buffer)))
- return Fpoint ();
- return Fmarker_position (WVAR (w, pointm));
+ if (w == XWINDOW (selected_window))
+ return make_number (BUF_PT (XBUFFER (w->buffer)));
+ else
+ return Fmarker_position (w->pointm);
}
DEFUN ("window-start", Fwindow_start, Swindow_start, 0, 1, 0,
This is updated by redisplay or by calling `set-window-start'. */)
(Lisp_Object window)
{
- return Fmarker_position (WVAR (decode_window (window), start));
+ return Fmarker_position (decode_live_window (window)->start);
}
/* This is text temporarily removed from the doc string below.
(Lisp_Object window, Lisp_Object update)
{
Lisp_Object value;
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
Lisp_Object buf;
struct buffer *b;
- buf = WVAR (w, buffer);
+ buf = w->buffer;
CHECK_BUFFER (buf);
b = XBUFFER (buf);
The user can compute it with vertical-motion if he wants to.
It would be nicer to do it automatically,
but that's so slow that it would probably bother people. */
- if (NILP (WVAR (w, window_end_valid)))
+ if (NILP (w->window_end_valid))
return Qnil;
#endif
if (! NILP (update)
- && ! (! NILP (WVAR (w, window_end_valid))
- && w->last_modified >= BUF_MODIFF (b)
- && w->last_overlay_modified >= BUF_OVERLAY_MODIFF (b))
+ && (windows_or_buffers_changed || NILP (w->window_end_valid))
&& !noninteractive)
{
struct text_pos startp;
`-l' containing a call to `rmail' with subsequent other
commands. At the end, W->start happened to be BEG, while
rmail had already narrowed the buffer. */
- if (XMARKER (WVAR (w, start))->charpos < BEGV)
+ if (XMARKER (w->start)->charpos < BEGV)
SET_TEXT_POS (startp, BEGV, BEGV_BYTE);
- else if (XMARKER (WVAR (w, start))->charpos > ZV)
+ else if (XMARKER (w->start)->charpos > ZV)
SET_TEXT_POS (startp, ZV, ZV_BYTE);
else
- SET_TEXT_POS_FROM_MARKER (startp, WVAR (w, start));
+ SET_TEXT_POS_FROM_MARKER (startp, w->start);
itdata = bidi_shelve_cache ();
start_display (&it, w, startp);
set_buffer_internal (old_buffer);
}
else
- XSETINT (value, BUF_Z (b) - XFASTINT (WVAR (w, window_end_pos)));
+ XSETINT (value, BUF_Z (b) - XFASTINT (w->window_end_pos));
return value;
}
DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0,
doc: /* Make point value in WINDOW be at position POS in WINDOW's buffer.
+WINDOW must be a live window and defaults to the selected one.
Return POS. */)
(Lisp_Object window, Lisp_Object pos)
{
- register struct window *w = decode_window (window);
+ register struct window *w = decode_live_window (window);
CHECK_NUMBER_COERCE_MARKER (pos);
- if (w == XWINDOW (selected_window)
- && XBUFFER (WVAR (w, buffer)) == current_buffer)
- Fgoto_char (pos);
- else
- set_marker_restricted (WVAR (w, pointm), pos, WVAR (w, buffer));
- /* We have to make sure that redisplay updates the window to show
- the new value of point. */
- if (!EQ (window, selected_window))
- ++windows_or_buffers_changed;
+ if (w == XWINDOW (selected_window))
+ {
+ if (XBUFFER (w->buffer) == current_buffer)
+ Fgoto_char (pos);
+ else
+ {
+ struct buffer *old_buffer = current_buffer;
+
+ set_buffer_internal (XBUFFER (w->buffer));
+ Fgoto_char (pos);
+ set_buffer_internal (old_buffer);
+ }
+ }
+ else
+ {
+ set_marker_restricted (w->pointm, pos, w->buffer);
+ /* We have to make sure that redisplay updates the window to show
+ the new value of point. */
+ ++windows_or_buffers_changed;
+ }
return pos;
}
DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0,
doc: /* Make display in WINDOW start at position POS in WINDOW's buffer.
-If WINDOW is nil, the selected window is used. Return POS.
-Optional third arg NOFORCE non-nil inhibits next redisplay from
+WINDOW must be a live window and defaults to the selected one. Return
+POS. Optional third arg NOFORCE non-nil inhibits next redisplay from
overriding motion of point in order to display at this exact start. */)
(Lisp_Object window, Lisp_Object pos, Lisp_Object noforce)
{
- register struct window *w = decode_window (window);
+ register struct window *w = decode_live_window (window);
CHECK_NUMBER_COERCE_MARKER (pos);
- set_marker_restricted (WVAR (w, start), pos, WVAR (w, buffer));
+ set_marker_restricted (w->start, pos, w->buffer);
/* this is not right, but much easier than doing what is right. */
w->start_at_line_beg = 0;
if (NILP (noforce))
DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p,
Spos_visible_in_window_p, 0, 3, 0,
doc: /* Return non-nil if position POS is currently on the frame in WINDOW.
-Return nil if that position is scrolled vertically out of view.
-If a character is only partially visible, nil is returned, unless the
-optional argument PARTIALLY is non-nil.
-If POS is only out of view because of horizontal scrolling, return non-nil.
-If POS is t, it specifies the position of the last visible glyph in WINDOW.
-POS defaults to point in WINDOW; WINDOW defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
+
+Return nil if that position is scrolled vertically out of view. If a
+character is only partially visible, nil is returned, unless the
+optional argument PARTIALLY is non-nil. If POS is only out of view
+because of horizontal scrolling, return non-nil. If POS is t, it
+specifies the position of the last visible glyph in WINDOW. POS
+defaults to point in WINDOW; WINDOW defaults to the selected window.
If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]),
int rtop, rbot, rowh, vpos, fully_p = 1;
int x, y;
- w = decode_window (window);
- buf = XBUFFER (WVAR (w, buffer));
- SET_TEXT_POS_FROM_MARKER (top, WVAR (w, start));
+ w = decode_live_window (window);
+ buf = XBUFFER (w->buffer);
+ SET_TEXT_POS_FROM_MARKER (top, w->start);
if (EQ (pos, Qt))
posint = -1;
else if (w == XWINDOW (selected_window))
posint = PT;
else
- posint = XMARKER (WVAR (w, pointm))->charpos;
+ posint = XMARKER (w->pointm)->charpos;
/* If position is above window start or outside buffer boundaries,
or if window start is out of range, position is not visible. */
DEFUN ("window-line-height", Fwindow_line_height,
Swindow_line_height, 0, 2, 0,
doc: /* Return height in pixels of text line LINE in window WINDOW.
-WINDOW defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
Return height of current line if LINE is omitted or nil. Return height of
header or mode line if LINE is `header-line' or `mode-line'.
int max_y, crop, i;
EMACS_INT n;
- w = decode_window (window);
+ w = decode_live_window (window);
if (noninteractive || w->pseudo_window_p)
return Qnil;
- CHECK_BUFFER (WVAR (w, buffer));
- b = XBUFFER (WVAR (w, buffer));
+ CHECK_BUFFER (w->buffer);
+ b = XBUFFER (w->buffer);
/* Fail if current matrix is not up-to-date. */
- if (NILP (WVAR (w, window_end_valid))
+ if (NILP (w->window_end_valid)
|| current_buffer->clip_changed
|| current_buffer->prevent_redisplay_optimizations_p
|| w->last_modified < BUF_MODIFF (b)
More precisely, return the value assigned by the last call of
`set-window-dedicated-p' for WINDOW. Return nil if that function was
never called with WINDOW as its argument, or the value set by that
-function was internally reset since its last call. WINDOW defaults to
-the selected window.
+function was internally reset since its last call. WINDOW must be a
+live window and defaults to the selected one.
When a window is dedicated to its buffer, `display-buffer' will refrain
from displaying another buffer in it. `get-lru-window' and
is the value returned by `window-dedicated-p' is t. */)
(Lisp_Object window)
{
- return WVAR (decode_window (window), dedicated);
+ return decode_live_window (window)->dedicated;
}
DEFUN ("set-window-dedicated-p", Fset_window_dedicated_p,
window, it also makes sure that the window is no more dedicated. */)
(Lisp_Object window, Lisp_Object flag)
{
- register struct window *w = decode_window (window);
-
- WVAR (w, dedicated) = flag;
- return WVAR (w, dedicated);
+ wset_dedicated (decode_live_window (window), flag);
+ return flag;
}
DEFUN ("window-prev-buffers", Fwindow_prev_buffers, Swindow_prev_buffers,
window for that buffer, and POS is a window-specific point value. */)
(Lisp_Object window)
{
- return WVAR (decode_window (window), prev_buffers);
+ return decode_live_window (window)->prev_buffers;
}
DEFUN ("set-window-prev-buffers", Fset_window_prev_buffers,
window for that buffer, and POS is a window-specific point value. */)
(Lisp_Object window, Lisp_Object prev_buffers)
{
- return WVAR (decode_window (window), prev_buffers) = prev_buffers;
+ wset_prev_buffers (decode_live_window (window), prev_buffers);
+ return prev_buffers;
}
DEFUN ("window-next-buffers", Fwindow_next_buffers, Swindow_next_buffers,
WINDOW must be a live window and defaults to the selected one. */)
(Lisp_Object window)
{
- return WVAR (decode_window (window), next_buffers);
+ return decode_live_window (window)->next_buffers;
}
DEFUN ("set-window-next-buffers", Fset_window_next_buffers,
NEXT-BUFFERS should be a list of buffers. */)
(Lisp_Object window, Lisp_Object next_buffers)
{
- return WVAR (decode_window (window), next_buffers) = next_buffers;
+ wset_next_buffers (decode_live_window (window), next_buffers);
+ return next_buffers;
}
DEFUN ("window-parameters", Fwindow_parameters, Swindow_parameters,
0, 1, 0,
doc: /* Return the parameters of WINDOW and their values.
-WINDOW defaults to the selected window. The return value is a list of
-elements of the form (PARAMETER . VALUE). */)
+WINDOW must be a valid window and defaults to the selected one. The
+return value is a list of elements of the form (PARAMETER . VALUE). */)
(Lisp_Object window)
{
- return Fcopy_alist (WVAR (decode_any_window (window), window_parameters));
+ return Fcopy_alist (decode_valid_window (window)->window_parameters);
}
DEFUN ("window-parameter", Fwindow_parameter, Swindow_parameter,
2, 2, 0,
doc: /* Return WINDOW's value for PARAMETER.
-WINDOW defaults to the selected window. */)
+WINDOW can be any window and defaults to the selected one. */)
(Lisp_Object window, Lisp_Object parameter)
{
Lisp_Object result;
- result = Fassq (parameter, WVAR (decode_any_window (window),
- window_parameters));
+ result = Fassq (parameter, decode_any_window (window)->window_parameters);
return CDR_SAFE (result);
}
DEFUN ("set-window-parameter", Fset_window_parameter,
Sset_window_parameter, 3, 3, 0,
doc: /* Set WINDOW's value of PARAMETER to VALUE.
-WINDOW defaults to the selected window. Return VALUE. */)
+WINDOW can be any window and defaults to the selected one.
+Return VALUE. */)
(Lisp_Object window, Lisp_Object parameter, Lisp_Object value)
{
register struct window *w = decode_any_window (window);
Lisp_Object old_alist_elt;
- old_alist_elt = Fassq (parameter, WVAR (w, window_parameters));
+ old_alist_elt = Fassq (parameter, w->window_parameters);
if (NILP (old_alist_elt))
- WVAR (w, window_parameters)
- = Fcons (Fcons (parameter, value), WVAR (w, window_parameters));
+ wset_window_parameters
+ (w, Fcons (Fcons (parameter, value), w->window_parameters));
else
Fsetcdr (old_alist_elt, value);
return value;
DEFUN ("window-display-table", Fwindow_display_table, Swindow_display_table,
0, 1, 0,
doc: /* Return the display-table that WINDOW is using.
-WINDOW defaults to the selected window. */)
+WINDOW must be a live window and defaults to the selected one. */)
(Lisp_Object window)
{
- return WVAR (decode_window (window), display_table);
+ return decode_live_window (window)->display_table;
}
/* Get the display table for use on window W. This is either W's
{
struct Lisp_Char_Table *dp = NULL;
- if (DISP_TABLE_P (WVAR (w, display_table)))
- dp = XCHAR_TABLE (WVAR (w, display_table));
- else if (BUFFERP (WVAR (w, buffer)))
+ if (DISP_TABLE_P (w->display_table))
+ dp = XCHAR_TABLE (w->display_table);
+ else if (BUFFERP (w->buffer))
{
- struct buffer *b = XBUFFER (WVAR (w, buffer));
+ struct buffer *b = XBUFFER (w->buffer);
if (DISP_TABLE_P (BVAR (b, display_table)))
dp = XCHAR_TABLE (BVAR (b, display_table));
}
DEFUN ("set-window-display-table", Fset_window_display_table, Sset_window_display_table, 2, 2, 0,
- doc: /* Set WINDOW's display-table to TABLE. */)
+ doc: /* Set WINDOW's display-table to TABLE.
+WINDOW must be a live window and defaults to the selected one. */)
(register Lisp_Object window, Lisp_Object table)
{
- register struct window *w;
-
- w = decode_window (window);
- WVAR (w, display_table) = table;
+ wset_display_table (decode_live_window (window), table);
return table;
}
\f
Lisp_Object buf;
struct buffer *b;
- buf = WVAR (w, buffer);
+ buf = w->buffer;
b = XBUFFER (buf);
- if (b != XMARKER (WVAR (w, pointm))->buffer)
- abort ();
+ if (b != XMARKER (w->pointm)->buffer)
+ emacs_abort ();
#if 0
if (w == XWINDOW (selected_window)
- || ! EQ (buf, WVAR (XWINDOW (selected_window), buffer)))
+ || ! EQ (buf, XWINDOW (selected_window)->buffer))
/* Do this except when the selected window's buffer
is being removed from some other window. */
#endif
selected window, while last_window_start reflects another
window which was recently showing the same buffer.
Some people might say that might be a good thing. Let's see. */
- b->last_window_start = marker_position (WVAR (w, start));
+ b->last_window_start = marker_position (w->start);
/* Point in the selected window's buffer
is actually stored in that buffer, and the window's pointm isn't used.
So don't clobber point in that buffer. */
- if (! EQ (buf, WVAR (XWINDOW (selected_window), buffer))
+ if (! EQ (buf, XWINDOW (selected_window)->buffer)
+ /* Don't clobber point in current buffer either (this could be
+ useful in connection with bug#12208).
+ && XBUFFER (buf) != current_buffer */
/* This line helps to fix Horsley's testbug.el bug. */
&& !(WINDOWP (BVAR (b, last_selected_window))
&& w != XWINDOW (BVAR (b, last_selected_window))
- && EQ (buf, WVAR (XWINDOW (BVAR (b, last_selected_window)), buffer))))
+ && EQ (buf, XWINDOW (BVAR (b, last_selected_window))->buffer)))
temp_set_point_both (b,
clip_to_bounds (BUF_BEGV (b),
- XMARKER (WVAR (w, pointm))->charpos,
+ XMARKER (w->pointm)->charpos,
BUF_ZV (b)),
clip_to_bounds (BUF_BEGV_BYTE (b),
- marker_byte_position (WVAR (w, pointm)),
+ marker_byte_position (w->pointm),
BUF_ZV_BYTE (b)));
if (WINDOWP (BVAR (b, last_selected_window))
&& w == XWINDOW (BVAR (b, last_selected_window)))
- BVAR (b, last_selected_window) = Qnil;
+ bset_last_selected_window (b, Qnil);
}
/* Put NEW into the window structure in place of OLD. SETFLAG zero
/* If OLD is its frame's root window, then NEW is the new
root window for that frame. */
- if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (WVAR (o, frame)))))
- FRAME_ROOT_WINDOW (XFRAME (WVAR (o, frame))) = new;
-
- if (setflag)
- {
- WVAR (n, left_col) = WVAR (o, left_col);
- WVAR (n, top_line) = WVAR (o, top_line);
- WVAR (n, total_cols) = WVAR (o, total_cols);
- WVAR (n, total_lines) = WVAR (o, total_lines);
- WVAR (n, normal_cols) = WVAR (o, normal_cols);
- WVAR (o, normal_cols) = make_float (1.0);
- WVAR (n, normal_lines) = WVAR (o, normal_lines);
- WVAR (o, normal_lines) = make_float (1.0);
+ if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (o->frame))))
+ fset_root_window (XFRAME (o->frame), new);
+
+ if (setflag)
+ {
+ wset_left_col (n, o->left_col);
+ wset_top_line (n, o->top_line);
+ wset_total_cols (n, o->total_cols);
+ wset_total_lines (n, o->total_lines);
+ wset_normal_cols (n, o->normal_cols);
+ wset_normal_cols (o, make_float (1.0));
+ wset_normal_lines (n, o->normal_lines);
+ wset_normal_lines (o, make_float (1.0));
n->desired_matrix = n->current_matrix = 0;
n->vscroll = 0;
memset (&n->cursor, 0, sizeof (n->cursor));
n->phys_cursor_width = -1;
n->must_be_updated_p = 0;
n->pseudo_window_p = 0;
- XSETFASTINT (WVAR (n, window_end_vpos), 0);
- XSETFASTINT (WVAR (n, window_end_pos), 0);
- WVAR (n, window_end_valid) = Qnil;
+ wset_window_end_vpos (n, make_number (0));
+ wset_window_end_pos (n, make_number (0));
+ wset_window_end_valid (n, Qnil);
n->frozen_window_start_p = 0;
}
- WVAR (n, next) = tem = WVAR (o, next);
+ tem = o->next;
+ wset_next (n, tem);
if (!NILP (tem))
- WVAR (XWINDOW (tem), prev) = new;
+ wset_prev (XWINDOW (tem), new);
- WVAR (n, prev) = tem = WVAR (o, prev);
+ tem = o->prev;
+ wset_prev (n, tem);
if (!NILP (tem))
- WVAR (XWINDOW (tem), next) = new;
+ wset_next (XWINDOW (tem), new);
- WVAR (n, parent) = tem = WVAR (o, parent);
+ tem = o->parent;
+ wset_parent (n, tem);
if (!NILP (tem))
{
- if (EQ (WVAR (XWINDOW (tem), vchild), old))
- WVAR (XWINDOW (tem), vchild) = new;
- if (EQ (WVAR (XWINDOW (tem), hchild), old))
- WVAR (XWINDOW (tem), hchild) = new;
+ if (EQ (XWINDOW (tem)->vchild, old))
+ wset_vchild (XWINDOW (tem), new);
+ if (EQ (XWINDOW (tem)->hchild, old))
+ wset_hchild (XWINDOW (tem), new);
}
}
int horflag;
w = XWINDOW (window);
- parent = WVAR (w, parent);
- if (!NILP (parent) && NILP (WVAR (w, combination_limit)))
+ parent = w->parent;
+ if (!NILP (parent) && NILP (w->combination_limit))
{
p = XWINDOW (parent);
- if (((!NILP (WVAR (p, vchild)) && !NILP (WVAR (w, vchild)))
- || (!NILP (WVAR (p, hchild)) && !NILP (WVAR (w, hchild)))))
+ if (((!NILP (p->vchild) && !NILP (w->vchild))
+ || (!NILP (p->hchild) && !NILP (w->hchild))))
/* WINDOW and PARENT are both either a vertical or a horizontal
combination. */
{
- horflag = NILP (WVAR (w, vchild));
- child = horflag ? WVAR (w, hchild) : WVAR (w, vchild);
+ horflag = NILP (w->vchild);
+ child = horflag ? w->hchild : w->vchild;
c = XWINDOW (child);
/* Splice WINDOW's children into its parent's children and
assign new normal sizes. */
- if (NILP (WVAR (w, prev)))
+ if (NILP (w->prev))
if (horflag)
- WVAR (p, hchild) = child;
+ wset_hchild (p, child);
else
- WVAR (p, vchild) = child;
+ wset_vchild (p, child);
else
{
- WVAR (c, prev) = WVAR (w, prev);
- WVAR (XWINDOW (WVAR (w, prev)), next) = child;
+ wset_prev (c, w->prev);
+ wset_next (XWINDOW (w->prev), child);
}
while (c)
{
- WVAR (c, parent) = parent;
+ wset_parent (c, parent);
if (horflag)
- WVAR (c, normal_cols)
- = make_float (XFLOATINT (WVAR (c, total_cols))
- / XFLOATINT (WVAR (p, total_cols)));
+ wset_normal_cols (c,
+ make_float (XFLOATINT (c->total_cols)
+ / XFLOATINT (p->total_cols)));
else
- WVAR (c, normal_lines)
- = make_float (XFLOATINT (WVAR (c, total_lines))
- / XFLOATINT (WVAR (p, total_lines)));
+ wset_normal_lines (c,
+ make_float (XFLOATINT (c->total_lines)
+ / XFLOATINT (p->total_lines)));
- if (NILP (WVAR (c, next)))
+ if (NILP (c->next))
{
- if (!NILP (WVAR (w, next)))
+ if (!NILP (w->next))
{
- WVAR (c, next) = WVAR (w, next);
- WVAR (XWINDOW (WVAR (c, next)), prev) = child;
+ wset_next (c, w->next);
+ wset_prev (XWINDOW (c->next), child);
}
c = 0;
}
else
{
- child = WVAR (c, next);
+ child = c->next;
c = XWINDOW (child);
}
}
/* WINDOW can be deleted now. */
- WVAR (w, vchild) = WVAR (w, hchild) = Qnil;
+ wset_vchild (w, Qnil);
+ wset_hchild (w, Qnil);
}
}
}
candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf, Lisp_Object all_frames)
{
struct window *w = XWINDOW (window);
- struct frame *f = XFRAME (WVAR (w, frame));
+ struct frame *f = XFRAME (w->frame);
int candidate_p = 1;
- if (!BUFFERP (WVAR (w, buffer)))
+ if (!BUFFERP (w->buffer))
candidate_p = 0;
else if (MINI_WINDOW_P (w)
&& (EQ (minibuf, Qlambda)
else if (NILP (all_frames))
{
eassert (WINDOWP (owindow));
- candidate_p = EQ (WVAR (w, frame), WVAR (XWINDOW (owindow), frame));
+ candidate_p = EQ (w->frame, XWINDOW (owindow)->frame);
}
else if (EQ (all_frames, Qvisible))
{
FRAME_SAMPLE_VISIBILITY (f);
candidate_p = FRAME_VISIBLE_P (f)
- && (FRAME_TERMINAL (XFRAME (WVAR (w, frame)))
+ && (FRAME_TERMINAL (XFRAME (w->frame))
== FRAME_TERMINAL (XFRAME (selected_frame)));
}
&& !f->output_data.x->has_been_visible)
#endif
)
- && (FRAME_TERMINAL (XFRAME (WVAR (w, frame)))
+ && (FRAME_TERMINAL (XFRAME (w->frame))
== FRAME_TERMINAL (XFRAME (selected_frame)));
}
else if (WINDOWP (all_frames))
candidate_p = (EQ (FRAME_MINIBUF_WINDOW (f), all_frames)
- || EQ (WVAR (XWINDOW (all_frames), frame), WVAR (w, frame))
- || EQ (WVAR (XWINDOW (all_frames), frame), FRAME_FOCUS_FRAME (f)));
+ || EQ (XWINDOW (all_frames)->frame, w->frame)
+ || EQ (XWINDOW (all_frames)->frame, FRAME_FOCUS_FRAME (f)));
else if (FRAMEP (all_frames))
- candidate_p = EQ (all_frames, WVAR (w, frame));
+ candidate_p = EQ (all_frames, w->frame);
return candidate_p;
}
/* ALL_FRAMES nil doesn't specify which frames to include. */
if (NILP (*all_frames))
- *all_frames
+ *all_frames
= (!EQ (*minibuf, Qlambda)
- ? FRAME_MINIBUF_WINDOW (XFRAME (WVAR (XWINDOW (*window), frame)))
+ ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame))
: Qnil);
else if (EQ (*all_frames, Qvisible))
;
/* If ALL_FRAMES is a frame, and WINDOW isn't on that frame, just
return the first window on the frame. */
if (FRAMEP (all_frames)
- && !EQ (all_frames, WVAR (XWINDOW (window), frame)))
+ && !EQ (all_frames, XWINDOW (window)->frame))
return Fframe_first_window (all_frames);
if (next_p)
(Lisp_Object frame, Lisp_Object minibuf, Lisp_Object window)
{
if (NILP (window))
- window = FRAMEP (frame) ? FVAR (XFRAME (frame), selected_window) : selected_window;
+ window = FRAMEP (frame) ? XFRAME (frame)->selected_window : selected_window;
CHECK_WINDOW (window);
if (NILP (frame))
frame = selected_frame;
- if (!EQ (frame, WVAR (XWINDOW (window), frame)))
+ if (!EQ (frame, XWINDOW (window)->frame))
error ("Window is on a different frame");
return window_list_1 (window, minibuf, frame);
switch (type)
{
case GET_BUFFER_WINDOW:
- if (EQ (WVAR (w, buffer), obj)
+ if (EQ (w->buffer, obj)
/* Don't find any minibuffer window except the one that
is currently in use. */
&& (MINI_WINDOW_P (w) ? EQ (window, minibuf_window) : 1))
if (EQ (window, selected_window))
/* Preferably return the selected window. */
RETURN_UNGCPRO (window);
- else if (EQ (WVAR (XWINDOW (window), frame), selected_frame)
+ else if (EQ (XWINDOW (window)->frame, selected_frame)
&& !frame_best_window_flag)
/* Prefer windows on the current frame (but don't
choose another one if we have one already). */
case REPLACE_BUFFER_IN_WINDOWS_SAFELY:
/* We could simply check whether the buffer shown by window
is live, and show another buffer in case it isn't. */
- if (EQ (WVAR (w, buffer), obj))
+ if (EQ (w->buffer, obj))
{
/* Undedicate WINDOW. */
- WVAR (w, dedicated) = Qnil;
+ wset_dedicated (w, Qnil);
/* Make WINDOW show the buffer returned by
other_buffer_safely, don't run any hooks. */
set_window_buffer
- (window, other_buffer_safely (WVAR (w, buffer)), 0, 0);
+ (window, other_buffer_safely (w->buffer), 0, 0);
/* If WINDOW is the selected window, make its buffer
current. But do so only if the window shows the
current buffer (Bug#6454). */
if (EQ (window, selected_window)
- && XBUFFER (WVAR (w, buffer)) == current_buffer)
- Fset_buffer (WVAR (w, buffer));
+ && XBUFFER (w->buffer) == current_buffer)
+ Fset_buffer (w->buffer);
}
break;
case REDISPLAY_BUFFER_WINDOWS:
- if (EQ (WVAR (w, buffer), obj))
+ if (EQ (w->buffer, obj))
{
mark_window_display_accurate (window, 0);
w->update_mode_line = 1;
/* Check for a window that has a killed buffer. */
case CHECK_ALL_WINDOWS:
- if (! NILP (WVAR (w, buffer))
- && NILP (BVAR (XBUFFER (WVAR (w, buffer)), name)))
- abort ();
+ if (! NILP (w->buffer)
+ && !BUFFER_LIVE_P (XBUFFER (w->buffer)))
+ emacs_abort ();
break;
case WINDOW_LOOP_UNUSED:
DEFUN ("delete-other-windows-internal", Fdelete_other_windows_internal,
Sdelete_other_windows_internal, 0, 2, "",
doc: /* Make WINDOW fill its frame.
-Only the frame WINDOW is on is affected. WINDOW may be any window and
-defaults to the selected one.
+Only the frame WINDOW is on is affected. WINDOW must be a valid window
+and defaults to the selected one.
Optional argument ROOT, if non-nil, must specify an internal window such
that WINDOW is in its window subtree. If this is the case, replace ROOT
ptrdiff_t startpos IF_LINT (= 0);
int top IF_LINT (= 0), new_top, resize_failed;
- w = decode_any_window (window);
+ w = decode_valid_window (window);
XSETWINDOW (window, w);
- f = XFRAME (WVAR (w, frame));
+ f = XFRAME (w->frame);
if (NILP (root))
/* ROOT is the frame's root window. */
else
/* ROOT must be an ancestor of WINDOW. */
{
- r = decode_any_window (root);
- pwindow = WVAR (XWINDOW (window), parent);
+ r = decode_valid_window (root);
+ pwindow = XWINDOW (window)->parent;
while (!NILP (pwindow))
if (EQ (pwindow, root))
break;
else
- pwindow = WVAR (XWINDOW (pwindow), parent);
+ pwindow = XWINDOW (pwindow)->parent;
if (!EQ (pwindow, root))
error ("Specified root is not an ancestor of specified window");
}
else if (MINI_WINDOW_P (w)) /* && top > 0) */
error ("Can't expand minibuffer to full frame");
- if (!NILP (WVAR (w, buffer)))
+ if (!NILP (w->buffer))
{
- startpos = marker_position (WVAR (w, start));
+ startpos = marker_position (w->start);
top = WINDOW_TOP_EDGE_LINE (w)
- FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w)));
/* Make sure WINDOW is the frame's selected window. */
if (!EQ (window, FRAME_SELECTED_WINDOW (f)))
{
- if (EQ (selected_frame, WVAR (w, frame)))
+ if (EQ (selected_frame, w->frame))
Fselect_window (window, Qnil);
else
- FRAME_SELECTED_WINDOW (f) = window;
+ fset_selected_window (f, window);
}
}
else
{
pwindow = swindow;
while (!NILP (pwindow) && !EQ (window, pwindow))
- pwindow = WVAR (XWINDOW (pwindow), parent);
+ pwindow = XWINDOW (pwindow)->parent;
if (EQ (window, pwindow))
/* If WINDOW is an ancestor of SWINDOW, then SWINDOW is ok
if (!EQ (swindow, FRAME_SELECTED_WINDOW (f)))
{
- if (EQ (selected_frame, WVAR (w, frame)))
+ if (EQ (selected_frame, w->frame))
Fselect_window (swindow, Qnil);
else
- FRAME_SELECTED_WINDOW (f) = swindow;
+ fset_selected_window (f, swindow);
}
}
- BLOCK_INPUT;
+ block_input ();
if (!FRAME_INITIAL_P (f))
{
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
resize_failed = 0;
- if (NILP (WVAR (w, buffer)))
+ if (NILP (w->buffer))
{
/* Resize child windows vertically. */
- XSETINT (delta, XINT (WVAR (r, total_lines))
- - XINT (WVAR (w, total_lines)));
- WVAR (w, top_line) = WVAR (r, top_line);
+ XSETINT (delta, XINT (r->total_lines)
+ - XINT (w->total_lines));
+ wset_top_line (w, r->top_line);
resize_root_window (window, delta, Qnil, Qnil);
if (window_resize_check (w, 0))
window_resize_apply (w, 0);
/* Resize child windows horizontally. */
if (!resize_failed)
{
- WVAR (w, left_col) = WVAR (r, left_col);
- XSETINT (delta, XINT (WVAR (r, total_cols))
- - XINT (WVAR (w, total_cols)));
- WVAR (w, left_col) = WVAR (r, left_col);
+ wset_left_col (w, r->left_col);
+ XSETINT (delta,
+ XINT (r->total_cols) - XINT (w->total_cols));
+ wset_left_col (w, r->left_col);
resize_root_window (window, delta, Qt, Qnil);
if (window_resize_check (w, 1))
window_resize_apply (w, 1);
}
/* Cleanly unlink WINDOW from window-tree. */
- if (!NILP (WVAR (w, prev)))
+ if (!NILP (w->prev))
/* Get SIBLING above (on the left of) WINDOW. */
{
- sibling = WVAR (w, prev);
+ sibling = w->prev;
s = XWINDOW (sibling);
- WVAR (s, next) = WVAR (w, next);
- if (!NILP (WVAR (s, next)))
- WVAR (XWINDOW (WVAR (s, next)), prev) = sibling;
+ wset_next (s, w->next);
+ if (!NILP (s->next))
+ wset_prev (XWINDOW (s->next), sibling);
}
else
/* Get SIBLING below (on the right of) WINDOW. */
{
- sibling = WVAR (w, next);
+ sibling = w->next;
s = XWINDOW (sibling);
- WVAR (s, prev) = Qnil;
- if (!NILP (WVAR (XWINDOW (WVAR (w, parent)), vchild)))
- WVAR (XWINDOW (WVAR (w, parent)), vchild) = sibling;
+ wset_prev (s, Qnil);
+ if (!NILP (XWINDOW (w->parent)->vchild))
+ wset_vchild (XWINDOW (w->parent), sibling);
else
- WVAR (XWINDOW (WVAR (w, parent)), hchild) = sibling;
+ wset_hchild (XWINDOW (w->parent), sibling);
}
/* Delete ROOT and all child windows of ROOT. */
- if (!NILP (WVAR (r, vchild)))
+ if (!NILP (r->vchild))
{
- delete_all_child_windows (WVAR (r, vchild));
- WVAR (r, vchild) = Qnil;
+ delete_all_child_windows (r->vchild);
+ wset_vchild (r, Qnil);
}
- else if (!NILP (WVAR (r, hchild)))
+ else if (!NILP (r->hchild))
{
- delete_all_child_windows (WVAR (r, hchild));
- WVAR (r, hchild) = Qnil;
+ delete_all_child_windows (r->hchild);
+ wset_hchild (r, Qnil);
}
replace_window (root, window, 1);
/* This must become SWINDOW anyway ....... */
- if (!NILP (WVAR (w, buffer)) && !resize_failed)
+ if (!NILP (w->buffer) && !resize_failed)
{
/* Try to minimize scrolling, by setting the window start to the
point will cause the text at the old window start to be at the
when the display is not current, due to typeahead). */
new_top = WINDOW_TOP_EDGE_LINE (w) - FRAME_TOP_MARGIN (XFRAME (WINDOW_FRAME (w)));
if (new_top != top
- && startpos >= BUF_BEGV (XBUFFER (WVAR (w, buffer)))
- && startpos <= BUF_ZV (XBUFFER (WVAR (w, buffer))))
+ && startpos >= BUF_BEGV (XBUFFER (w->buffer))
+ && startpos <= BUF_ZV (XBUFFER (w->buffer)))
{
struct position pos;
struct buffer *obuf = current_buffer;
- Fset_buffer (WVAR (w, buffer));
+ Fset_buffer (w->buffer);
/* This computation used to temporarily move point, but that
can have unwanted side effects due to text properties. */
pos = *vmotion (startpos, -top, w);
- set_marker_both (WVAR (w, start), WVAR (w, buffer), pos.bufpos, pos.bytepos);
- WVAR (w, window_end_valid) = Qnil;
+ set_marker_both (w->start, w->buffer, pos.bufpos, pos.bytepos);
+ wset_window_end_valid (w, Qnil);
w->start_at_line_beg = (pos.bytepos == BEGV_BYTE
|| FETCH_BYTE (pos.bytepos - 1) == '\n');
/* We need to do this, so that the window-scroll-functions
}
adjust_glyphs (f);
- UNBLOCK_INPUT;
+ unblock_input ();
run_window_configuration_change_hook (f);
if (WINDOW_RIGHT_MARGIN_COLS (w) > 0)
{
if (WINDOW_LEFT_MARGIN_COLS (w) > 0)
- WVAR (w, left_margin_cols) = WVAR (w, right_margin_cols)
- = make_number (margin_cols/2);
+ {
+ wset_left_margin_cols (w, make_number (margin_cols / 2));
+ wset_right_margin_cols (w, make_number (margin_cols / 2));
+ }
else
- WVAR (w, right_margin_cols) = make_number (margin_cols);
+ wset_right_margin_cols (w, make_number (margin_cols));
}
else
- WVAR (w, left_margin_cols) = make_number (margin_cols);
+ wset_left_margin_cols (w, make_number (margin_cols));
return 1;
}
\f
/* Use the right buffer. Matters when running the local hooks. */
if (current_buffer != XBUFFER (Fwindow_buffer (Qnil)))
{
- record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+ record_unwind_current_buffer ();
Fset_buffer (Fwindow_buffer (Qnil));
}
DEFUN ("run-window-configuration-change-hook", Frun_window_configuration_change_hook,
Srun_window_configuration_change_hook, 1, 1, 0,
doc: /* Run `window-configuration-change-hook' for FRAME. */)
- (Lisp_Object frame)
+ (Lisp_Object frame)
{
CHECK_LIVE_FRAME (frame);
run_window_configuration_change_hook (XFRAME (frame));
struct window *w = XWINDOW (window);
struct buffer *b = XBUFFER (buffer);
ptrdiff_t count = SPECPDL_INDEX ();
- int samebuf = EQ (buffer, WVAR (w, buffer));
+ int samebuf = EQ (buffer, w->buffer);
- WVAR (w, buffer) = buffer;
+ wset_buffer (w, buffer);
if (EQ (window, selected_window))
- BVAR (b, last_selected_window) = window;
+ bset_last_selected_window (b, window);
/* Let redisplay errors through. */
b->display_error_modiff = 0;
/* Update time stamps of buffer display. */
if (INTEGERP (BVAR (b, display_count)))
- XSETINT (BVAR (b, display_count), XINT (BVAR (b, display_count)) + 1);
- BVAR (b, display_time) = Fcurrent_time ();
+ bset_display_count (b, make_number (XINT (BVAR (b, display_count)) + 1));
+ bset_display_time (b, Fcurrent_time ());
- XSETFASTINT (WVAR (w, window_end_pos), 0);
- XSETFASTINT (WVAR (w, window_end_vpos), 0);
+ wset_window_end_pos (w, make_number (0));
+ wset_window_end_vpos (w, make_number (0));
memset (&w->last_cursor, 0, sizeof w->last_cursor);
- WVAR (w, window_end_valid) = Qnil;
+ wset_window_end_valid (w, Qnil);
if (!(keep_margins_p && samebuf))
{ /* If we're not actually changing the buffer, don't reset hscroll and
vscroll. This case happens for example when called from
whenever we resize the frame. */
w->hscroll = w->min_hscroll = 0;
w->vscroll = 0;
- set_marker_both (WVAR (w, pointm), buffer, BUF_PT (b), BUF_PT_BYTE (b));
- set_marker_restricted (WVAR (w, start),
+ set_marker_both (w->pointm, buffer, BUF_PT (b), BUF_PT_BYTE (b));
+ set_marker_restricted (w->start,
make_number (b->last_window_start),
buffer);
w->start_at_line_beg = 0;
because that might itself be a local variable. */
if (window_initialized)
{
- record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+ record_unwind_current_buffer ();
Fset_buffer (buffer);
}
- XMARKER (WVAR (w, pointm))->insertion_type = !NILP (Vwindow_point_insertion_type);
+ XMARKER (w->pointm)->insertion_type = !NILP (Vwindow_point_insertion_type);
if (!keep_margins_p)
{
/* This may call adjust_window_margins three times, so
temporarily disable window margins. */
- Lisp_Object save_left = WVAR (w, left_margin_cols);
- Lisp_Object save_right = WVAR (w, right_margin_cols);
+ Lisp_Object save_left = w->left_margin_cols;
+ Lisp_Object save_right = w->right_margin_cols;
- WVAR (w, left_margin_cols) = WVAR (w, right_margin_cols) = Qnil;
+ wset_left_margin_cols (w, Qnil);
+ wset_right_margin_cols (w, Qnil);
Fset_window_fringes (window,
BVAR (b, left_fringe_width), BVAR (b, right_fringe_width),
BVAR (b, scroll_bar_width),
BVAR (b, vertical_scroll_bar_type), Qnil);
- WVAR (w, left_margin_cols) = save_left;
- WVAR (w, right_margin_cols) = save_right;
+ wset_left_margin_cols (w, save_left);
+ wset_right_margin_cols (w, save_right);
Fset_window_margins (window,
BVAR (b, left_margin_cols), BVAR (b, right_margin_cols));
{
if (! NILP (Vwindow_scroll_functions))
run_hook_with_args_2 (Qwindow_scroll_functions, window,
- Fmarker_position (WVAR (w, start)));
+ Fmarker_position (w->start));
run_window_configuration_change_hook (XFRAME (WINDOW_FRAME (w)));
}
DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
doc: /* Make WINDOW display BUFFER-OR-NAME as its contents.
-WINDOW has to be a live window and defaults to the selected one.
+WINDOW must be a live window and defaults to the selected one.
BUFFER-OR-NAME must be a buffer or the name of an existing buffer.
Optional third argument KEEP-MARGINS non-nil means that WINDOW's current
(register Lisp_Object window, Lisp_Object buffer_or_name, Lisp_Object keep_margins)
{
register Lisp_Object tem, buffer;
- register struct window *w = decode_window (window);
+ register struct window *w = decode_live_window (window);
XSETWINDOW (window, w);
buffer = Fget_buffer (buffer_or_name);
CHECK_BUFFER (buffer);
- if (NILP (BVAR (XBUFFER (buffer), name)))
+ if (!BUFFER_LIVE_P (XBUFFER (buffer)))
error ("Attempt to display deleted buffer");
- tem = WVAR (w, buffer);
+ tem = w->buffer;
if (NILP (tem))
error ("Window is deleted");
else if (!EQ (tem, Qt))
{
if (!EQ (tem, buffer))
{
- if (EQ (WVAR (w, dedicated), Qt))
+ if (EQ (w->dedicated, Qt))
/* WINDOW is strongly dedicated to its buffer, signal an
error. */
error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
else
/* WINDOW is weakly dedicated to its buffer, reset
dedication. */
- WVAR (w, dedicated) = Qnil;
+ wset_dedicated (w, Qnil);
call1 (Qrecord_window_buffer, window);
}
struct window *w = XWINDOW (object);
mark_window_display_accurate (object, 0);
w->update_mode_line = 1;
- if (BUFFERP (WVAR (w, buffer)))
- XBUFFER (WVAR (w, buffer))->prevent_redisplay_optimizations_p = 1;
+ if (BUFFERP (w->buffer))
+ XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
++update_mode_lines;
return Qt;
}
if (STRINGP (object))
object = Fget_buffer (object);
- if (BUFFERP (object) && !NILP (BVAR (XBUFFER (object), name)))
+ if (BUFFERP (object) && BUFFER_LIVE_P (XBUFFER (object)))
{
/* Walk all windows looking for buffer, and force update
of each of those windows. */
return Qnil;
}
-
+/* Obsolete since 24.3. */
void
temp_output_buffer_show (register Lisp_Object buf)
{
register Lisp_Object window;
register struct window *w;
- BVAR (XBUFFER (buf), directory) = BVAR (current_buffer, directory);
+ bset_directory (XBUFFER (buf), BVAR (current_buffer, directory));
Fset_buffer (buf);
BUF_SAVE_MODIFF (XBUFFER (buf)) = MODIFF;
{
window = display_buffer (buf, Qnil, Qnil);
- if (!EQ (WVAR (XWINDOW (window), frame), selected_frame))
+ if (!EQ (XWINDOW (window)->frame, selected_frame))
Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
Vminibuf_scroll_window = window;
w = XWINDOW (window);
w->hscroll = 0;
w->min_hscroll = 0;
- set_marker_restricted_both (WVAR (w, start), buf, BEG, BEG);
- set_marker_restricted_both (WVAR (w, pointm), buf, BEG, BEG);
+ set_marker_restricted_both (w->start, buf, BEG, BEG);
+ set_marker_restricted_both (w->pointm, buf, BEG, BEG);
/* Run temp-buffer-show-hook, with the chosen window selected
and its buffer current. */
record_unwind_protect (Fset_buffer, prev_buffer);
record_unwind_protect (select_window_norecord, prev_window);
Fselect_window (window, Qt);
- Fset_buffer (WVAR (w, buffer));
+ Fset_buffer (w->buffer);
Frun_hooks (1, &Qtemp_buffer_show_hook);
unbind_to (count, Qnil);
}
}
}
-
-DEFUN ("internal-temp-output-buffer-show",
- Ftemp_output_buffer_show, Stemp_output_buffer_show,
- 1, 1, 0,
- doc: /* Internal function for `with-output-to-temp-buffer'. */)
- (Lisp_Object buf)
-{
- temp_output_buffer_show (buf);
- return Qnil;
-}
\f
/* Make new window, have it replace WINDOW in window-tree, and make
WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only
p = allocate_window ();
memcpy ((char *) p + sizeof (struct vectorlike_header),
(char *) o + sizeof (struct vectorlike_header),
- sizeof (Lisp_Object) * VECSIZE (struct window));
+ word_size * VECSIZE (struct window));
XSETWINDOW (parent, p);
p->sequence_number = ++sequence_number;
replace_window (window, parent, 1);
- WVAR (o, next) = Qnil;
- WVAR (o, prev) = Qnil;
- WVAR (o, parent) = parent;
+ wset_next (o, Qnil);
+ wset_prev (o, Qnil);
+ wset_parent (o, parent);
- WVAR (p, hchild) = horflag ? window : Qnil;
- WVAR (p, vchild) = horflag ? Qnil : window;
- WVAR (p, start) = Qnil;
- WVAR (p, pointm) = Qnil;
- WVAR (p, buffer) = Qnil;
- WVAR (p, combination_limit) = Qnil;
- WVAR (p, window_parameters) = Qnil;
+ wset_hchild (p, horflag ? window : Qnil);
+ wset_vchild (p, horflag ? Qnil : window);
+ wset_start (p, Qnil);
+ wset_pointm (p, Qnil);
+ wset_buffer (p, Qnil);
+ wset_combination_limit (p, Qnil);
+ wset_window_parameters (p, Qnil);
}
/* Make new window from scratch. */
w = allocate_window ();
/* Initialize Lisp data. Note that allocate_window initializes all
Lisp data to nil, so do it only for slots which should not be nil. */
- XSETFASTINT (WVAR (w, left_col), 0);
- XSETFASTINT (WVAR (w, top_line), 0);
- XSETFASTINT (WVAR (w, total_lines), 0);
- XSETFASTINT (WVAR (w, total_cols), 0);
- WVAR (w, normal_lines) = make_float (1.0);
- WVAR (w, normal_cols) = make_float (1.0);
- XSETFASTINT (WVAR (w, new_total), 0);
- XSETFASTINT (WVAR (w, new_normal), 0);
- WVAR (w, start) = Fmake_marker ();
- WVAR (w, pointm) = Fmake_marker ();
- WVAR (w, vertical_scroll_bar_type) = Qt;
- XSETFASTINT (WVAR (w, window_end_pos), 0);
- XSETFASTINT (WVAR (w, window_end_vpos), 0);
+ wset_left_col (w, make_number (0));
+ wset_top_line (w, make_number (0));
+ wset_total_lines (w, make_number (0));
+ wset_total_cols (w, make_number (0));
+ wset_normal_lines (w, make_float (1.0));
+ wset_normal_cols (w, make_float (1.0));
+ wset_new_total (w, make_number (0));
+ wset_new_normal (w, make_number (0));
+ wset_start (w, Fmake_marker ());
+ wset_pointm (w, Fmake_marker ());
+ wset_vertical_scroll_bar_type (w, Qt);
+ wset_window_end_pos (w, make_number (0));
+ wset_window_end_vpos (w, make_number (0));
+ /* These Lisp fields are marked specially so they're not set to nil by
+ allocate_window. */
+ wset_prev_buffers (w, Qnil);
+ wset_next_buffers (w, Qnil);
/* Initialize non-Lisp data. Note that allocate_window zeroes out all
non-Lisp data, so do it only for slots which should not be zero. */
\f
DEFUN ("set-window-new-total", Fset_window_new_total, Sset_window_new_total, 2, 3, 0,
doc: /* Set new total size of WINDOW to SIZE.
+WINDOW must be a valid window and defaults to the selected one.
Return SIZE.
Optional argument ADD non-nil means add SIZE to the new total size of
Note: This function does not operate on any child windows of WINDOW. */)
(Lisp_Object window, Lisp_Object size, Lisp_Object add)
{
- struct window *w = decode_any_window (window);
+ struct window *w = decode_valid_window (window);
CHECK_NUMBER (size);
if (NILP (add))
- XSETINT (WVAR (w, new_total), XINT (size));
+ wset_new_total (w, size);
else
- XSETINT (WVAR (w, new_total), XINT (WVAR (w, new_total)) + XINT (size));
+ wset_new_total (w, make_number (XINT (w->new_total) + XINT (size)));
- return WVAR (w, new_total);
+ return w->new_total;
}
DEFUN ("set-window-new-normal", Fset_window_new_normal, Sset_window_new_normal, 1, 2, 0,
doc: /* Set new normal size of WINDOW to SIZE.
+WINDOW must be a valid window and defaults to the selected one.
Return SIZE.
Note: This function does not operate on any child windows of WINDOW. */)
(Lisp_Object window, Lisp_Object size)
{
- struct window *w = decode_any_window (window);
-
- WVAR (w, new_normal) = size;
- return WVAR (w, new_normal);
+ wset_new_normal (decode_valid_window (window), size);
+ return size;
}
/* Return 1 if setting w->total_lines (w->total_cols if HORFLAG is
{
struct window *c;
- if (!NILP (WVAR (w, vchild)))
+ if (!NILP (w->vchild))
/* W is a vertical combination. */
{
- c = XWINDOW (WVAR (w, vchild));
+ c = XWINDOW (w->vchild);
if (horflag)
/* All child windows of W must have the same width as W. */
{
while (c)
{
- if ((XINT (WVAR (c, new_total)) != XINT (WVAR (w, new_total)))
+ if ((XINT (c->new_total) != XINT (w->new_total))
|| !window_resize_check (c, horflag))
return 0;
- c = NILP (WVAR (c, next)) ? 0 : XWINDOW (WVAR (c, next));
+ c = NILP (c->next) ? 0 : XWINDOW (c->next);
}
return 1;
}
{
if (!window_resize_check (c, horflag))
return 0;
- sum_of_sizes = sum_of_sizes + XINT (WVAR (c, new_total));
- c = NILP (WVAR (c, next)) ? 0 : XWINDOW (WVAR (c, next));
+ sum_of_sizes = sum_of_sizes + XINT (c->new_total);
+ c = NILP (c->next) ? 0 : XWINDOW (c->next);
}
- return (sum_of_sizes == XINT (WVAR (w, new_total)));
+ return (sum_of_sizes == XINT (w->new_total));
}
}
- else if (!NILP (WVAR (w, hchild)))
+ else if (!NILP (w->hchild))
/* W is a horizontal combination. */
{
- c = XWINDOW (WVAR (w, hchild));
+ c = XWINDOW (w->hchild);
if (horflag)
/* The sum of the widths of the child windows of W must equal W's
width. */
{
if (!window_resize_check (c, horflag))
return 0;
- sum_of_sizes = sum_of_sizes + XINT (WVAR (c, new_total));
- c = NILP (WVAR (c, next)) ? 0 : XWINDOW (WVAR (c, next));
+ sum_of_sizes = sum_of_sizes + XINT (c->new_total);
+ c = NILP (c->next) ? 0 : XWINDOW (c->next);
}
- return (sum_of_sizes == XINT (WVAR (w, new_total)));
+ return (sum_of_sizes == XINT (w->new_total));
}
else
/* All child windows of W must have the same height as W. */
{
while (c)
{
- if ((XINT (WVAR (c, new_total)) != XINT (WVAR (w, new_total)))
+ if ((XINT (c->new_total) != XINT (w->new_total))
|| !window_resize_check (c, horflag))
return 0;
- c = NILP (WVAR (c, next)) ? 0 : XWINDOW (WVAR (c, next));
+ c = NILP (c->next) ? 0 : XWINDOW (c->next);
}
return 1;
}
/* A leaf window. Make sure it's not too small. The following
hardcodes the values of `window-safe-min-width' (2) and
`window-safe-min-height' (1) which are defined in window.el. */
- return XINT (WVAR (w, new_total)) >= (horflag ? 2 : 1);
+ return XINT (w->new_total) >= (horflag ? 2 : 1);
}
/* Set w->total_lines (w->total_cols if HORIZONTAL is non-zero) to
parent window has been set *before*. */
if (horflag)
{
- WVAR (w, total_cols) = WVAR (w, new_total);
- if (NUMBERP (WVAR (w, new_normal)))
- WVAR (w, normal_cols) = WVAR (w, new_normal);
+ wset_total_cols (w, w->new_total);
+ if (NUMBERP (w->new_normal))
+ wset_normal_cols (w, w->new_normal);
- pos = XINT (WVAR (w, left_col));
+ pos = XINT (w->left_col);
}
else
{
- WVAR (w, total_lines) = WVAR (w, new_total);
- if (NUMBERP (WVAR (w, new_normal)))
- WVAR (w, normal_lines) = WVAR (w, new_normal);
+ wset_total_lines (w, w->new_total);
+ if (NUMBERP (w->new_normal))
+ wset_normal_lines (w, w->new_normal);
- pos = XINT (WVAR (w, top_line));
+ pos = XINT (w->top_line);
}
- if (!NILP (WVAR (w, vchild)))
+ if (!NILP (w->vchild))
/* W is a vertical combination. */
{
- c = XWINDOW (WVAR (w, vchild));
+ c = XWINDOW (w->vchild);
while (c)
{
if (horflag)
- XSETFASTINT (WVAR (c, left_col), pos);
+ wset_left_col (c, make_number (pos));
else
- XSETFASTINT (WVAR (c, top_line), pos);
+ wset_top_line (c, make_number (pos));
window_resize_apply (c, horflag);
if (!horflag)
- pos = pos + XINT (WVAR (c, total_lines));
- c = NILP (WVAR (c, next)) ? 0 : XWINDOW (WVAR (c, next));
+ pos = pos + XINT (c->total_lines);
+ c = NILP (c->next) ? 0 : XWINDOW (c->next);
}
}
- else if (!NILP (WVAR (w, hchild)))
+ else if (!NILP (w->hchild))
/* W is a horizontal combination. */
{
- c = XWINDOW (WVAR (w, hchild));
+ c = XWINDOW (w->hchild);
while (c)
{
if (horflag)
- XSETFASTINT (WVAR (c, left_col), pos);
+ wset_left_col (c, make_number (pos));
else
- XSETFASTINT (WVAR (c, top_line), pos);
+ wset_top_line (c, make_number (pos));
window_resize_apply (c, horflag);
if (horflag)
- pos = pos + XINT (WVAR (c, total_cols));
- c = NILP (WVAR (c, next)) ? 0 : XWINDOW (WVAR (c, next));
+ pos = pos + XINT (c->total_cols);
+ c = NILP (c->next) ? 0 : XWINDOW (c->next);
}
}
r = XWINDOW (FRAME_ROOT_WINDOW (f));
if (!window_resize_check (r, horflag)
- || ! EQ (WVAR (r, new_total),
- (horflag ? WVAR (r, total_cols) : WVAR (r, total_lines))))
+ || ! EQ (r->new_total,
+ (horflag ? r->total_cols : r->total_lines)))
return Qnil;
- BLOCK_INPUT;
+ block_input ();
window_resize_apply (r, horflag);
windows_or_buffers_changed++;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
adjust_glyphs (f);
- UNBLOCK_INPUT;
+ unblock_input ();
run_window_configuration_change_hook (f);
void
resize_frame_windows (struct frame *f, int size, int horflag)
{
- Lisp_Object root = FVAR (f, root_window);
+ Lisp_Object root = f->root_window;
struct window *r = XWINDOW (root);
- Lisp_Object mini = FVAR (f, minibuffer_window);
+ Lisp_Object mini = f->minibuffer_window;
struct window *m;
/* new_size is the new size of the frame's root window. */
int new_size = (horflag
- ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
? 1 : 0)));
- XSETFASTINT (WVAR (r, top_line), FRAME_TOP_MARGIN (f));
- if (NILP (WVAR (r, vchild)) && NILP (WVAR (r, hchild)))
+ wset_top_line (r, make_number (FRAME_TOP_MARGIN (f)));
+ if (NILP (r->vchild) && NILP (r->hchild))
/* For a leaf root window just set the size. */
if (horflag)
- XSETFASTINT (WVAR (r, total_cols), new_size);
+ wset_total_cols (r, make_number (new_size));
else
- XSETFASTINT (WVAR (r, total_lines), new_size);
+ wset_total_lines (r, make_number (new_size));
else
{
/* old_size is the old size of the frame's root window. */
- int old_size = XFASTINT (horflag ? WVAR (r, total_cols)
- : WVAR (r, total_lines));
+ int old_size = XFASTINT (horflag ? r->total_cols
+ : r->total_lines);
Lisp_Object delta;
XSETINT (delta, new_size - old_size);
/* Try a "normal" resize first. */
resize_root_window (root, delta, horflag ? Qt : Qnil, Qnil);
if (window_resize_check (r, horflag)
- && new_size == XINT (WVAR (r, new_total)))
+ && new_size == XINT (r->new_total))
window_resize_apply (r, horflag);
else
{
/* Try with "reasonable" minimum sizes next. */
resize_root_window (root, delta, horflag ? Qt : Qnil, Qt);
if (window_resize_check (r, horflag)
- && new_size == XINT (WVAR (r, new_total)))
+ && new_size == XINT (r->new_total))
window_resize_apply (r, horflag);
else
{
/* Finally, try with "safe" minimum sizes. */
resize_root_window (root, delta, horflag ? Qt : Qnil, Qsafe);
if (window_resize_check (r, horflag)
- && new_size == XINT (WVAR (r, new_total)))
+ && new_size == XINT (r->new_total))
window_resize_apply (r, horflag);
else
{
/* We lost. Delete all windows but the frame's
selected one. */
- root = FVAR (f, selected_window);
+ root = f->selected_window;
Fdelete_other_windows_internal (root, Qnil);
if (horflag)
- XSETFASTINT (WVAR (XWINDOW (root), total_cols), new_size);
+ wset_total_cols (XWINDOW (root), make_number (new_size));
else
- XSETFASTINT (WVAR (XWINDOW (root), total_lines), new_size);
+ wset_total_lines (XWINDOW (root), make_number (new_size));
}
}
}
{
m = XWINDOW (mini);
if (horflag)
- XSETFASTINT (WVAR (m, total_cols), size);
+ wset_total_cols (m, make_number (size));
else
{
/* Are we sure we always want 1 line here? */
- XSETFASTINT (WVAR (m, total_lines), 1);
- XSETFASTINT (WVAR (m, top_line), XINT (WVAR (r, top_line))
- + XINT (WVAR (r, total_lines)));
+ wset_total_lines (m, make_number (1));
+ wset_top_line
+ (m, make_number (XINT (r->top_line) + XINT (r->total_lines)));
}
}
+
+ windows_or_buffers_changed++;
}
We do that if either `window-combination-limit' is t, or OLD has no
parent, or OLD is ortho-combined. */
combination_limit =
- !NILP (Vwindow_combination_limit)
- || NILP (WVAR (o, parent))
+ EQ (Vwindow_combination_limit, Qt)
+ || NILP (o->parent)
|| NILP (horflag
- ? (WVAR (XWINDOW (WVAR (o, parent)), hchild))
- : (WVAR (XWINDOW (WVAR (o, parent)), vchild)));
+ ? (XWINDOW (o->parent)->hchild)
+ : (XWINDOW (o->parent)->vchild));
/* We need a live reference window to initialize some parameters. */
if (WINDOW_LIVE_P (old))
/* `window-combination-resize' non-nil means try to resize OLD's siblings
proportionally. */
{
- p = XWINDOW (WVAR (o, parent));
+ p = XWINDOW (o->parent);
/* Temporarily pretend we split the parent window. */
- XSETINT (WVAR (p, new_total),
- XINT (horflag ? WVAR (p, total_cols) : WVAR (p, total_lines))
- - XINT (total_size));
+ wset_new_total
+ (p, make_number (XINT (horflag ? p->total_cols : p->total_lines)
+ - XINT (total_size)));
if (!window_resize_check (p, horflag))
error ("Window sizes don't fit");
else
/* Undo the temporary pretension. */
- WVAR (p, new_total)
- = horflag ? WVAR (p, total_cols) : WVAR (p, total_lines);
+ wset_new_total (p, horflag ? p->total_cols : p->total_lines);
}
else
{
if (!window_resize_check (o, horflag))
error ("Resizing old window failed");
- else if (XINT (total_size) + XINT (WVAR (o, new_total))
- != XINT (horflag ? WVAR (o, total_cols) : WVAR (o, total_lines)))
+ else if (XINT (total_size) + XINT (o->new_total)
+ != XINT (horflag ? o->total_cols : o->total_lines))
error ("Sum of sizes of old and new window don't fit");
}
by make_parent_window and we need it below for assigning it to
p->new_normal. */
Lisp_Object new_normal
- = horflag ? WVAR (o, normal_cols) : WVAR (o, normal_lines);
+ = horflag ? o->normal_cols : o->normal_lines;
make_parent_window (old, horflag);
- p = XWINDOW (WVAR (o, parent));
- /* Store value of `window-combination-limit' in new parent's
- combination_limit slot. */
- WVAR (p, combination_limit) = Vwindow_combination_limit;
+ p = XWINDOW (o->parent);
+ if (EQ (Vwindow_combination_limit, Qt))
+ /* Store t in the new parent's combination_limit slot to avoid
+ that its children get merged into another window. */
+ wset_combination_limit (p, Qt);
/* These get applied below. */
- WVAR (p, new_total)
- = horflag ? WVAR (o, total_cols) : WVAR (o, total_lines);
- WVAR (p, new_normal) = new_normal;
+ wset_new_total (p, horflag ? o->total_cols : o->total_lines);
+ wset_new_normal (p, new_normal);
}
else
- p = XWINDOW (WVAR (o, parent));
+ p = XWINDOW (o->parent);
windows_or_buffers_changed++;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
new = make_window ();
n = XWINDOW (new);
- WVAR (n, frame) = frame;
- WVAR (n, parent) = WVAR (o, parent);
- WVAR (n, vchild) = WVAR (n, hchild) = Qnil;
+ wset_frame (n, frame);
+ wset_parent (n, o->parent);
+ wset_vchild (n, Qnil);
+ wset_hchild (n, Qnil);
if (EQ (side, Qabove) || EQ (side, Qleft))
{
- WVAR (n, prev) = WVAR (o, prev);
- if (NILP (WVAR (n, prev)))
+ wset_prev (n, o->prev);
+ if (NILP (n->prev))
if (horflag)
- WVAR (p, hchild) = new;
+ wset_hchild (p, new);
else
- WVAR (p, vchild) = new;
+ wset_vchild (p, new);
else
- WVAR (XWINDOW (WVAR (n, prev)), next) = new;
- WVAR (n, next) = old;
- WVAR (o, prev) = new;
+ wset_next (XWINDOW (n->prev), new);
+ wset_next (n, old);
+ wset_prev (o, new);
}
else
{
- WVAR (n, next) = WVAR (o, next);
- if (!NILP (WVAR (n, next)))
- WVAR (XWINDOW (WVAR (n, next)), prev) = new;
- WVAR (n, prev) = old;
- WVAR (o, next) = new;
+ wset_next (n, o->next);
+ if (!NILP (n->next))
+ wset_prev (XWINDOW (n->next), new);
+ wset_prev (n, old);
+ wset_next (o, new);
}
- WVAR (n, buffer) = Qt;
- WVAR (n, window_end_valid) = Qnil;
+ wset_buffer (n, Qt);
+ wset_window_end_valid (n, Qnil);
memset (&n->last_cursor, 0, sizeof n->last_cursor);
/* Get special geometry settings from reference window. */
- WVAR (n, left_margin_cols) = WVAR (r, left_margin_cols);
- WVAR (n, right_margin_cols) = WVAR (r, right_margin_cols);
- WVAR (n, left_fringe_width) = WVAR (r, left_fringe_width);
- WVAR (n, right_fringe_width) = WVAR (r, right_fringe_width);
+ wset_left_margin_cols (n, r->left_margin_cols);
+ wset_right_margin_cols (n, r->right_margin_cols);
+ wset_left_fringe_width (n, r->left_fringe_width);
+ wset_right_fringe_width (n, r->right_fringe_width);
n->fringes_outside_margins = r->fringes_outside_margins;
- WVAR (n, scroll_bar_width) = WVAR (r, scroll_bar_width);
- WVAR (n, vertical_scroll_bar_type) = WVAR (r, vertical_scroll_bar_type);
+ wset_scroll_bar_width (n, r->scroll_bar_width);
+ wset_vertical_scroll_bar_type (n, r->vertical_scroll_bar_type);
/* Directly assign orthogonal coordinates and sizes. */
if (horflag)
{
- WVAR (n, top_line) = WVAR (o, top_line);
- WVAR (n, total_lines) = WVAR (o, total_lines);
+ wset_top_line (n, o->top_line);
+ wset_total_lines (n, o->total_lines);
}
else
{
- WVAR (n, left_col) = WVAR (o, left_col);
- WVAR (n, total_cols) = WVAR (o, total_cols);
+ wset_left_col (n, o->left_col);
+ wset_total_cols (n, o->total_cols);
}
/* Iso-coordinates and sizes are assigned by window_resize_apply,
get them ready here. */
- WVAR (n, new_total) = total_size;
- WVAR (n, new_normal) = normal_size;
+ wset_new_total (n, total_size);
+ wset_new_normal (n, normal_size);
- BLOCK_INPUT;
+ block_input ();
window_resize_apply (p, horflag);
adjust_glyphs (f);
/* Set buffer of NEW to buffer of reference window. Don't run
any hooks. */
- set_window_buffer (new, WVAR (r, buffer), 0, 1);
- UNBLOCK_INPUT;
+ set_window_buffer (new, r->buffer, 0, 1);
+ unblock_input ();
/* Maybe we should run the scroll functions in Elisp (which already
runs the configuration change hook). */
if (! NILP (Vwindow_scroll_functions))
run_hook_with_args_2 (Qwindow_scroll_functions, new,
- Fmarker_position (WVAR (n, start)));
+ Fmarker_position (n->start));
/* Return NEW. */
return new;
}
w = decode_any_window (window);
XSETWINDOW (window, w);
- if (NILP (WVAR (w, buffer))
- && NILP (WVAR (w, hchild)) && NILP (WVAR (w, vchild)))
+ if (NILP (w->buffer)
+ && NILP (w->hchild) && NILP (w->vchild))
/* It's a no-op to delete an already deleted window. */
return Qnil;
- parent = WVAR (w, parent);
+ parent = w->parent;
if (NILP (parent))
/* Never delete a minibuffer or frame root window. */
error ("Attempt to delete minibuffer or sole ordinary window");
- else if (NILP (WVAR (w, prev)) && NILP (WVAR (w, next)))
+ else if (NILP (w->prev) && NILP (w->next))
/* Rather bow out here, this case should be handled on the Elisp
level. */
error ("Attempt to delete sole window of parent");
p = XWINDOW (parent);
- horflag = NILP (WVAR (p, vchild));
+ horflag = NILP (p->vchild);
frame = WINDOW_FRAME (w);
f = XFRAME (frame);
r = XWINDOW (root);
/* Unlink WINDOW from window tree. */
- if (NILP (WVAR (w, prev)))
+ if (NILP (w->prev))
/* Get SIBLING below (on the right of) WINDOW. */
{
/* before_sibling 1 means WINDOW is the first child of its
parent and thus before the sibling. */
before_sibling = 1;
- sibling = WVAR (w, next);
+ sibling = w->next;
s = XWINDOW (sibling);
- WVAR (s, prev) = Qnil;
+ wset_prev (s, Qnil);
if (horflag)
- WVAR (p, hchild) = sibling;
+ wset_hchild (p, sibling);
else
- WVAR (p, vchild) = sibling;
+ wset_vchild (p, sibling);
}
else
/* Get SIBLING above (on the left of) WINDOW. */
{
- sibling = WVAR (w, prev);
+ sibling = w->prev;
s = XWINDOW (sibling);
- WVAR (s, next) = WVAR (w, next);
- if (!NILP (WVAR (s, next)))
- WVAR (XWINDOW (WVAR (s, next)), prev) = sibling;
+ wset_next (s, w->next);
+ if (!NILP (s->next))
+ wset_prev (XWINDOW (s->next), sibling);
}
if (window_resize_check (r, horflag)
- && EQ (WVAR (r, new_total),
- (horflag ? WVAR (r, total_cols) : WVAR (r, total_lines))))
+ && EQ (r->new_total,
+ (horflag ? r->total_cols : r->total_lines)))
/* We can delete WINDOW now. */
{
/* Block input. */
- BLOCK_INPUT;
+ block_input ();
window_resize_apply (p, horflag);
/* If this window is referred to by the dpyinfo's mouse
Vwindow_list = Qnil;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
- WVAR (w, next) = Qnil; /* Don't delete w->next too. */
+ wset_next (w, Qnil); /* Don't delete w->next too. */
free_window_matrices (w);
- if (!NILP (WVAR (w, vchild)))
+ if (!NILP (w->vchild))
{
- delete_all_child_windows (WVAR (w, vchild));
- WVAR (w, vchild) = Qnil;
+ delete_all_child_windows (w->vchild);
+ wset_vchild (w, Qnil);
}
- else if (!NILP (WVAR (w, hchild)))
+ else if (!NILP (w->hchild))
{
- delete_all_child_windows (WVAR (w, hchild));
- WVAR (w, hchild) = Qnil;
+ delete_all_child_windows (w->hchild);
+ wset_hchild (w, Qnil);
}
- else if (!NILP (WVAR (w, buffer)))
+ else if (!NILP (w->buffer))
{
unshow_buffer (w);
- unchain_marker (XMARKER (WVAR (w, pointm)));
- unchain_marker (XMARKER (WVAR (w, start)));
- WVAR (w, buffer) = Qnil;
+ unchain_marker (XMARKER (w->pointm));
+ unchain_marker (XMARKER (w->start));
+ wset_buffer (w, Qnil);
}
- if (NILP (WVAR (s, prev)) && NILP (WVAR (s, next)))
+ if (NILP (s->prev) && NILP (s->next))
/* A matrjoshka where SIBLING has become the only child of
PARENT. */
{
replace_window (parent, sibling, 0);
/* Have SIBLING inherit the following three slot values from
PARENT (the combination_limit slot is not inherited). */
- WVAR (s, normal_cols) = WVAR (p, normal_cols);
- WVAR (s, normal_lines) = WVAR (p, normal_lines);
+ wset_normal_cols (s, p->normal_cols);
+ wset_normal_lines (s, p->normal_lines);
/* Mark PARENT as deleted. */
- WVAR (p, vchild) = WVAR (p, hchild) = Qnil;
+ wset_vchild (p, Qnil);
+ wset_hchild (p, Qnil);
/* Try to merge SIBLING into its new parent. */
recombine_windows (sibling);
}
if (EQ (FRAME_SELECTED_WINDOW (f), selected_window))
Fselect_window (new_selected_window, Qt);
else
- FRAME_SELECTED_WINDOW (f) = new_selected_window;
+ fset_selected_window (f, new_selected_window);
- UNBLOCK_INPUT;
+ unblock_input ();
/* Now look whether `get-mru-window' gets us something. */
mru_window = call1 (Qget_mru_window, frame);
if (WINDOW_LIVE_P (mru_window)
- && EQ (WVAR (XWINDOW (mru_window), frame), frame))
+ && EQ (XWINDOW (mru_window)->frame, frame))
new_selected_window = mru_window;
/* If all ended up well, we now promote the mru window. */
if (EQ (FRAME_SELECTED_WINDOW (f), selected_window))
Fselect_window (new_selected_window, Qnil);
else
- FRAME_SELECTED_WINDOW (f) = new_selected_window;
+ fset_selected_window (f, new_selected_window);
}
else
- UNBLOCK_INPUT;
+ unblock_input ();
/* Must be run by the caller:
run_window_configuration_change_hook (f); */
{
if (before_sibling)
{
- WVAR (s, prev) = window;
+ wset_prev (s, window);
if (horflag)
- WVAR (p, hchild) = window;
+ wset_hchild (p, window);
else
- WVAR (p, vchild) = window;
+ wset_vchild (p, window);
}
else
{
- WVAR (s, next) = window;
- if (!NILP (WVAR (w, next)))
- WVAR (XWINDOW (WVAR (w, next)), prev) = window;
+ wset_next (s, window);
+ if (!NILP (w->next))
+ wset_prev (XWINDOW (w->next), window);
}
error ("Deletion failed");
}
void
grow_mini_window (struct window *w, int delta)
{
- struct frame *f = XFRAME (WVAR (w, frame));
+ struct frame *f = XFRAME (w->frame);
struct window *r;
Lisp_Object root, value;
root, make_number (- delta));
if (INTEGERP (value) && window_resize_check (r, 0))
{
- BLOCK_INPUT;
+ block_input ();
window_resize_apply (r, 0);
/* Grow the mini-window. */
- XSETFASTINT (WVAR (w, top_line),
- XFASTINT (WVAR (r, top_line)) + XFASTINT (WVAR (r, total_lines)));
- XSETFASTINT (WVAR (w, total_lines), XFASTINT (WVAR (w, total_lines)) - XINT (value));
+ wset_top_line
+ (w, make_number (XFASTINT (r->top_line) + XFASTINT (r->total_lines)));
+ wset_total_lines
+ (w, make_number (XFASTINT (w->total_lines) - XINT (value)));
w->last_modified = 0;
w->last_overlay_modified = 0;
+ windows_or_buffers_changed++;
adjust_glyphs (f);
- UNBLOCK_INPUT;
+ unblock_input ();
}
}
void
shrink_mini_window (struct window *w)
{
- struct frame *f = XFRAME (WVAR (w, frame));
+ struct frame *f = XFRAME (w->frame);
struct window *r;
Lisp_Object root, value;
EMACS_INT size;
eassert (MINI_WINDOW_P (w));
- size = XINT (WVAR (w, total_lines));
+ size = XINT (w->total_lines);
if (size > 1)
{
root = FRAME_ROOT_WINDOW (f);
root, make_number (size - 1));
if (INTEGERP (value) && window_resize_check (r, 0))
{
- BLOCK_INPUT;
+ block_input ();
window_resize_apply (r, 0);
/* Shrink the mini-window. */
- XSETFASTINT (WVAR (w, top_line), XFASTINT (WVAR (r, top_line))
- + XFASTINT (WVAR (r, total_lines)));
- XSETFASTINT (WVAR (w, total_lines), 1);
+ wset_top_line (w, make_number (XFASTINT (r->top_line)
+ + XFASTINT (r->total_lines)));
+ wset_total_lines (w, make_number (1));
w->last_modified = 0;
w->last_overlay_modified = 0;
+ windows_or_buffers_changed++;
adjust_glyphs (f);
- UNBLOCK_INPUT;
+ unblock_input ();
}
/* If the above failed for whatever strange reason we must make a
one window frame here. The same routine will be needed when
int height;
CHECK_WINDOW (window);
- f = XFRAME (WVAR (w, frame));
+ f = XFRAME (w->frame);
- if (!EQ (FRAME_MINIBUF_WINDOW (XFRAME (WVAR (w, frame))), window))
+ if (!EQ (FRAME_MINIBUF_WINDOW (XFRAME (w->frame)), window))
error ("Not a valid minibuffer window");
else if (FRAME_MINIBUF_ONLY_P (f))
error ("Cannot resize a minibuffer-only frame");
r = XWINDOW (FRAME_ROOT_WINDOW (f));
- height = XINT (WVAR (r, total_lines)) + XINT (WVAR (w, total_lines));
+ height = XINT (r->total_lines) + XINT (w->total_lines);
if (window_resize_check (r, 0)
- && XINT (WVAR (w, new_total)) > 0
- && height == XINT (WVAR (r, new_total)) + XINT (WVAR (w, new_total)))
+ && XINT (w->new_total) > 0
+ && height == XINT (r->new_total) + XINT (w->new_total))
{
- BLOCK_INPUT;
+ block_input ();
window_resize_apply (r, 0);
- WVAR (w, total_lines) = WVAR (w, new_total);
- XSETFASTINT (WVAR (w, top_line),
- XINT (WVAR (r, top_line)) + XINT (WVAR (r, total_lines)));
+ wset_total_lines (w, w->new_total);
+ wset_top_line (w, make_number (XINT (r->top_line)
+ + XINT (r->total_lines)));
windows_or_buffers_changed++;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
adjust_glyphs (f);
- UNBLOCK_INPUT;
+ unblock_input ();
run_window_configuration_change_hook (f);
return Qt;
{
while (w)
{
- if (!NILP (WVAR (w, hchild)))
- mark_window_cursors_off (XWINDOW (WVAR (w, hchild)));
- else if (!NILP (WVAR (w, vchild)))
- mark_window_cursors_off (XWINDOW (WVAR (w, vchild)));
+ if (!NILP (w->hchild))
+ mark_window_cursors_off (XWINDOW (w->hchild));
+ else if (!NILP (w->vchild))
+ mark_window_cursors_off (XWINDOW (w->vchild));
else
w->phys_cursor_on_p = 0;
- w = NILP (WVAR (w, next)) ? 0 : XWINDOW (WVAR (w, next));
+ w = NILP (w->next) ? 0 : XWINDOW (w->next);
}
}
int
window_internal_height (struct window *w)
{
- int ht = XFASTINT (WVAR (w, total_lines));
+ int ht = XFASTINT (w->total_lines);
if (!MINI_WINDOW_P (w))
{
- if (!NILP (WVAR (w, parent))
- || !NILP (WVAR (w, vchild))
- || !NILP (WVAR (w, hchild))
- || !NILP (WVAR (w, next))
- || !NILP (WVAR (w, prev))
+ if (!NILP (w->parent)
+ || !NILP (w->vchild)
+ || !NILP (w->hchild)
+ || !NILP (w->next)
+ || !NILP (w->prev)
|| WINDOW_WANTS_MODELINE_P (w))
--ht;
/* If we must, use the pixel-based version which is much slower than
the line-based one but can handle varying line heights. */
- if (FRAME_WINDOW_P (XFRAME (WVAR (XWINDOW (window), frame))))
+ if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame)))
window_scroll_pixel_based (window, n, whole, noerror);
else
window_scroll_line_based (window, n, whole, noerror);
int x, y, rtop, rbot, rowh, vpos;
void *itdata = NULL;
- SET_TEXT_POS_FROM_MARKER (start, WVAR (w, start));
+ SET_TEXT_POS_FROM_MARKER (start, w->start);
/* Scrolling a minibuffer window via scroll bar when the echo area
shows long text sometimes resets the minibuffer contents behind
our backs. */
spos = XINT (Fline_beginning_position (Qnil));
else
spos = min (XINT (Fline_end_position (Qnil)) + 1, ZV);
- set_marker_restricted (WVAR (w, start), make_number (spos),
- WVAR (w, buffer));
+ set_marker_restricted (w->start, make_number (spos),
+ w->buffer);
w->start_at_line_beg = 1;
w->update_mode_line = 1;
w->last_modified = 0;
/* If control gets here, then we vscrolled. */
- XBUFFER (WVAR (w, buffer))->prevent_redisplay_optimizations_p = 1;
+ XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
/* Don't try to change the window start below. */
vscrolled = 1;
}
/* Set the window start, and set up the window for redisplay. */
- set_marker_restricted (WVAR (w, start), make_number (pos),
- WVAR (w, buffer));
- bytepos = XMARKER (WVAR (w, start))->bytepos;
+ set_marker_restricted (w->start, make_number (pos),
+ w->buffer);
+ bytepos = XMARKER (w->start)->bytepos;
w->start_at_line_beg = (pos == BEGV || FETCH_BYTE (bytepos - 1) == '\n');
w->update_mode_line = 1;
w->last_modified = 0;
even if there is a header line. */
this_scroll_margin = max (0, scroll_margin);
this_scroll_margin
- = min (this_scroll_margin, XFASTINT (WVAR (w, total_lines)) / 4);
+ = min (this_scroll_margin, XFASTINT (w->total_lines) / 4);
this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
if (n > 0)
;
else if (window_scroll_pixel_based_preserve_y >= 0)
{
- SET_TEXT_POS_FROM_MARKER (start, WVAR (w, start));
+ SET_TEXT_POS_FROM_MARKER (start, w->start);
start_display (&it, w, start);
/* It would be wrong to subtract CURRENT_HEADER_LINE_HEIGHT
here because we called start_display again and did not
if (whole)
n *= max (1, ht - next_screen_context_lines);
- startpos = marker_position (WVAR (w, start));
+ startpos = marker_position (w->start);
if (!NILP (Vscroll_preserve_screen_position))
{
{
/* Don't use a scroll margin that is negative or too large. */
int this_scroll_margin =
- max (0, min (scroll_margin, XINT (WVAR (w, total_lines)) / 4));
+ max (0, min (scroll_margin, XINT (w->total_lines) / 4));
- set_marker_restricted_both (WVAR (w, start), WVAR (w, buffer), pos, pos_byte);
+ set_marker_restricted_both (w->start, w->buffer, pos, pos_byte);
w->start_at_line_beg = !NILP (bolp);
w->update_mode_line = 1;
w->last_modified = 0;
/* If selected window's buffer isn't current, make it current for
the moment. But don't screw up if window_scroll gets an error. */
- if (XBUFFER (WVAR (XWINDOW (selected_window), buffer)) != current_buffer)
+ if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer)
{
record_unwind_protect (save_excursion_restore, save_excursion_save ());
- Fset_buffer (WVAR (XWINDOW (selected_window), buffer));
+ Fset_buffer (XWINDOW (selected_window)->buffer);
/* Make redisplay consider other windows than just selected_window. */
++windows_or_buffers_changed;
record_unwind_protect (save_excursion_restore, save_excursion_save ());
++windows_or_buffers_changed;
- Fset_buffer (WVAR (w, buffer));
- SET_PT (marker_position (WVAR (w, pointm)));
+ Fset_buffer (w->buffer);
+ SET_PT (marker_position (w->pointm));
if (NILP (arg))
window_scroll (window, 1, 1, 1);
window_scroll (window, XINT (arg), 0, 1);
}
- set_marker_both (WVAR (w, pointm), Qnil, PT, PT_BYTE);
+ set_marker_both (w->pointm, Qnil, PT, PT_BYTE);
unbind_to (count, Qnil);
return Qnil;
int bottom_y;
void *itdata = NULL;
- if (XBUFFER (WVAR (w, buffer)) != current_buffer)
+ if (XBUFFER (w->buffer) != current_buffer)
{
old_buffer = current_buffer;
- set_buffer_internal (XBUFFER (WVAR (w, buffer)));
+ set_buffer_internal (XBUFFER (w->buffer));
}
else
old_buffer = NULL;
/* In case W->start is out of the accessible range, do something
reasonable. This happens in Info mode when Info-scroll-down
calls (recenter -1) while W->start is 1. */
- if (XMARKER (WVAR (w, start))->charpos < BEGV)
+ if (XMARKER (w->start)->charpos < BEGV)
SET_TEXT_POS (start, BEGV, BEGV_BYTE);
- else if (XMARKER (WVAR (w, start))->charpos > ZV)
+ else if (XMARKER (w->start)->charpos > ZV)
SET_TEXT_POS (start, ZV, ZV_BYTE);
else
- SET_TEXT_POS_FROM_MARKER (start, WVAR (w, start));
+ SET_TEXT_POS_FROM_MARKER (start, w->start);
itdata = bidi_shelve_cache ();
start_display (&it, w, start);
This kludge fixes a bug whereby (move-to-window-line -1)
when ZV is on the last screen line
moves to the previous screen line instead of the last one. */
- if (! FRAME_WINDOW_P (XFRAME (WVAR (w, frame))))
+ if (! FRAME_WINDOW_P (XFRAME (w->frame)))
height++;
/* Add in empty lines at the bottom of the window. */
(register Lisp_Object arg)
{
struct window *w = XWINDOW (selected_window);
- struct buffer *buf = XBUFFER (WVAR (w, buffer));
+ struct buffer *buf = XBUFFER (w->buffer);
struct buffer *obuf = current_buffer;
int center_p = 0;
ptrdiff_t charpos, bytepos;
/* Do this after making BUF current
in case scroll_margin is buffer-local. */
this_scroll_margin =
- max (0, min (scroll_margin, XFASTINT (WVAR (w, total_lines)) / 4));
+ max (0, min (scroll_margin, XFASTINT (w->total_lines) / 4));
/* Handle centering on a graphical frame specially. Such frames can
have variable-height lines and centering point on the basis of
line counts would lead to strange effects. */
- if (FRAME_WINDOW_P (XFRAME (WVAR (w, frame))))
+ if (FRAME_WINDOW_P (XFRAME (w->frame)))
{
if (center_p)
{
}
/* Set the new window start. */
- set_marker_both (WVAR (w, start), WVAR (w, buffer), charpos, bytepos);
- WVAR (w, window_end_valid) = Qnil;
+ set_marker_both (w->start, w->buffer, charpos, bytepos);
+ wset_window_end_valid (w, Qnil);
w->optional_new_start = 1;
DEFUN ("window-text-height", Fwindow_text_height, Swindow_text_height,
0, 1, 0,
doc: /* Return the height in lines of the text display area of WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
The returned height does not include the mode line, any header line,
nor any partial-height lines at the bottom of the text area. */)
(Lisp_Object window)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
int pixel_height = window_box_height (w);
- int line_height = pixel_height / FRAME_LINE_HEIGHT (XFRAME (WVAR (w, frame)));
+ int line_height = pixel_height / FRAME_LINE_HEIGHT (XFRAME (w->frame));
return make_number (line_height);
}
int this_scroll_margin;
#endif
- if (!(BUFFERP (WVAR (w, buffer))
- && XBUFFER (WVAR (w, buffer)) == current_buffer))
+ if (!(BUFFERP (w->buffer)
+ && XBUFFER (w->buffer) == current_buffer))
/* This test is needed to make sure PT/PT_BYTE make sense in w->buffer
when passed below to set_marker_both. */
error ("move-to-window-line called from unrelated buffer");
window = selected_window;
- start = marker_position (WVAR (w, start));
+ start = marker_position (w->start);
if (start < BEGV || start > ZV)
{
int height = window_internal_height (w);
Fvertical_motion (make_number (- (height / 2)), window);
- set_marker_both (WVAR (w, start), WVAR (w, buffer), PT, PT_BYTE);
+ set_marker_both (w->start, w->buffer, PT, PT_BYTE);
w->start_at_line_beg = !NILP (Fbolp ());
w->force_start = 1;
}
else
- Fgoto_char (WVAR (w, start));
+ Fgoto_char (w->start);
lines = displayed_window_lines (w);
data = (struct save_window_data *) XVECTOR (config);
saved_windows = XVECTOR (data->saved_windows);
- return WVAR (XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window), frame);
+ return XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame;
}
DEFUN ("set-window-configuration", Fset_window_configuration,
struct Lisp_Vector *saved_windows;
Lisp_Object new_current_buffer;
Lisp_Object frame;
- Lisp_Object auto_buffer_name;
FRAME_PTR f;
ptrdiff_t old_point = -1;
saved_windows = XVECTOR (data->saved_windows);
new_current_buffer = data->current_buffer;
- if (NILP (BVAR (XBUFFER (new_current_buffer), name)))
+ if (!BUFFER_LIVE_P (XBUFFER (new_current_buffer)))
new_current_buffer = Qnil;
else
{
window-point of the final-selected-window to the window-point of
the current-selected-window. So we have to be careful which
point of the current-buffer we copy into old_point. */
- if (EQ (WVAR (XWINDOW (data->current_window), buffer), new_current_buffer)
+ if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)
&& WINDOWP (selected_window)
- && EQ (WVAR (XWINDOW (selected_window), buffer), new_current_buffer)
+ && EQ (XWINDOW (selected_window)->buffer, new_current_buffer)
&& !EQ (selected_window, data->current_window))
- old_point = XMARKER (WVAR (XWINDOW (data->current_window), pointm))->charpos;
+ old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos;
else
old_point = PT;
else
So if possible we want this arbitrary choice of "which point" to
be the one from the to-be-selected-window so as to prevent this
window's cursor from being copied from another window. */
- if (EQ (WVAR (XWINDOW (data->current_window), buffer), new_current_buffer)
+ if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)
/* If current_window = selected_window, its point is in BUF_PT. */
&& !EQ (selected_window, data->current_window))
- old_point = XMARKER (WVAR (XWINDOW (data->current_window), pointm))->charpos;
+ old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos;
else
old_point = BUF_PT (XBUFFER (new_current_buffer));
}
- frame = WVAR (XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window), frame);
+ frame = XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame;
f = XFRAME (frame);
/* If f is a dead frame, don't bother rebuilding its window tree.
int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);
int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f);
+ /* Don't do this within the main loop below: This may call Lisp
+ code and is thus potentially unsafe while input is blocked. */
+ for (k = 0; k < saved_windows->header.size; k++)
+ {
+ p = SAVED_WINDOW_N (saved_windows, k);
+ window = p->window;
+ w = XWINDOW (window);
+ if (!NILP (w->buffer)
+ && !EQ (w->buffer, p->buffer)
+ && BUFFER_LIVE_P (XBUFFER (p->buffer)))
+ /* If a window we restore gets another buffer, record the
+ window's old buffer. */
+ call1 (Qrecord_window_buffer, window);
+ }
+
/* The mouse highlighting code could get screwed up
if it runs during this. */
- BLOCK_INPUT;
+ block_input ();
if (data->frame_lines != previous_frame_lines
|| data->frame_cols != previous_frame_cols)
window holds garbage.) We do this now, before
restoring the window contents, and prevent it from
being done later on when we select a new window. */
- if (! NILP (WVAR (XWINDOW (selected_window), buffer)))
+ if (! NILP (XWINDOW (selected_window)->buffer))
{
w = XWINDOW (selected_window);
- set_marker_both (WVAR (w, pointm),
- WVAR (w, buffer),
- BUF_PT (XBUFFER (WVAR (w, buffer))),
- BUF_PT_BYTE (XBUFFER (WVAR (w, buffer))));
+ set_marker_both (w->pointm,
+ w->buffer,
+ BUF_PT (XBUFFER (w->buffer)),
+ BUF_PT_BYTE (XBUFFER (w->buffer)));
}
windows_or_buffers_changed++;
p = SAVED_WINDOW_N (saved_windows, k);
window = p->window;
w = XWINDOW (window);
- WVAR (w, next) = Qnil;
+ wset_next (w, Qnil);
if (!NILP (p->parent))
- WVAR (w, parent) = SAVED_WINDOW_N (saved_windows,
- XFASTINT (p->parent))->window;
+ wset_parent
+ (w, SAVED_WINDOW_N (saved_windows, XFASTINT (p->parent))->window);
else
- WVAR (w, parent) = Qnil;
+ wset_parent (w, Qnil);
if (!NILP (p->prev))
{
- WVAR (w, prev) = SAVED_WINDOW_N (saved_windows,
- XFASTINT (p->prev))->window;
- WVAR (XWINDOW (WVAR (w, prev)), next) = p->window;
+ wset_prev
+ (w, SAVED_WINDOW_N (saved_windows, XFASTINT (p->prev))->window);
+ wset_next (XWINDOW (w->prev), p->window);
}
else
{
- WVAR (w, prev) = Qnil;
- if (!NILP (WVAR (w, parent)))
+ wset_prev (w, Qnil);
+ if (!NILP (w->parent))
{
- if (EQ (p->total_cols, WVAR (XWINDOW (WVAR (w, parent)), total_cols)))
+ if (EQ (p->total_cols, XWINDOW (w->parent)->total_cols))
{
- WVAR (XWINDOW (WVAR (w, parent)), vchild) = p->window;
- WVAR (XWINDOW (WVAR (w, parent)), hchild) = Qnil;
+ wset_vchild (XWINDOW (w->parent), p->window);
+ wset_hchild (XWINDOW (w->parent), Qnil);
}
else
{
- WVAR (XWINDOW (WVAR (w, parent)), hchild) = p->window;
- WVAR (XWINDOW (WVAR (w, parent)), vchild) = Qnil;
+ wset_hchild (XWINDOW (w->parent), p->window);
+ wset_vchild (XWINDOW (w->parent), Qnil);
}
}
}
/* If we squirreled away the buffer in the window's height,
restore it now. */
- if (BUFFERP (WVAR (w, total_lines)))
- WVAR (w, buffer) = WVAR (w, total_lines);
- WVAR (w, left_col) = p->left_col;
- WVAR (w, top_line) = p->top_line;
- WVAR (w, total_cols) = p->total_cols;
- WVAR (w, total_lines) = p->total_lines;
- WVAR (w, normal_cols) = p->normal_cols;
- WVAR (w, normal_lines) = p->normal_lines;
+ if (BUFFERP (w->total_lines))
+ wset_buffer (w, w->total_lines);
+ wset_left_col (w, p->left_col);
+ wset_top_line (w, p->top_line);
+ wset_total_cols (w, p->total_cols);
+ wset_total_lines (w, p->total_lines);
+ wset_normal_cols (w, p->normal_cols);
+ wset_normal_lines (w, p->normal_lines);
w->hscroll = XFASTINT (p->hscroll);
w->min_hscroll = XFASTINT (p->min_hscroll);
- WVAR (w, display_table) = p->display_table;
- WVAR (w, left_margin_cols) = p->left_margin_cols;
- WVAR (w, right_margin_cols) = p->right_margin_cols;
- WVAR (w, left_fringe_width) = p->left_fringe_width;
- WVAR (w, right_fringe_width) = p->right_fringe_width;
+ wset_display_table (w, p->display_table);
+ wset_left_margin_cols (w, p->left_margin_cols);
+ wset_right_margin_cols (w, p->right_margin_cols);
+ wset_left_fringe_width (w, p->left_fringe_width);
+ wset_right_fringe_width (w, p->right_fringe_width);
w->fringes_outside_margins = !NILP (p->fringes_outside_margins);
- WVAR (w, scroll_bar_width) = p->scroll_bar_width;
- WVAR (w, vertical_scroll_bar_type) = p->vertical_scroll_bar_type;
- WVAR (w, dedicated) = p->dedicated;
- WVAR (w, combination_limit) = p->combination_limit;
+ wset_scroll_bar_width (w, p->scroll_bar_width);
+ wset_vertical_scroll_bar_type (w, p->vertical_scroll_bar_type);
+ wset_dedicated (w, p->dedicated);
+ wset_combination_limit (w, p->combination_limit);
/* Restore any window parameters that have been saved.
Parameters that have not been saved are left alone. */
for (tem = p->window_parameters; CONSP (tem); tem = XCDR (tem))
{
if (NILP (XCDR (pers)))
{
- par = Fassq (XCAR (pers), WVAR (w, window_parameters));
+ par = Fassq (XCAR (pers), w->window_parameters);
if (CONSP (par) && !NILP (XCDR (par)))
/* Reset a parameter to nil if and only if it
has a non-nil association. Don't make new
/* Reinstall the saved buffer and pointers into it. */
if (NILP (p->buffer))
/* An internal window. */
- WVAR (w, buffer) = p->buffer;
- else if (!NILP (BVAR (XBUFFER (p->buffer), name)))
+ wset_buffer (w, p->buffer);
+ else if (BUFFER_LIVE_P (XBUFFER (p->buffer)))
/* If saved buffer is alive, install it. */
{
- WVAR (w, buffer) = p->buffer;
+ wset_buffer (w, p->buffer);
w->start_at_line_beg = !NILP (p->start_at_line_beg);
- set_marker_restricted (WVAR (w, start), p->start, WVAR (w, buffer));
- set_marker_restricted (WVAR (w, pointm), p->pointm,
- WVAR (w, buffer));
- Fset_marker (BVAR (XBUFFER (WVAR (w, buffer)), mark),
- p->mark, WVAR (w, buffer));
+ set_marker_restricted (w->start, p->start, w->buffer);
+ set_marker_restricted (w->pointm, p->pointm,
+ w->buffer);
+ Fset_marker (BVAR (XBUFFER (w->buffer), mark),
+ p->mark, w->buffer);
/* As documented in Fcurrent_window_configuration, don't
restore the location of point in the buffer which was
current when the window configuration was recorded. */
if (!EQ (p->buffer, new_current_buffer)
&& XBUFFER (p->buffer) == current_buffer)
- Fgoto_char (WVAR (w, pointm));
- }
- else if (!NILP (WVAR (w, buffer))
- && !NILP (BVAR (XBUFFER (WVAR (w, buffer)), name)))
- /* Keep window's old buffer; make sure the markers are
- real. */
- {
- /* Set window markers at start of visible range. */
- if (XMARKER (WVAR (w, start))->buffer == 0)
- set_marker_restricted (WVAR (w, start), make_number (0),
- WVAR (w, buffer));
- if (XMARKER (WVAR (w, pointm))->buffer == 0)
- set_marker_restricted_both
- (WVAR (w, pointm), WVAR (w, buffer),
- BUF_PT (XBUFFER (WVAR (w, buffer))),
- BUF_PT_BYTE (XBUFFER (WVAR (w, buffer))));
- w->start_at_line_beg = 1;
- }
- else if (STRINGP (auto_buffer_name =
- Fwindow_parameter (window, Qauto_buffer_name))
- && SCHARS (auto_buffer_name) != 0
- && !NILP (WVAR (w, buffer) = Fget_buffer_create (auto_buffer_name)))
- {
- set_marker_restricted (WVAR (w, start),
- make_number (0), WVAR (w, buffer));
- set_marker_restricted (WVAR (w, pointm),
- make_number (0), WVAR (w, buffer));
- w->start_at_line_beg = 1;
- }
+ Fgoto_char (w->pointm);
+ }
+ else if (!NILP (w->buffer)
+ && BUFFER_LIVE_P (XBUFFER (w->buffer)))
+ /* Keep window's old buffer; make sure the markers are
+ real. */
+ {
+ /* Set window markers at start of visible range. */
+ if (XMARKER (w->start)->buffer == 0)
+ set_marker_restricted (w->start, make_number (0),
+ w->buffer);
+ if (XMARKER (w->pointm)->buffer == 0)
+ set_marker_restricted_both
+ (w->pointm, w->buffer,
+ BUF_PT (XBUFFER (w->buffer)),
+ BUF_PT_BYTE (XBUFFER (w->buffer)));
+ w->start_at_line_beg = 1;
+ }
else
/* Window has no live buffer, get one. */
{
avoid showing an unimportant buffer and, if necessary, to
recreate *scratch* in the course (part of Juanma's bs-show
scenario from March 2011). */
- WVAR (w, buffer) = other_buffer_safely (Fcurrent_buffer ());
+ wset_buffer (w, other_buffer_safely (Fcurrent_buffer ()));
/* This will set the markers to beginning of visible
range. */
- set_marker_restricted (WVAR (w, start),
- make_number (0), WVAR (w, buffer));
- set_marker_restricted (WVAR (w, pointm),
- make_number (0), WVAR (w, buffer));
+ set_marker_restricted (w->start,
+ make_number (0), w->buffer);
+ set_marker_restricted (w->pointm,
+ make_number (0), w->buffer);
w->start_at_line_beg = 1;
- if (!NILP (WVAR (w, dedicated)))
+ if (!NILP (w->dedicated))
/* Record this window as dead. */
dead_windows = Fcons (window, dead_windows);
/* Make sure window is no more dedicated. */
- WVAR (w, dedicated) = Qnil;
+ wset_dedicated (w, Qnil);
}
}
- FRAME_ROOT_WINDOW (f) = data->root_window;
+ fset_root_window (f, data->root_window);
/* Arrange *not* to restore point in the buffer that was
current when the window configuration was saved. */
- if (EQ (WVAR (XWINDOW (data->current_window), buffer), new_current_buffer))
- set_marker_restricted (WVAR (XWINDOW (data->current_window), pointm),
+ if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer))
+ set_marker_restricted (XWINDOW (data->current_window)->pointm,
make_number (old_point),
- WVAR (XWINDOW (data->current_window), buffer));
+ XWINDOW (data->current_window)->buffer);
/* In the following call to `select-window', prevent "swapping out
point" in the old selected window using the buffer that has
been restored into it. We already swapped out that point from
that window's old buffer. */
select_window (data->current_window, Qnil, 1);
- BVAR (XBUFFER (WVAR (XWINDOW (selected_window), buffer)), last_selected_window)
+ BVAR (XBUFFER (XWINDOW (selected_window)->buffer), last_selected_window)
= selected_window;
if (NILP (data->focus_frame)
/* Now, free glyph matrices in windows that were not reused. */
for (i = n = 0; i < n_leaf_windows; ++i)
{
- if (NILP (WVAR (leaf_windows[i], buffer)))
+ if (NILP (leaf_windows[i]->buffer))
{
/* Assert it's not reused as a combination. */
- eassert (NILP (WVAR (leaf_windows[i], hchild))
- && NILP (WVAR (leaf_windows[i], vchild)));
+ eassert (NILP (leaf_windows[i]->hchild)
+ && NILP (leaf_windows[i]->vchild));
free_window_matrices (leaf_windows[i]);
}
- else if (EQ (WVAR (leaf_windows[i], buffer), new_current_buffer))
+ else if (EQ (leaf_windows[i]->buffer, new_current_buffer))
++n;
}
adjust_glyphs (f);
- UNBLOCK_INPUT;
+ unblock_input ();
/* Scan dead buffer windows. */
for (; CONSP (dead_windows); dead_windows = XCDR (dead_windows))
}
if (!NILP (new_current_buffer))
- Fset_buffer (new_current_buffer);
+ {
+ Fset_buffer (new_current_buffer);
+ /* If the new current buffer doesn't appear in the selected
+ window, go to its old point (see bug#12208). */
+ if (!EQ (XWINDOW (data->current_window)->buffer, new_current_buffer))
+ Fgoto_char (make_number (old_point));
+ }
Vminibuf_scroll_window = data->minibuf_scroll_window;
minibuf_selected_window = data->minibuf_selected_window;
w = XWINDOW (window);
- if (!NILP (WVAR (w, next)))
+ if (!NILP (w->next))
/* Delete WINDOW's siblings (we traverse postorderly). */
- delete_all_child_windows (WVAR (w, next));
+ delete_all_child_windows (w->next);
- WVAR (w, total_lines) = WVAR (w, buffer); /* See Fset_window_configuration for excuse. */
+ /* See Fset_window_configuration for excuse. */
+ wset_total_lines (w, w->buffer);
- if (!NILP (WVAR (w, vchild)))
+ if (!NILP (w->vchild))
{
- delete_all_child_windows (WVAR (w, vchild));
- WVAR (w, vchild) = Qnil;
+ delete_all_child_windows (w->vchild);
+ wset_vchild (w, Qnil);
}
- else if (!NILP (WVAR (w, hchild)))
+ else if (!NILP (w->hchild))
{
- delete_all_child_windows (WVAR (w, hchild));
- WVAR (w, hchild) = Qnil;
+ delete_all_child_windows (w->hchild);
+ wset_hchild (w, Qnil);
}
- else if (!NILP (WVAR (w, buffer)))
+ else if (!NILP (w->buffer))
{
unshow_buffer (w);
- unchain_marker (XMARKER (WVAR (w, pointm)));
- unchain_marker (XMARKER (WVAR (w, start)));
- WVAR (w, buffer) = Qnil;
+ unchain_marker (XMARKER (w->pointm));
+ unchain_marker (XMARKER (w->start));
+ wset_buffer (w, Qnil);
}
Vwindow_list = Qnil;
count_windows (register struct window *window)
{
register int count = 1;
- if (!NILP (WVAR (window, next)))
- count += count_windows (XWINDOW (WVAR (window, next)));
- if (!NILP (WVAR (window, vchild)))
- count += count_windows (XWINDOW (WVAR (window, vchild)));
- if (!NILP (WVAR (window, hchild)))
- count += count_windows (XWINDOW (WVAR (window, hchild)));
+ if (!NILP (window->next))
+ count += count_windows (XWINDOW (window->next));
+ if (!NILP (window->vchild))
+ count += count_windows (XWINDOW (window->vchild));
+ if (!NILP (window->hchild))
+ count += count_windows (XWINDOW (window->hchild));
return count;
}
{
while (w)
{
- if (!NILP (WVAR (w, hchild)))
- i = get_leaf_windows (XWINDOW (WVAR (w, hchild)), flat, i);
- else if (!NILP (WVAR (w, vchild)))
- i = get_leaf_windows (XWINDOW (WVAR (w, vchild)), flat, i);
+ if (!NILP (w->hchild))
+ i = get_leaf_windows (XWINDOW (w->hchild), flat, i);
+ else if (!NILP (w->vchild))
+ i = get_leaf_windows (XWINDOW (w->vchild), flat, i);
else
flat[i++] = w;
- w = NILP (WVAR (w, next)) ? 0 : XWINDOW (WVAR (w, next));
+ w = NILP (w->next) ? 0 : XWINDOW (w->next);
}
return i;
register struct window *w;
register Lisp_Object tem, pers, par;
- for (;!NILP (window); window = WVAR (w, next))
+ for (;!NILP (window); window = w->next)
{
p = SAVED_WINDOW_N (vector, i);
w = XWINDOW (window);
- XSETFASTINT (WVAR (w, temslot), i); i++;
+ wset_temslot (w, make_number (i)); i++;
p->window = window;
- p->buffer = WVAR (w, buffer);
- p->left_col = WVAR (w, left_col);
- p->top_line = WVAR (w, top_line);
- p->total_cols = WVAR (w, total_cols);
- p->total_lines = WVAR (w, total_lines);
- p->normal_cols = WVAR (w, normal_cols);
- p->normal_lines = WVAR (w, normal_lines);
+ p->buffer = w->buffer;
+ p->left_col = w->left_col;
+ p->top_line = w->top_line;
+ p->total_cols = w->total_cols;
+ p->total_lines = w->total_lines;
+ p->normal_cols = w->normal_cols;
+ p->normal_lines = w->normal_lines;
XSETFASTINT (p->hscroll, w->hscroll);
XSETFASTINT (p->min_hscroll, w->min_hscroll);
- p->display_table = WVAR (w, display_table);
- p->left_margin_cols = WVAR (w, left_margin_cols);
- p->right_margin_cols = WVAR (w, right_margin_cols);
- p->left_fringe_width = WVAR (w, left_fringe_width);
- p->right_fringe_width = WVAR (w, right_fringe_width);
+ p->display_table = w->display_table;
+ p->left_margin_cols = w->left_margin_cols;
+ p->right_margin_cols = w->right_margin_cols;
+ p->left_fringe_width = w->left_fringe_width;
+ p->right_fringe_width = w->right_fringe_width;
p->fringes_outside_margins = w->fringes_outside_margins ? Qt : Qnil;
- p->scroll_bar_width = WVAR (w, scroll_bar_width);
- p->vertical_scroll_bar_type = WVAR (w, vertical_scroll_bar_type);
- p->dedicated = WVAR (w, dedicated);
- p->combination_limit = WVAR (w, combination_limit);
+ p->scroll_bar_width = w->scroll_bar_width;
+ p->vertical_scroll_bar_type = w->vertical_scroll_bar_type;
+ p->dedicated = w->dedicated;
+ p->combination_limit = w->combination_limit;
p->window_parameters = Qnil;
if (!NILP (Vwindow_persistent_parameters))
/* Save values for persistent window parameters. */
if (CONSP (pers) && !NILP (XCDR (pers)))
{
- par = Fassq (XCAR (pers), WVAR (w, window_parameters));
+ par = Fassq (XCAR (pers), w->window_parameters);
if (NILP (par))
/* If the window has no value for the parameter,
make one. */
}
}
- if (!NILP (WVAR (w, buffer)))
+ if (!NILP (w->buffer))
{
/* Save w's value of point in the window configuration. If w
is the selected window, then get the value of point from
the buffer; pointm is garbage in the selected window. */
if (EQ (window, selected_window))
- p->pointm = build_marker (XBUFFER (WVAR (w, buffer)),
- BUF_PT (XBUFFER (WVAR (w, buffer))),
- BUF_PT_BYTE (XBUFFER (WVAR (w, buffer))));
+ p->pointm = build_marker (XBUFFER (w->buffer),
+ BUF_PT (XBUFFER (w->buffer)),
+ BUF_PT_BYTE (XBUFFER (w->buffer)));
else
- p->pointm = Fcopy_marker (WVAR (w, pointm), Qnil);
+ p->pointm = Fcopy_marker (w->pointm, Qnil);
XMARKER (p->pointm)->insertion_type
= !NILP (Vwindow_point_insertion_type);
- p->start = Fcopy_marker (WVAR (w, start), Qnil);
+ p->start = Fcopy_marker (w->start, Qnil);
p->start_at_line_beg = w->start_at_line_beg ? Qt : Qnil;
- tem = BVAR (XBUFFER (WVAR (w, buffer)), mark);
+ tem = BVAR (XBUFFER (w->buffer), mark);
p->mark = Fcopy_marker (tem, Qnil);
}
else
p->start_at_line_beg = Qnil;
}
- if (NILP (WVAR (w, parent)))
+ if (NILP (w->parent))
p->parent = Qnil;
else
- p->parent = WVAR (XWINDOW (WVAR (w, parent)), temslot);
+ p->parent = XWINDOW (w->parent)->temslot;
- if (NILP (WVAR (w, prev)))
+ if (NILP (w->prev))
p->prev = Qnil;
else
- p->prev = WVAR (XWINDOW (WVAR (w, prev)), temslot);
+ p->prev = XWINDOW (w->prev)->temslot;
- if (!NILP (WVAR (w, vchild)))
- i = save_window_save (WVAR (w, vchild), vector, i);
- if (!NILP (WVAR (w, hchild)))
- i = save_window_save (WVAR (w, hchild), vector, i);
+ if (!NILP (w->vchild))
+ i = save_window_save (w->vchild, vector, i);
+ if (!NILP (w->hchild))
+ i = save_window_save (w->hchild, vector, i);
}
return i;
DEFUN ("set-window-margins", Fset_window_margins, Sset_window_margins,
2, 3, 0,
doc: /* Set width of marginal areas of window WINDOW.
-If WINDOW is nil, set margins of the currently selected window.
+WINDOW must be a live window and defaults to the selected one.
+
Second arg LEFT-WIDTH specifies the number of character cells to
reserve for the left marginal area. Optional third arg RIGHT-WIDTH
does the same for the right marginal area. A nil width parameter
means no margin. */)
(Lisp_Object window, Lisp_Object left_width, Lisp_Object right_width)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
/* Translate negative or zero widths to nil.
Margins that are too wide have to be checked elsewhere. */
right_width = Qnil;
}
- if (!EQ (WVAR (w, left_margin_cols), left_width)
- || !EQ (WVAR (w, right_margin_cols), right_width))
+ if (!EQ (w->left_margin_cols, left_width)
+ || !EQ (w->right_margin_cols, right_width))
{
- WVAR (w, left_margin_cols) = left_width;
- WVAR (w, right_margin_cols) = right_width;
+ wset_left_margin_cols (w, left_width);
+ wset_right_margin_cols (w, right_width);
adjust_window_margins (w);
DEFUN ("window-margins", Fwindow_margins, Swindow_margins,
0, 1, 0,
doc: /* Get width of marginal areas of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
+
Value is a cons of the form (LEFT-WIDTH . RIGHT-WIDTH).
If a marginal area does not exist, its width will be returned
as nil. */)
(Lisp_Object window)
{
- struct window *w = decode_window (window);
- return Fcons (WVAR (w, left_margin_cols), WVAR (w, right_margin_cols));
+ struct window *w = decode_live_window (window);
+ return Fcons (w->left_margin_cols, w->right_margin_cols);
}
DEFUN ("set-window-fringes", Fset_window_fringes, Sset_window_fringes,
2, 4, 0,
doc: /* Set the fringe widths of window WINDOW.
-If WINDOW is nil, set the fringe widths of the currently selected
-window.
+WINDOW must be a live window and defaults to the selected one.
+
Second arg LEFT-WIDTH specifies the number of pixels to reserve for
the left fringe. Optional third arg RIGHT-WIDTH specifies the right
fringe width. If a fringe width arg is nil, that means to use the
display marginal areas and the text area. */)
(Lisp_Object window, Lisp_Object left_width, Lisp_Object right_width, Lisp_Object outside_margins)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
int outside = !NILP (outside_margins);
if (!NILP (left_width))
/* Do nothing on a tty. */
if (FRAME_WINDOW_P (WINDOW_XFRAME (w))
- && (!EQ (WVAR (w, left_fringe_width), left_width)
- || !EQ (WVAR (w, right_fringe_width), right_width)
+ && (!EQ (w->left_fringe_width, left_width)
+ || !EQ (w->right_fringe_width, right_width)
|| w->fringes_outside_margins != outside))
{
- WVAR (w, left_fringe_width) = left_width;
- WVAR (w, right_fringe_width) = right_width;
+ wset_left_fringe_width (w, left_width);
+ wset_right_fringe_width (w, right_width);
w->fringes_outside_margins = outside;
adjust_window_margins (w);
clear_glyph_matrix (w->current_matrix);
- WVAR (w, window_end_valid) = Qnil;
+ wset_window_end_valid (w, Qnil);
++windows_or_buffers_changed;
adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
DEFUN ("window-fringes", Fwindow_fringes, Swindow_fringes,
0, 1, 0,
doc: /* Get width of fringes of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
+
Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS). */)
(Lisp_Object window)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
return Fcons (make_number (WINDOW_LEFT_FRINGE_WIDTH (w)),
Fcons (make_number (WINDOW_RIGHT_FRINGE_WIDTH (w)),
DEFUN ("set-window-scroll-bars", Fset_window_scroll_bars,
Sset_window_scroll_bars, 2, 4, 0,
doc: /* Set width and type of scroll bars of window WINDOW.
-If window is nil, set scroll bars of the currently selected window.
+WINDOW must be a live window and defaults to the selected one.
+
Second parameter WIDTH specifies the pixel width for the scroll bar;
this is automatically adjusted to a multiple of the frame column width.
Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
Fourth parameter HORIZONTAL-TYPE is currently unused. */)
(Lisp_Object window, Lisp_Object width, Lisp_Object vertical_type, Lisp_Object horizontal_type)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
if (!NILP (width))
{
|| EQ (vertical_type, Qt)))
error ("Invalid type of vertical scroll bar");
- if (!EQ (WVAR (w, scroll_bar_width), width)
- || !EQ (WVAR (w, vertical_scroll_bar_type), vertical_type))
+ if (!EQ (w->scroll_bar_width, width)
+ || !EQ (w->vertical_scroll_bar_type, vertical_type))
{
- WVAR (w, scroll_bar_width) = width;
- WVAR (w, vertical_scroll_bar_type) = vertical_type;
+ wset_scroll_bar_width (w, width);
+ wset_vertical_scroll_bar_type (w, vertical_type);
adjust_window_margins (w);
clear_glyph_matrix (w->current_matrix);
- WVAR (w, window_end_valid) = Qnil;
+ wset_window_end_valid (w, Qnil);
++windows_or_buffers_changed;
adjust_glyphs (XFRAME (WINDOW_FRAME (w)));
DEFUN ("window-scroll-bars", Fwindow_scroll_bars, Swindow_scroll_bars,
0, 1, 0,
doc: /* Get width and type of scroll bars of window WINDOW.
-If WINDOW is omitted or nil, it defaults to the selected window.
+WINDOW must be a live window and defaults to the selected one.
+
Value is a list of the form (WIDTH COLS VERTICAL-TYPE HORIZONTAL-TYPE).
If WIDTH is nil or TYPE is t, the window is using the frame's corresponding
value. */)
(Lisp_Object window)
{
- struct window *w = decode_window (window);
+ struct window *w = decode_live_window (window);
return Fcons (make_number ((WINDOW_CONFIG_SCROLL_BAR_WIDTH (w)
? WINDOW_CONFIG_SCROLL_BAR_WIDTH (w)
: WINDOW_SCROLL_BAR_AREA_WIDTH (w))),
Fcons (make_number (WINDOW_SCROLL_BAR_COLS (w)),
- Fcons (WVAR (w, vertical_scroll_bar_type),
+ Fcons (w->vertical_scroll_bar_type,
Fcons (Qnil, Qnil))));
}
(Lisp_Object window, Lisp_Object pixels_p)
{
Lisp_Object result;
- struct frame *f;
- struct window *w;
-
- if (NILP (window))
- window = selected_window;
- else
- CHECK_WINDOW (window);
- w = XWINDOW (window);
- f = XFRAME (WVAR (w, frame));
+ struct window *w = decode_live_window (window);
+ struct frame *f = XFRAME (w->frame);
if (FRAME_WINDOW_P (f))
result = (NILP (pixels_p)
If PIXELS-P is non-nil, the return value is VSCROLL. */)
(Lisp_Object window, Lisp_Object vscroll, Lisp_Object pixels_p)
{
- struct window *w;
- struct frame *f;
+ struct window *w = decode_live_window (window);
+ struct frame *f = XFRAME (w->frame);
- if (NILP (window))
- window = selected_window;
- else
- CHECK_WINDOW (window);
CHECK_NUMBER_OR_FLOAT (vscroll);
- w = XWINDOW (window);
- f = XFRAME (WVAR (w, frame));
-
if (FRAME_WINDOW_P (f))
{
int old_dy = w->vscroll;
adjust_glyphs (f);
/* Prevent redisplay shortcuts. */
- XBUFFER (WVAR (w, buffer))->prevent_redisplay_optimizations_p = 1;
+ XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
}
}
for (cont = 1; w && cont;)
{
- if (!NILP (WVAR (w, hchild)))
- cont = foreach_window_1 (XWINDOW (WVAR (w, hchild)), fn, user_data);
- else if (!NILP (WVAR (w, vchild)))
- cont = foreach_window_1 (XWINDOW (WVAR (w, vchild)), fn, user_data);
+ if (!NILP (w->hchild))
+ cont = foreach_window_1 (XWINDOW (w->hchild), fn, user_data);
+ else if (!NILP (w->vchild))
+ cont = foreach_window_1 (XWINDOW (w->vchild), fn, user_data);
else
cont = fn (w, user_data);
- w = NILP (WVAR (w, next)) ? 0 : XWINDOW (WVAR (w, next));
+ w = NILP (w->next) ? 0 : XWINDOW (w->next);
}
return cont;
/* Return 1 if window configurations CONFIGURATION1 and CONFIGURATION2
describe the same state of affairs. This is used by Fequal.
- ignore_positions non-zero means ignore non-matching scroll positions
+ IGNORE_POSITIONS means ignore non-matching scroll positions
and the like.
This ignores a couple of things like the dedication status of
window, combination_limit and the like. This might have to be
fixed. */
-int
-compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions)
+bool
+compare_window_configurations (Lisp_Object configuration1,
+ Lisp_Object configuration2,
+ bool ignore_positions)
{
register struct save_window_data *d1, *d2;
struct Lisp_Vector *sws1, *sws2;
struct frame *f = make_initial_frame ();
XSETFRAME (selected_frame, f);
Vterminal_frame = selected_frame;
- minibuf_window = FVAR (f, minibuffer_window);
- selected_window = FVAR (f, selected_window);
+ minibuf_window = f->minibuffer_window;
+ selected_window = f->selected_window;
last_nonminibuf_frame = f;
window_initialized = 1;
DEFSYM (Qwindowp, "windowp");
DEFSYM (Qwindow_configuration_p, "window-configuration-p");
DEFSYM (Qwindow_live_p, "window-live-p");
+ DEFSYM (Qwindow_valid_p, "window-valid-p");
DEFSYM (Qwindow_deletable_p, "window-deletable-p");
DEFSYM (Qdelete_window, "delete-window");
DEFSYM (Qwindow_resize_root_window, "window--resize-root-window");
DEFSYM (Qreplace_buffer_in_windows, "replace-buffer-in-windows");
DEFSYM (Qrecord_window_buffer, "record-window-buffer");
DEFSYM (Qget_mru_window, "get-mru-window");
+ DEFSYM (Qwindow_size, "window-size");
DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook");
DEFSYM (Qabove, "above");
DEFSYM (Qbelow, "below");
- DEFSYM (Qauto_buffer_name, "auto-buffer-name");
DEFSYM (Qclone_of, "clone-of");
staticpro (&Vwindow_list);
Vwindow_combination_resize = Qnil;
DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit,
- doc: /* If t, splitting a window makes a new parent window.
-If this variable is nil, splitting a window will create a new parent
-window only if the window has no parent window or the window shall
-become a combination orthogonal to the one it is part of.
+ doc: /* If non-nil, splitting a window makes a new parent window.
+The following values are recognized:
-If this variable is t, splitting a window always creates a new parent
-window. If all splits behave this way, each frame's window tree is a
-binary tree and every window but the frame's root window has exactly one
-sibling.
+nil means splitting a window will create a new parent window only if the
+ window has no parent window or the window shall become part of a
+ combination orthogonal to the one it is part of.
-Other values are reserved for future use.
+`window-size' means that splitting a window for displaying a buffer
+ makes a new parent window provided `display-buffer' is supposed to
+ explicitly set the window's size due to the presence of a
+ `window-height' or `window-width' entry in the alist used by
+ `display-buffer'. Otherwise, this value is handled like nil.
+
+`temp-buffer' means that splitting a window for displaying a temporary
+ buffer always makes a new parent window. Otherwise, this value is
+ handled like nil.
+
+`display-buffer' means that splitting a window for displaying a buffer
+ always makes a new parent window. Since temporary buffers are
+ displayed by the function `display-buffer', this value is stronger
+ than `temp-buffer'. Splitting a window for other purpose makes a
+ new parent window only if needed.
+
+t means that splitting a window always creates a new parent window. If
+ all splits behave this way, each frame's window tree is a binary
+ tree and every window but the frame's root window has exactly one
+ sibling.
-The value of this variable is also assigned to the combination limit of
-the new parent window. The combination limit of a window can be
-retrieved via the function `window-combination-limit' and altered by the
-function `set-window-combination-limit'. */);
- Vwindow_combination_limit = Qnil;
+Other values are reserved for future use. */);
+ Vwindow_combination_limit = Qwindow_size;
DEFVAR_LISP ("window-persistent-parameters", Vwindow_persistent_parameters,
doc: /* Alist of persistent window parameters.
defsubr (&Sminibuffer_window);
defsubr (&Swindow_minibuffer_p);
defsubr (&Swindowp);
+ defsubr (&Swindow_valid_p);
defsubr (&Swindow_live_p);
defsubr (&Swindow_frame);
defsubr (&Sframe_root_window);
defsubr (&Srun_window_configuration_change_hook);
defsubr (&Sselect_window);
defsubr (&Sforce_window_update);
- defsubr (&Stemp_output_buffer_show);
defsubr (&Ssplit_window_internal);
defsubr (&Sscroll_up);
defsubr (&Sscroll_down);