x_update_window_end (struct window *w, int cursor_on_p,
int mouse_face_overwritten_p)
{
- Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (XFRAME (w->frame));
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (XFRAME (WVAR (w, frame)));
if (!w->pseudo_window_p)
{
overhead is very small. */
if (windows_or_buffers_changed
&& desired_row->full_width_p
- && (f = XFRAME (w->frame),
+ && (f = XFRAME (WVAR (w, frame)),
width = FRAME_INTERNAL_BORDER_WIDTH (f),
width != 0)
&& (height = desired_row->visible_height,
static void
x_scroll_run (struct window *w, struct run *run)
{
- struct frame *f = XFRAME (w->frame);
+ struct frame *f = XFRAME (WVAR (w, frame));
int x, y, width, height, from_y, to_y, bottom_y;
HWND hwnd = FRAME_W32_WINDOW (f);
HRGN expect_dirty;
my_destroy_window (f, SCROLL_BAR_W32_WINDOW (bar));
/* Dissociate this scroll bar from its window. */
- XWINDOW (bar->window)->vertical_scroll_bar = Qnil;
+ WVAR (XWINDOW (bar->window), vertical_scroll_bar) = Qnil;
UNBLOCK_INPUT;
}
w32_set_vertical_scroll_bar (struct window *w,
int portion, int whole, int position)
{
- struct frame *f = XFRAME (w->frame);
+ struct frame *f = XFRAME (WVAR (w, frame));
struct scroll_bar *bar;
int top, height, left, sb_left, width, sb_width;
int window_y, window_height;
|| WINDOW_RIGHT_MARGIN_COLS (w) == 0));
/* Does the scroll bar exist yet? */
- if (NILP (w->vertical_scroll_bar))
+ if (NILP (WVAR (w, vertical_scroll_bar)))
{
HDC hdc;
BLOCK_INPUT;
/* It may just need to be moved and resized. */
HWND hwnd;
- bar = XSCROLL_BAR (w->vertical_scroll_bar);
+ bar = XSCROLL_BAR (WVAR (w, vertical_scroll_bar));
hwnd = SCROLL_BAR_W32_WINDOW (bar);
/* If already correctly positioned, do nothing. */
w32_set_scroll_bar_thumb (bar, portion, position, whole);
- XSETVECTOR (w->vertical_scroll_bar, bar);
+ XSETVECTOR (WVAR (w, vertical_scroll_bar), bar);
}
struct frame *f;
/* We can't redeem this window's scroll bar if it doesn't have one. */
- if (NILP (window->vertical_scroll_bar))
+ if (NILP (WVAR (window, vertical_scroll_bar)))
abort ();
- bar = XSCROLL_BAR (window->vertical_scroll_bar);
+ bar = XSCROLL_BAR (WVAR (window, vertical_scroll_bar));
/* Unlink it from the condemned list. */
f = XFRAME (WINDOW_FRAME (window));
{
/* If the prev pointer is nil, it must be the first in one of
the lists. */
- if (EQ (FRAME_SCROLL_BARS (f), window->vertical_scroll_bar))
+ if (EQ (FRAME_SCROLL_BARS (f), WVAR (window, vertical_scroll_bar)))
/* It's not condemned. Everything's fine. */
return;
else if (EQ (FRAME_CONDEMNED_SCROLL_BARS (f),
- window->vertical_scroll_bar))
+ WVAR (window, vertical_scroll_bar)))
FRAME_CONDEMNED_SCROLL_BARS (f) = bar->next;
else
/* If its prev pointer is nil, it must be at the front of
create event iff we don't leave the
selected frame. */
&& (focus_follows_mouse
- || (EQ (XWINDOW (window)->frame,
- XWINDOW (selected_window)->frame))))
+ || (EQ (WVAR (XWINDOW (window), frame),
+ WVAR (XWINDOW (selected_window), frame)))))
{
inev.kind = SELECT_WINDOW_EVENT;
inev.frame_or_window = window;
x_draw_bar_cursor (struct window *w, struct glyph_row *row,
int width, enum text_cursor_kinds kind)
{
- struct frame *f = XFRAME (w->frame);
+ struct frame *f = XFRAME (WVAR (w, frame));
struct glyph *cursor_glyph;
/* If cursor is out of bounds, don't draw garbage. This can happen