emacs: src/xterm.c comparison

comparison src/xterm.c @ 103665:340c701162a6

* 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.

author	Jan Djärv <jan.h.d@swipnet.se>
date	Wed, 01 Jul 2009 14:02:27 +0000
parents	64011e3b89f5
children	1867be80e595

comparison

equal deleted inserted replaced

-:fa336161482c
+:340c701162a6
 case Expose:
 f = x_window_to_frame (dpyinfo, event.xexpose.window);
 if (f)
 {
-x_check_fullscreen (f);
 #ifdef USE_GTK
 /* This seems to be needed for GTK 2.6.  */
 x_clear_area (event.xexpose.display,
 event.xexpose.window,
 event.xexpose.x, event.xexpose.y,
 && ! NILP (XCDR (Vframe_list)))
 /* Force a redisplay sooner or later
 to update the frame titles
 in case this is the second frame.  */
 record_asynch_buffer_change ();
+/* Check if fullscreen was specified before we where mapped. */
+x_check_fullscreen (f);
 }
 goto OTHER;
 case KeyPress:
 #endif
 if (f)
 {
 #ifndef USE_X_TOOLKIT
 #ifndef USE_GTK
-/* If there is a pending resize for fullscreen, don't
-do this one, the right one will come later.
-The toolkit version doesn't seem to need this, but we
-need to reset it below.  */
-int dont_resize
-	    = ((f->want_fullscreen & FULLSCREEN_WAIT)
-	       && f->new_text_cols != 0);
 int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, event.xconfigure.height);
 int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, event.xconfigure.width);
-if (dont_resize)
-goto OTHER;
 /* In the toolkit version, change_frame_size
 is called by the code that handles resizing
 of the EmacsFrame widget.  */
 if (FRAME_GTK_OUTER_WIDGET (f)
 && GTK_WIDGET_MAPPED (FRAME_GTK_OUTER_WIDGET (f)))
 #endif
 {
 	      x_real_positions (f, &f->left_pos, &f->top_pos);
-	      if (f->want_fullscreen & FULLSCREEN_WAIT)
-		f->want_fullscreen &= ~(FULLSCREEN_WAIT|FULLSCREEN_BOTH);
 }
 #ifdef HAVE_X_I18N
 if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea))
 xic_set_statusarea (f);
 #endif
+#ifndef USE_GTK
 if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
 {
 /* Since the WM decorations come below top_pos now,
 we must put them below top_pos in the future.  */
 f->win_gravity = NorthWestGravity;
 x_wm_set_size_hint (f, (long) 0, 0);
 }
+#endif
 }
 goto OTHER;
 case ButtonRelease:
 case ButtonPress:
 UNBLOCK_INPUT;
 return rc;
 }
+static void
+set_wm_state (frame, add, what, what2)
+Lisp_Object frame;
+int add;
+const char *what;
+const char *what2;
+{
+const char *atom = "_NET_WM_STATE";
+Fx_send_client_event (frame, make_number (0), frame,
+make_unibyte_string (atom, strlen (atom)),
+make_number (32),
+/* 1 = add, 0 = remove */
+Fcons
+(make_number (add ? 1 : 0),
+Fcons
+(make_unibyte_string (what, strlen (what)),
+what2 != 0
+? Fcons (make_unibyte_string (what2, strlen (what2)),
+Qnil)
+: Qnil)));
+}
 /* Do fullscreen as specified in extended window manager hints */
 static int
 do_ewmh_fullscreen (f)
 struct frame *f;
 have_net_atom = wm_supports (f, "_NET_WM_STATE_FULLSCREEN");
 if (have_net_atom)
 {
 Lisp_Object frame;
-const char *atom = "_NET_WM_STATE";
 const char *fs = "_NET_WM_STATE_FULLSCREEN";
 const char *fw = "_NET_WM_STATE_MAXIMIZED_HORZ";
 const char *fh = "_NET_WM_STATE_MAXIMIZED_VERT";
-const char *what = NULL;
 XSETFRAME (frame, f);
+set_wm_state (frame, 0, fs, NULL);
+set_wm_state (frame, 0, fh, NULL);
+set_wm_state (frame, 0, fw, NULL);
 /* If there are _NET_ atoms we assume we have extended window manager
 hints.  */
 switch (f->want_fullscreen)
 {
 case FULLSCREEN_BOTH:
-what = fs;
+set_wm_state (frame, 1, fs, NULL);
 break;
 case FULLSCREEN_WIDTH:
-what = fw;
+set_wm_state (frame, 1, fw, NULL);
 break;
 case FULLSCREEN_HEIGHT:
-what = fh;
+set_wm_state (frame, 1, fh, NULL);
+break;
+case FULLSCREEN_MAXIMIZED:
+set_wm_state (frame, 1, fw, fh);
 break;
 }
-if (what != NULL && !wm_supports (f, what)) return 0;
-Fx_send_client_event (frame, make_number (0), frame,
-make_unibyte_string (atom, strlen (atom)),
-make_number (32),
-Fcons (make_number (0), /* Remove */
-Fcons
-(make_unibyte_string (fs,
-strlen (fs)),
-Qnil)));
-Fx_send_client_event (frame, make_number (0), frame,
-make_unibyte_string (atom, strlen (atom)),
-make_number (32),
-Fcons (make_number (0), /* Remove */
-Fcons
-(make_unibyte_string (fh,
-strlen (fh)),
-Qnil)));
-Fx_send_client_event (frame, make_number (0), frame,
-make_unibyte_string (atom, strlen (atom)),
-make_number (32),
-Fcons (make_number (0), /* Remove */
-Fcons
-(make_unibyte_string (fw,
-strlen (fw)),
-Qnil)));
 f->want_fullscreen = FULLSCREEN_NONE;
-if (what != NULL)
-Fx_send_client_event (frame, make_number (0), frame,
-make_unibyte_string (atom, strlen (atom)),
-make_number (32),
-Fcons (make_number (1), /* Add */
-Fcons
-(make_unibyte_string (what,
-strlen (what)),
-Qnil)));
 }
 return have_net_atom;
 }
 FRAME_PTR f;
 {
 if (f->async_visible)
 {
 BLOCK_INPUT;
-do_ewmh_fullscreen (f);
+x_check_fullscreen (f);
 x_sync (f);
 UNBLOCK_INPUT;
 }
 }
