Mercurial > emacs
comparison src/xterm.h @ 105693:964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
* xterm.h (x_wait_for_event): Declare it.
* xterm.c (pending_event_wait): New variable.
(handle_one_xevent): Set pending_event_wait.eventtype to 0 if we
see pending_event_wait.eventtype.
(handle_one_xevent): Don't change gravity when parent changes.
(x_new_font): Call change_frame_size with new rows/columns before we try
to resize the frame.
(x_wait_for_event): New function.
(x_set_window_size_1): Don't change gravity unless change_gravity is set.
Call XResizeWindow with FRAME_OUTER_WINDOW. If we are visible,
don't change frame size, instead wait for the ConfigureNotify.
(x_set_window_size): Call x_set_window_size_1 for USE_X_TOOLKIT also.
(x_wm_set_size_hint): Remove ifdefs for USE_X_TOOLKIT.
(x_initialize): Initialize pending_event_wait.
* xmenu.c (set_frame_menubar): Add internal border width to menu bar
size.
* widget.c (EmacsFrameSetValues): Add comment.
(EmacsFrameSetCharSize): Just call x_set_window_size.
* gtkutil.c (xg_frame_set_char_size): Flush events and call
x_wait_for_event.
(flush_and_sync): Removed again.
(xg_get_font_name): Suggest monospace if no previous font is known.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Wed, 21 Oct 2009 18:29:46 +0000 |
parents | 34f58690ff98 |
children | cd4cbab8bb21 |
comparison
equal
deleted
inserted
replaced
105692:15b4b661ceb1 | 105693:964ff7cbc8a6 |
---|---|
971 unsigned)); | 971 unsigned)); |
972 extern int x_display_pixel_height P_ ((struct x_display_info *)); | 972 extern int x_display_pixel_height P_ ((struct x_display_info *)); |
973 extern int x_display_pixel_width P_ ((struct x_display_info *)); | 973 extern int x_display_pixel_width P_ ((struct x_display_info *)); |
974 | 974 |
975 extern void x_set_sticky P_ ((struct frame *, Lisp_Object, Lisp_Object)); | 975 extern void x_set_sticky P_ ((struct frame *, Lisp_Object, Lisp_Object)); |
976 extern void x_wait_for_event P_ ((struct frame *, int)); | |
976 | 977 |
977 /* Defined in xselect.c */ | 978 /* Defined in xselect.c */ |
978 | 979 |
979 extern void x_handle_property_notify P_ ((XPropertyEvent *)); | 980 extern void x_handle_property_notify P_ ((XPropertyEvent *)); |
980 extern void x_handle_selection_notify P_ ((XSelectionEvent *)); | 981 extern void x_handle_selection_notify P_ ((XSelectionEvent *)); |