diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2009-07-01 14:02:27 +0000 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2009-07-01 14:02:27 +0000 |
commit | 3f1c666608f7ca4aeacbcbe5102c2c2c63e345e9 (patch) | |
tree | 3249bf002f7557d4bd697d94f61e61042f0aad1f /src/frame.h | |
parent | 62aadce704ec87289bf7a666ad29ccc33e19f07d (diff) | |
download | emacs-3f1c666608f7ca4aeacbcbe5102c2c2c63e345e9.tar.gz |
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
* frame.c: Qmaximized is new.
(x_set_frame_parameters): Do not handle fullscreen specially.
Only set width and height if explicitly set.
(x_set_fullscreen): Handle Qmaximized.
(x_set_font, x_figure_window_size): Do not handle fullscreen specially.
(syms_of_frame): Initialize Qmaximized.
* frame.h (fullscreen_type): Add FULLSCREEN_MAXIMIZED. Declare
Qfullwidth, Qfullheight, Qfullboth, Qmaximized.
* xterm.c (handle_one_xevent): Remove call to x_check_fullscreen
for Expose event. Add call to x_check_fullscreen for MapNotify event.
Remove all code w.r.t. fullscreen from ConfigureNotify event. Do not
set gravity to NorthWestGravity when USE_GTK.
(set_wm_state): New function.
(do_ewmh_fullscreen): Use set_wm_state. Also handle FULLSCREEN_MAXIMIZED.
(x_handle_net_wm_state): Handle FULLSCREEN_MAXIMIZED.
(x_check_fullscreen): Simplify so we only handle EMWH type of fullscreen
or the case when no window manager is running. That means remove calls
to x_real_positions and x_fullscreen_adjust.
* gtkutil.c (flush_and_sync, x_wm_size_hint_off): Remove.
(xg_frame_set_char_size): Remove calls to x_wm_size_hint_off and
flush_and_sync.
(xg_height_changed): New function.
(xg_create_frame_widgets): Remove call to gtk_widget_set_size_request
and gtk_window_set_policy. Set frame gravity after parsing the geometry
string.
(xg_update_frame_menubar, free_frame_menubar)
(xg_tool_bar_detach_callback, xg_tool_bar_attach_callback)
(update_frame_tool_bar, free_frame_tool_bar): Call xg_height_changed.
Remove calls to xg_frame_set_char_size.
* startup.el (command-line-x-option-alist): Add -mm and --maximized.
* NEWS: Mention maximized.
* frames.texi (Size Parameters): Mention maximized for fullscreen.
* xresources.texi (Table of Resources): Mention maximized for
fullscreen.
* cmdargs.texi (Window Size X): -mm/--maximized is new.
Diffstat (limited to 'src/frame.h')
-rw-r--r-- | src/frame.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/frame.h b/src/frame.h index 9193da3edf3..808859e6612 100644 --- a/src/frame.h +++ b/src/frame.h @@ -75,12 +75,12 @@ enum text_cursor_kinds enum fullscreen_type { - /* Values used as a bit mask, BOTH == WIDTH | HEIGHT. */ - FULLSCREEN_NONE = 0, - FULLSCREEN_WIDTH = 1, - FULLSCREEN_HEIGHT = 2, - FULLSCREEN_BOTH = 3, - FULLSCREEN_WAIT = 4 + FULLSCREEN_NONE, + FULLSCREEN_WIDTH = 0x001, + FULLSCREEN_HEIGHT = 0x002, + FULLSCREEN_BOTH = 0x003, + FULLSCREEN_MAXIMIZED = 0x013, + FULLSCREEN_WAIT = 0x100 }; @@ -1038,6 +1038,7 @@ extern Lisp_Object Qscreen_gamma; extern Lisp_Object Qline_spacing; extern Lisp_Object Qwait_for_wm; extern Lisp_Object Qfullscreen; +extern Lisp_Object Qfullwidth, Qfullheight, Qfullboth, Qmaximized; extern Lisp_Object Qfont_backend; extern Lisp_Object Qalpha; |