-extern Lisp_Object Qfullwidth, Qfullheight, Qfullboth;
 static void
 x_handle_net_wm_state (f, event)
 struct frame *f;
 XPropertyEvent *event;
 {
 Atom actual_type;
 unsigned long actual_size, bytes_remaining;
-int i, rc, actual_format, value = 0;
+int i, rc, actual_format, value = FULLSCREEN_NONE;
 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 long max_len = 65536;
 Display *dpy = FRAME_X_DISPLAY (f);
 unsigned char *tmp_data = NULL;
 Atom target_type = XA_ATOM;
 x_uncatch_errors ();
 for (i = 0; i < actual_size; ++i)
 {
 Atom a = ((Atom*)tmp_data)[i];
 if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
-value |= FULLSCREEN_WIDTH;
+{
+if (value == FULLSCREEN_HEIGHT)
+value = FULLSCREEN_MAXIMIZED;
+else
+value = FULLSCREEN_WIDTH;
+}
 else if (a == dpyinfo->Xatom_net_wm_state_maximized_vert)
-value |= FULLSCREEN_HEIGHT;
+{
+if (value == FULLSCREEN_WIDTH)
+value = FULLSCREEN_MAXIMIZED;
+else
+value = FULLSCREEN_HEIGHT;
+}
 else if (a == dpyinfo->Xatom_net_wm_state_fullscreen_atom)
-value |= FULLSCREEN_BOTH;
+value = FULLSCREEN_BOTH;
 }
 lval = Qnil;
 switch (value)
 {
 lval = Qfullheight;
 break;
 case FULLSCREEN_BOTH:
 lval = Qfullboth;
 break;
+case FULLSCREEN_MAXIMIZED:
+lval = Qmaximized;
+break;
 }
 store_frame_param (f, Qfullscreen, lval);
 if (tmp_data) XFree (tmp_data);
 If so needed, resize the frame. */
 static void
 x_check_fullscreen (f)
 struct frame *f;
 {
-if (f->want_fullscreen & FULLSCREEN_BOTH)
+if (do_ewmh_fullscreen (f))
-{
+return;
-int width, height, ign;
+if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
-if (do_ewmh_fullscreen (f))
+return; // Only fullscreen without WM or with EWM hints (above).
-return;
+if (f->want_fullscreen != FULLSCREEN_NONE)
-x_real_positions (f, &f->left_pos, &f->top_pos);
+{
+int width = FRAME_COLS (f), height = FRAME_LINES (f);
-x_fullscreen_adjust (f, &width, &height, &ign, &ign);
+struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
-/* We do not need to move the window, it shall be taken care of
+switch (f->want_fullscreen)
-when setting WM manager hints.
+{
-If the frame is visible already, the position is checked by
+/* No difference between these two when there is no WM */
-x_check_expected_move. */
+case FULLSCREEN_BOTH:
+case FULLSCREEN_MAXIMIZED:
+width = x_display_pixel_width (dpyinfo);
+height = x_display_pixel_height (dpyinfo);
+break;
+case FULLSCREEN_WIDTH:
+width = x_display_pixel_width (dpyinfo);
+break;
+case FULLSCREEN_HEIGHT:
+height = x_display_pixel_height (dpyinfo);
+}
 if (FRAME_COLS (f) != width || FRAME_LINES (f) != height)
 {
 change_frame_size (f, height, width, 0, 1, 0);
 SET_FRAME_GARBAGED (f);
 cancel_mouse_face (f);
-/* Wait for the change of frame size to occur */
-f->want_fullscreen |= FULLSCREEN_WAIT;
 }
 }
 }
 /* This function is called by x_set_offset to determine whether the window
 window manager window around the frame.  */
 x_real_positions (f, &current_left, &current_top);
 if (current_left != expected_left || current_top != expected_top)
 {
 /* It's a "Type A" window manager. */
 int adjusted_left;
 int adjusted_top;
 XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
 adjusted_left, adjusted_top);
 x_sync_with_move (f, expected_left, expected_top, 0);
 }
 else
 /* It's a "Type B" window manager.  We don't have to adjust the
 frame's position. */
 FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_B;

Mercurial > emacs

comparison src/xterm.c @ 103665:340c701162a6