diff options
author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-13 09:40:03 -0600 |
---|---|---|
committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-26 16:54:17 -0600 |
commit | a411517faf624657aa58979f5463115115093309 (patch) | |
tree | bd75804dd99876f424c9e6805212e356683c54d4 /src/window.c | |
parent | da9541dd1086b7bab52940c82915efe114bb7419 (diff) | |
download | emacs-a411517faf624657aa58979f5463115115093309.tar.gz |
Rename generic x_* identifiers
* src/image.c: Rename x_* procedures to image_*.
* src/frame.c: Rename x_* procedures to gui_*. Rename
xrdb_get_resource to gui_display_get_resource. Rename x_get_arg to
gui_display_get arg.
* src/frame.h: Rename can_x_set_window_size to can_set_window_size.
* src/xfaces.c: Rename realize_x_face to realize_gui_face. Rename
x_supports_face_attributes_p to gui_supports_face_attributes_p.
* src/keyboard.c:
* src/lisp.h:
* src/nsterm.m:
* src/w32term.c:
* src/xterm.c: Rename x_get_keysym_name to get_keysym_name.
* src/nsfns.c:
* src/nsterm.m: Rename x_* procedures to ns_*.
* src/w32fns.c:
* src/w32term.c: Rename x_* procedures to w32_*.
* src/termhooks.h (query_colors, get_focus_frame, focus_frame_hook)
(frame_visible_invisible_hook, iconify_frame_hook)
(set_window_size_hook, set_frame_offset_hook, set_frame_alpha_hook)
(set_new_font_hook, set_bitmap_icon_hook, implicit_set_name_hook)
(activate_menubar_hook, change_tool_bar_height_hook)
(set_scroll_bar_default_width_hook)
(set_scroll_bar_default_height_hook, get_string_resource_hook): New
terminal hooks to replace backend-specific x_* procedures.
* src/dispextern.h (clear_under_internal_border): New RIF procedure.
* src/alloc.c:
* src/frame.c:
* src/xdisp.c: Use FRAME_OUTPUT_DATA instead of FRAME_X_OUTPUT.
* src/frame.c:
* src/w32term.c:
* src/w32fns.c: Use FRAME_NATIVE_WINDOW instead of FRAME_X_WINDOW.
Diffstat (limited to 'src/window.c')
-rw-r--r-- | src/window.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/window.c b/src/window.c index 05340ea439f..30ffad0e513 100644 --- a/src/window.c +++ b/src/window.c @@ -3434,7 +3434,7 @@ run_window_configuration_change_hook (struct frame *f) XSETFRAME (frame, f); if (NILP (Vrun_hooks) - || !f->can_x_set_window_size + || !f->can_set_window_size || !f->after_make_frame) return; @@ -3763,7 +3763,7 @@ run_window_change_functions (void) ptrdiff_t number_of_windows; if (!FRAME_LIVE_P (f) - || !f->can_x_set_window_size + || !f->can_set_window_size || !f->after_make_frame || FRAME_TOOLTIP_P (f) || !(frame_window_change @@ -4683,7 +4683,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise) int unit = horflag ? FRAME_COLUMN_WIDTH (f) : FRAME_LINE_HEIGHT (f); /* Don't let the size drop below one unit. This is more comforting - when we are called from x_set_tool_bar_lines since the latter may + when we are called from *_set_tool_bar_lines since the latter may have implicitly given us a zero or negative height. */ if (pixelwise) { @@ -6867,8 +6867,8 @@ the return value is nil. Otherwise the value is t. */) call1 (Qrecord_window_buffer, window); } - /* Disallow x_set_window_size, temporarily. */ - f->can_x_set_window_size = false; + /* Disallow set_window_size_hook, temporarily. */ + f->can_set_window_size = false; /* The mouse highlighting code could get screwed up if it runs during this. */ block_input (); @@ -7072,9 +7072,9 @@ the return value is nil. Otherwise the value is t. */) if (NILP (leaf_windows[i]->contents)) free_window_matrices (leaf_windows[i]); - /* Allow x_set_window_size again and apply frame size changes if - needed. */ - f->can_x_set_window_size = true; + /* Allow set_window_size_hook again and apply frame size changes + if needed. */ + f->can_set_window_size = true; adjust_frame_size (f, -1, -1, 1, false, Qset_window_configuration); adjust_frame_glyphs (f); |