From 02397678b1169849a098c42f625b31da1f79c48e Mon Sep 17 00:00:00 2001 From: Alexander Gramiak Date: Wed, 17 Apr 2019 07:39:25 -0600 Subject: [PATCH] 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. --- src/nsterm.h | 2 +- src/nsterm.m | 32 ++++++++++++++++---------------- src/w32term.c | 28 ++++++++++++++-------------- src/w32term.h | 2 +- src/xdisp.c | 2 +- src/xterm.c | 32 ++++++++++++++++---------------- src/xterm.h | 2 +- 7 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/nsterm.h b/src/nsterm.h index 41cdaccbc79..683f2dd9341 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -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. */ diff --git a/src/nsterm.m b/src/nsterm.m index cf1ff055304..cdf1916e71b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1540,36 +1540,36 @@ ns_frame_rehighlight (struct frame *frame) -------------------------------------------------------------------------- */ { 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 @@ ns_iconify_frame (struct frame *f) 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 @@ ns_free_frame_resources (struct frame *f) 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 @@ ns_set_frame_alpha (struct frame *f) 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 @@ ns_initialize_display_info (struct ns_display_info *dpyinfo) 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; diff --git a/src/w32term.c b/src/w32term.c index 65c1baf20f6..3811585d0f6 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -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); diff --git a/src/w32term.h b/src/w32term.h index d5bb08dc675..de372d7e5d7 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -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; diff --git a/src/xdisp.c b/src/xdisp.c index 34e89c79046..9f0739e0c61 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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; diff --git a/src/xterm.c b/src/xterm.c index c710d1c918b..dd19b8bde15 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -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); diff --git a/src/xterm.h b/src/xterm.h index f4007d6e7f3..266a42afa08 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -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; -- 2.39.2