From 4a662e848aaa1a4328307bde970a77ee9583eabe Mon Sep 17 00:00:00 2001 From: Alexander Gramiak Date: Sun, 14 Apr 2019 09:43:02 -0600 Subject: Revert Qx_* -> Qgui_* symbol change --- src/frame.c | 14 +++++++------- src/nsfns.m | 4 ++-- src/nsterm.m | 2 +- src/w32fns.c | 4 ++-- src/w32term.c | 2 +- src/xfns.c | 4 ++-- src/xterm.c | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/frame.c b/src/frame.c index 72d2e63cb8e..9837cc34221 100644 --- a/src/frame.c +++ b/src/frame.c @@ -4168,7 +4168,7 @@ gui_set_frame_parameters (struct frame *f, Lisp_Object alist) Lisp_Object old_value = get_frame_param (f, Qfullscreen); frame_size_history_add - (f, Qgui_set_fullscreen, 0, 0, list2 (old_value, fullscreen)); + (f, Qx_set_fullscreen, 0, 0, list2 (old_value, fullscreen)); store_frame_param (f, Qfullscreen, fullscreen); if (!EQ (fullscreen, old_value)) @@ -5833,15 +5833,15 @@ syms_of_frame (void) DEFSYM (QEmacsFrameResize, "EmacsFrameResize"); DEFSYM (Qset_frame_size, "set-frame-size"); DEFSYM (Qframe_inhibit_resize, "frame-inhibit-resize"); - DEFSYM (Qgui_set_fullscreen, "gui-set-fullscreen"); + DEFSYM (Qx_set_fullscreen, "x-set-fullscreen"); DEFSYM (Qx_check_fullscreen, "x-check-fullscreen"); DEFSYM (Qxg_frame_resized, "xg-frame-resized"); DEFSYM (Qxg_frame_set_char_size_1, "xg-frame-set-char-size-1"); DEFSYM (Qxg_frame_set_char_size_2, "xg-frame-set-char-size-2"); DEFSYM (Qxg_frame_set_char_size_3, "xg-frame-set-char-size-3"); - DEFSYM (Qgui_set_window_size_1, "gui-set-window-size-1"); - DEFSYM (Qgui_set_window_size_2, "gui-set-window-size-2"); - DEFSYM (Qgui_set_window_size_3, "gui-set-window-size-3"); + DEFSYM (Qx_set_window_size_1, "x-set-window-size-1"); + DEFSYM (Qx_set_window_size_2, "x-set-window-size-2"); + DEFSYM (Qx_set_window_size_3, "x-set-window-size-3"); DEFSYM (Qxg_change_toolbar_position, "xg-change-toolbar-position"); DEFSYM (Qx_net_wm_state, "x-net-wm-state"); DEFSYM (Qx_handle_net_wm_state, "x-handle-net-wm-state"); @@ -5852,8 +5852,8 @@ syms_of_frame (void) DEFSYM (Qchange_frame_size, "change-frame-size"); DEFSYM (Qxg_frame_set_char_size, "xg-frame-set-char-size"); DEFSYM (Qset_window_configuration, "set-window-configuration"); - DEFSYM (Qgui_create_frame_1, "gui-create-frame-1"); - DEFSYM (Qgui_create_frame_2, "gui-create-frame-2"); + DEFSYM (Qx_create_frame_1, "x-create-frame-1"); + DEFSYM (Qx_create_frame_2, "x-create-frame-2"); DEFSYM (Qterminal_frame, "terminal-frame"); #ifdef HAVE_NS diff --git a/src/nsfns.m b/src/nsfns.m index 09dcd86f1ce..0477e946560 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1240,7 +1240,7 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, store_frame_param (f, Qmin_height, tem); adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, 1, - Qgui_create_frame_1); + Qx_create_frame_1); tem = gui_display_get_arg (dpyinfo, parms, Qundecorated, NULL, NULL, RES_TYPE_BOOLEAN); @@ -1371,7 +1371,7 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, SET_FRAME_HEIGHT (f, x_height); adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, 1, - Qgui_create_frame_2); + Qx_create_frame_2); if (! f->output_data.ns->explicit_parent) { diff --git a/src/nsterm.m b/src/nsterm.m index c5c40962199..325a6e58161 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1884,7 +1884,7 @@ ns_set_window_size (struct frame *f, wr.origin.y += orig_height - wr.size.height; frame_size_history_add - (f, Qgui_set_window_size_1, width, height, + (f, Qx_set_window_size_1, width, height, list5 (Fcons (make_fixnum (pixelwidth), make_fixnum (pixelheight)), Fcons (make_fixnum (wr.size.width), make_fixnum (wr.size.height)), make_fixnum (f->border_width), diff --git a/src/w32fns.c b/src/w32fns.c index df37326c109..ea0f4238b32 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5941,7 +5941,7 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, store_frame_param (f, Qmin_height, tem); adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, true, - Qgui_create_frame_1); + Qx_create_frame_1); /* The X resources controlling the menu-bar and tool-bar are processed specially at startup, and reflected in the mode @@ -6035,7 +6035,7 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, unblock_input (); adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, true, - Qgui_create_frame_2); + Qx_create_frame_2); /* Process fullscreen parameter here in the hope that normalizing a fullheight/fullwidth frame will produce the size set by the last diff --git a/src/w32term.c b/src/w32term.c index 9c3791f6d15..7a622280f2d 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6507,7 +6507,7 @@ w32_set_window_size (struct frame *f, bool change_gravity, if (pixelwidth > 0 || pixelheight > 0) { frame_size_history_add - (f, Qgui_set_window_size_1, width, height, + (f, Qx_set_window_size_1, width, height, list2 (Fcons (make_fixnum (pixelwidth), make_fixnum (pixelheight)), Fcons (make_fixnum (rect.right - rect.left), diff --git a/src/xfns.c b/src/xfns.c index 1e96f577328..3d78933a42a 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3899,7 +3899,7 @@ This function is an internal primitive--use `make-frame' instead. */) store_frame_param (f, Qmin_height, tem); adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, true, - Qgui_create_frame_1); + Qx_create_frame_1); /* Set the menu-bar-lines and tool-bar-lines parameters. We don't look up the X resources controlling the menu-bar and tool-bar @@ -4022,7 +4022,7 @@ This function is an internal primitive--use `make-frame' instead. */) unblock_input (); adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), - 0, true, Qgui_create_frame_2); + 0, true, Qx_create_frame_2); /* Process fullscreen parameter here in the hope that normalizing a fullheight/fullwidth frame will produce the size set by the last diff --git a/src/xterm.c b/src/xterm.c index 3a440a34c5f..223b95959a0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11211,7 +11211,7 @@ x_set_window_size_1 (struct frame *f, bool change_gravity, if (EQ (fullscreen, Qfullwidth) && width == FRAME_TEXT_WIDTH (f)) { frame_size_history_add - (f, Qgui_set_window_size_1, width, height, + (f, Qx_set_window_size_1, width, height, list2i (old_height, pixelheight + FRAME_MENUBAR_HEIGHT (f))); XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), @@ -11220,7 +11220,7 @@ x_set_window_size_1 (struct frame *f, bool change_gravity, else if (EQ (fullscreen, Qfullheight) && height == FRAME_TEXT_HEIGHT (f)) { frame_size_history_add - (f, Qgui_set_window_size_2, width, height, + (f, Qx_set_window_size_2, width, height, list2i (old_width, pixelwidth)); XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), @@ -11230,7 +11230,7 @@ x_set_window_size_1 (struct frame *f, bool change_gravity, else { frame_size_history_add - (f, Qgui_set_window_size_3, width, height, + (f, Qx_set_window_size_3, width, height, list3i (pixelwidth + FRAME_TOOLBAR_WIDTH (f), (pixelheight + FRAME_TOOLBAR_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f)), -- cgit v1.2.1