Commit 02397678 authored by Alexander Gramiak's avatar Alexander Gramiak
Browse files

Rename x_highlight_frame property to highlight_frame

* src/nsterm.h:
* src/nsterm.m:
* src/w32term.c:
* src/w32term.h:
* src/xdisp.c:
* src/xterm.c:
* src/xterm.h: Rename.
parent 46cfe5cb
Pipeline #1475 passed with stage
in 51 minutes and 9 seconds
......@@ -881,7 +881,7 @@ struct ns_display_info
mouse-face. */
Mouse_HLInfo mouse_highlight;
struct frame *x_highlight_frame;
struct frame *highlight_frame;
struct frame *ns_focus_frame;
/* The frame where the mouse was last time we reported a mouse event. */
......
......@@ -1540,36 +1540,36 @@ -(void)remove
-------------------------------------------------------------------------- */
{
struct ns_display_info *dpyinfo = FRAME_DISPLAY_INFO (frame);
struct frame *old_highlight = dpyinfo->x_highlight_frame;
struct frame *old_highlight = dpyinfo->highlight_frame;
NSTRACE ("ns_frame_rehighlight");
if (dpyinfo->ns_focus_frame)
{
dpyinfo->x_highlight_frame
dpyinfo->highlight_frame
= (FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->ns_focus_frame))
? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->ns_focus_frame))
: dpyinfo->ns_focus_frame);
if (!FRAME_LIVE_P (dpyinfo->x_highlight_frame))
if (!FRAME_LIVE_P (dpyinfo->highlight_frame))
{
fset_focus_frame (dpyinfo->ns_focus_frame, Qnil);
dpyinfo->x_highlight_frame = dpyinfo->ns_focus_frame;
dpyinfo->highlight_frame = dpyinfo->ns_focus_frame;
}
}
else
dpyinfo->x_highlight_frame = 0;
dpyinfo->highlight_frame = 0;
if (dpyinfo->x_highlight_frame &&
dpyinfo->x_highlight_frame != old_highlight)
if (dpyinfo->highlight_frame &&
dpyinfo->highlight_frame != old_highlight)
{
if (old_highlight)
{
gui_update_cursor (old_highlight, 1);
ns_set_frame_alpha (old_highlight);
}
if (dpyinfo->x_highlight_frame)
if (dpyinfo->highlight_frame)
{
gui_update_cursor (dpyinfo->x_highlight_frame, 1);
ns_set_frame_alpha (dpyinfo->x_highlight_frame);
gui_update_cursor (dpyinfo->highlight_frame, 1);
ns_set_frame_alpha (dpyinfo->highlight_frame);
}
}
}
......@@ -1667,8 +1667,8 @@ Hide the window (X11 semantics)
view = FRAME_NS_VIEW (f);
dpyinfo = FRAME_DISPLAY_INFO (f);
if (dpyinfo->x_highlight_frame == f)
dpyinfo->x_highlight_frame = 0;
if (dpyinfo->highlight_frame == f)
dpyinfo->highlight_frame = 0;
if ([[view window] windowNumber] <= 0)
{
......@@ -1714,8 +1714,8 @@ Hide the window (X11 semantics)
if (f == dpyinfo->ns_focus_frame)
dpyinfo->ns_focus_frame = 0;
if (f == dpyinfo->x_highlight_frame)
dpyinfo->x_highlight_frame = 0;
if (f == dpyinfo->highlight_frame)
dpyinfo->highlight_frame = 0;
if (f == hlinfo->mouse_face_mouse_frame)
reset_mouse_highlight (hlinfo);
......@@ -2468,7 +2468,7 @@ so some key presses (TAB) are swallowed by the system. */
NSTRACE ("ns_set_frame_alpha");
if (dpyinfo->x_highlight_frame == f)
if (dpyinfo->highlight_frame == f)
alpha = f->alpha[0];
else
alpha = f->alpha[1];
......@@ -5142,7 +5142,7 @@ static Lisp_Object ns_string_to_lispmod (const char *s)
dpyinfo->color_table = xmalloc (sizeof *dpyinfo->color_table);
dpyinfo->color_table->colors = NULL;
dpyinfo->root_window = 42; /* A placeholder. */
dpyinfo->x_highlight_frame = dpyinfo->ns_focus_frame = NULL;
dpyinfo->highlight_frame = dpyinfo->ns_focus_frame = NULL;
dpyinfo->n_fonts = 0;
dpyinfo->smallest_font_height = 1;
dpyinfo->smallest_char_width = 1;
......
......@@ -3036,29 +3036,29 @@ w32_frame_rehighlight (struct frame *frame)
static void
w32_frame_rehighlight_1 (struct w32_display_info *dpyinfo)
{
struct frame *old_highlight = dpyinfo->x_highlight_frame;
struct frame *old_highlight = dpyinfo->highlight_frame;
if (dpyinfo->w32_focus_frame)
{
dpyinfo->x_highlight_frame
dpyinfo->highlight_frame
= ((FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)))
? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))
: dpyinfo->w32_focus_frame);
if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
if (! FRAME_LIVE_P (dpyinfo->highlight_frame))
{
fset_focus_frame (dpyinfo->w32_focus_frame, Qnil);
dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame;
dpyinfo->highlight_frame = dpyinfo->w32_focus_frame;
}
}
else
dpyinfo->x_highlight_frame = 0;
dpyinfo->highlight_frame = 0;
if (dpyinfo->x_highlight_frame != old_highlight)
if (dpyinfo->highlight_frame != old_highlight)
{
if (old_highlight)
w32_frame_unhighlight (old_highlight);
if (dpyinfo->x_highlight_frame)
w32_frame_highlight (dpyinfo->x_highlight_frame);
if (dpyinfo->highlight_frame)
w32_frame_highlight (dpyinfo->highlight_frame);
}
}
......@@ -6822,8 +6822,8 @@ void
w32_make_frame_invisible (struct frame *f)
{
/* Don't keep the highlight on an invisible frame. */
if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
block_input ();
......@@ -6855,8 +6855,8 @@ void
w32_iconify_frame (struct frame *f)
{
/* Don't keep the highlight on an invisible frame. */
if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
if (FRAME_ICONIFIED_P (f))
return;
......@@ -6903,8 +6903,8 @@ w32_free_frame_resources (struct frame *f)
dpyinfo->w32_focus_frame = 0;
if (f == dpyinfo->w32_focus_event_frame)
dpyinfo->w32_focus_event_frame = 0;
if (f == dpyinfo->x_highlight_frame)
dpyinfo->x_highlight_frame = 0;
if (f == dpyinfo->highlight_frame)
dpyinfo->highlight_frame = 0;
if (f == hlinfo->mouse_face_mouse_frame)
reset_mouse_highlight (hlinfo);
......
......@@ -182,7 +182,7 @@ struct w32_display_info
event). It points to the focus frame's selected window's
frame. It differs from w32_focus_frame when we're using a global
minibuffer. */
struct frame *x_highlight_frame;
struct frame *highlight_frame;
/* The frame waiting to be auto-raised in w32_read_socket. */
struct frame *w32_pending_autoraise_frame;
......
......@@ -29306,7 +29306,7 @@ get_window_cursor_type (struct window *w, struct glyph *glyph, int *width,
/* Detect a nonselected window or nonselected frame. */
else if (w != XWINDOW (f->selected_window)
|| f != FRAME_DISPLAY_INFO (f)->x_highlight_frame)
|| f != FRAME_DISPLAY_INFO (f)->highlight_frame)
{
*active_cursor = false;
......@@ -917,7 +917,7 @@ x_set_frame_alpha (struct frame *f)
unsigned long opac;
Window parent;
if (dpyinfo->x_highlight_frame == f)
if (dpyinfo->highlight_frame == f)
alpha = f->alpha[0];
else
alpha = f->alpha[1];
......@@ -4718,29 +4718,29 @@ XTframe_rehighlight (struct frame *frame)
static void
x_frame_rehighlight (struct x_display_info *dpyinfo)
{
struct frame *old_highlight = dpyinfo->x_highlight_frame;
struct frame *old_highlight = dpyinfo->highlight_frame;
if (dpyinfo->x_focus_frame)
{
dpyinfo->x_highlight_frame
dpyinfo->highlight_frame
= ((FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame)))
? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->x_focus_frame))
: dpyinfo->x_focus_frame);
if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
if (! FRAME_LIVE_P (dpyinfo->highlight_frame))
{
fset_focus_frame (dpyinfo->x_focus_frame, Qnil);
dpyinfo->x_highlight_frame = dpyinfo->x_focus_frame;
dpyinfo->highlight_frame = dpyinfo->x_focus_frame;
}
}
else
dpyinfo->x_highlight_frame = 0;
dpyinfo->highlight_frame = 0;
if (dpyinfo->x_highlight_frame != old_highlight)
if (dpyinfo->highlight_frame != old_highlight)
{
if (old_highlight)
x_frame_unhighlight (old_highlight);
if (dpyinfo->x_highlight_frame)
x_frame_highlight (dpyinfo->x_highlight_frame);
if (dpyinfo->highlight_frame)
x_frame_highlight (dpyinfo->highlight_frame);
}
}
......@@ -8907,7 +8907,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
into a parent frame with the child frame selected and
`no-accept-focus' is not set, select the clicked
frame. */
struct frame *hf = dpyinfo->x_highlight_frame;
struct frame *hf = dpyinfo->highlight_frame;
if (FRAME_PARENT_FRAME (f) || (hf && frame_ancestor_p (f, hf)))
{
......@@ -11674,8 +11674,8 @@ x_make_frame_invisible (struct frame *f)
window = FRAME_OUTER_WINDOW (f);
/* Don't keep the highlight on an invisible frame. */
if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
block_input ();
......@@ -11735,8 +11735,8 @@ x_iconify_frame (struct frame *f)
#endif
/* Don't keep the highlight on an invisible frame. */
if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
if (FRAME_DISPLAY_INFO (f)->highlight_frame == f)
FRAME_DISPLAY_INFO (f)->highlight_frame = 0;
if (FRAME_ICONIFIED_P (f))
return;
......@@ -11999,8 +11999,8 @@ x_free_frame_resources (struct frame *f)
dpyinfo->x_focus_frame = 0;
if (f == dpyinfo->x_focus_event_frame)
dpyinfo->x_focus_event_frame = 0;
if (f == dpyinfo->x_highlight_frame)
dpyinfo->x_highlight_frame = 0;
if (f == dpyinfo->highlight_frame)
dpyinfo->highlight_frame = 0;
if (f == hlinfo->mouse_face_mouse_frame)
reset_mouse_highlight (hlinfo);
......
......@@ -350,7 +350,7 @@ struct x_display_info
event). It points to the X focus frame's selected window's
frame. It differs from x_focus_frame when we're using a global
minibuffer. */
struct frame *x_highlight_frame;
struct frame *highlight_frame;
/* The frame waiting to be auto-raised in XTread_socket. */
struct frame *x_pending_autoraise_frame;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment