isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix move/resize events in relation to combinations of ConfigureRequest and

Browse Source 
2007-04-08  Elijah Newren  <newren gmail com>

	Fix move/resize events in relation to combinations of
	ConfigureRequest and WM_NORMAL_HINTS change notifications (plus a
	few code cleanups).  Fixes #426519.

	* src/window.c (meta_window_move_resize_now):
	move to the user_rect position, not some weird combination of rect
	and user_rect

	* src/window.c (meta_window_configure_request):
        set user_rect in response to ConfigureRequest events (after the
	ConfigureRequest values have been constrained) and add a big
	comment explaining this change, remove unused only_resize variable
	and irrelevant huge FIXME comment about it

	* src/window.[ch] (meta_window_get_client_root_coords):
	new function

	* src/display.c (meta_display_begin_grab_op):
	* src/keybindings.c (process_keyboard_move_grab):
	* src/window.c (meta_window_unmaximize,
	  meta_window_move_resize_internal, meta_window_begin_wireframe,
	  update_move, meta_window_refresh_resize_popup,
	  warp_grab_pointer)
	combine multi-step client rect root coord setting into a single
	function call to meta_window_get_client_root_coords()

svn path=/trunk/; revision=3181
This commit is contained in:
Elijah Newren 2007-04-09 03:43:55 +00:00 committed by Elijah Newren
parent 82c56cb5d7
commit addf369006
5 changed files with 103 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
2007-04-08 Elijah Newren <newren gmail com>
Fix move/resize events in relation to combinations of
ConfigureRequest and WM_NORMAL_HINTS change notifications (plus a
few code cleanups). Fixes #426519.
* src/window.c (meta_window_move_resize_now):
move to the user_rect position, not some weird combination of rect
and user_rect
* src/window.c (meta_window_configure_request):
set user_rect in response to ConfigureRequest events (after the
ConfigureRequest values have been constrained) and add a big
comment explaining this change, remove unused only_resize variable
and irrelevant huge FIXME comment about it
* src/window.[ch] (meta_window_get_client_root_coords):
new function
* src/display.c (meta_display_begin_grab_op):
* src/keybindings.c (process_keyboard_move_grab):
* src/window.c (meta_window_unmaximize,
meta_window_move_resize_internal, meta_window_begin_wireframe,
update_move, meta_window_refresh_resize_popup,
warp_grab_pointer)
combine multi-step client rect root coord setting into a single
function call to meta_window_get_client_root_coords()
2007-04-08 Thomas Thurman <thomas@thurman.org.uk> 2007-04-08 Thomas Thurman <thomas@thurman.org.uk>
* ChangeLog: removed conflict line. * ChangeLog: removed conflict line.

6
src/display.c
View File

@ -3432,10 +3432,8 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (display->grab_window) if (display->grab_window)
{ {
display->grab_initial_window_pos = display->grab_window->rect; meta_window_get_client_root_coords (display->grab_window,
meta_window_get_position (display->grab_window, &display->grab_initial_window_pos);
&display->grab_initial_window_pos.x,
&display->grab_initial_window_pos.y);
display->grab_anchor_window_pos = display->grab_initial_window_pos; display->grab_anchor_window_pos = display->grab_initial_window_pos;
display->grab_wireframe_active = display->grab_wireframe_active =

5
src/keybindings.c
View File

@ -1957,10 +1957,7 @@ process_keyboard_move_grab (MetaDisplay *display,
if (display->grab_wireframe_active) if (display->grab_wireframe_active)
old_rect = display->grab_wireframe_rect; old_rect = display->grab_wireframe_rect;
else else
{ meta_window_get_client_root_coords (window, &old_rect);
old_rect = window->rect;
meta_window_get_position (window, &old_rect.x, &old_rect.y);
}
meta_window_edge_resistance_for_move (window, meta_window_edge_resistance_for_move (window,
old_rect.x, old_rect.x,

135
src/window.c
View File

@ -2444,8 +2444,7 @@ meta_window_unmaximize (MetaWindow *window,
/* Unmaximize to the saved_rect position in the direction(s) /* Unmaximize to the saved_rect position in the direction(s)
* being unmaximized. * being unmaximized.
*/ */
target_rect = window->rect; meta_window_get_client_root_coords (window, &target_rect);
meta_window_get_position (window, &target_rect.x, &target_rect.y);
if (unmaximize_horizontally) if (unmaximize_horizontally)
{ {
target_rect.x = window->saved_rect.x; target_rect.x = window->saved_rect.x;
@ -3019,8 +3018,7 @@ meta_window_move_resize_internal (MetaWindow *window,
/* We don't need it in the idle queue anymore. */ /* We don't need it in the idle queue anymore. */
meta_window_unqueue_move_resize (window); meta_window_unqueue_move_resize (window);
old_rect = window->rect; meta_window_get_client_root_coords (window, &old_rect);
meta_window_get_position (window, &old_rect.x, &old_rect.y);
meta_topic (META_DEBUG_GEOMETRY, meta_topic (META_DEBUG_GEOMETRY,
"Move/resize %s to %d,%d %dx%d%s%s from %d,%d %dx%d\n", "Move/resize %s to %d,%d %dx%d%s%s from %d,%d %dx%d\n",
@ -3480,22 +3478,15 @@ meta_window_resize_with_gravity (MetaWindow *window,
static void static void
meta_window_move_resize_now (MetaWindow *window) meta_window_move_resize_now (MetaWindow *window)
{ {
int x, y; /* If constraints have changed then we want to snap back to wherever
* the user had the window. We use user_rect for this reason. See
/* If constraints have changed then we'll snap back to wherever * also bug 426519 comment 3.
* the user had the window
*/ */
meta_window_get_user_position (window, &x, &y); meta_window_move_resize (window, FALSE,
window->user_rect.x,
/* This used to use the user width/height if the user hadn't resized, window->user_rect.y,
* but it turns out that breaks things pretty often, because configure window->user_rect.width,
* requests from the app or size hints changes from the app frequently window->user_rect.height);
* reflect user actions such as changing terminal font size
* or expanding a disclosure triangle.
*/
meta_window_move_resize (window, FALSE, x, y,
window->rect.width,
window->rect.height);
} }
static guint move_resize_idle = 0; static guint move_resize_idle = 0;
@ -3613,6 +3604,15 @@ meta_window_get_position (MetaWindow *window,
} }
} }
void
meta_window_get_client_root_coords (MetaWindow *window,
MetaRectangle *rect)
{
meta_window_get_position (window, &rect->x, &rect->y);
rect->width = window->rect.width;
rect->height = window->rect.height;
}
void void
meta_window_get_user_position (MetaWindow *window, meta_window_get_user_position (MetaWindow *window,
int *x, int *x,
@ -3799,10 +3799,8 @@ meta_window_begin_wireframe (MetaWindow *window)
MetaRectangle new_xor; MetaRectangle new_xor;
int display_width, display_height; int display_width, display_height;
window->display->grab_wireframe_rect = window->rect; meta_window_get_client_root_coords (window,
meta_window_get_position (window, &window->display->grab_wireframe_rect);
&window->display->grab_wireframe_rect.x,
&window->display->grab_wireframe_rect.y);
meta_window_get_xor_rect (window, &window->display->grab_wireframe_rect, meta_window_get_xor_rect (window, &window->display->grab_wireframe_rect,
&new_xor); &new_xor);
@ -4332,7 +4330,6 @@ meta_window_configure_request (MetaWindow *window,
XEvent *event) XEvent *event)
{ {
int x, y, width, height; int x, y, width, height;
gboolean only_resize;
gboolean allow_position_change; gboolean allow_position_change;
gboolean in_grab_op; gboolean in_grab_op;
MetaMoveResizeFlags flags; MetaMoveResizeFlags flags;
@ -4378,8 +4375,6 @@ meta_window_configure_request (MetaWindow *window,
meta_window_get_gravity_position (window, &x, &y); meta_window_get_gravity_position (window, &x, &y);
only_resize = TRUE;
allow_position_change = FALSE; allow_position_change = FALSE;
if (meta_prefs_get_disable_workarounds ()) if (meta_prefs_get_disable_workarounds ())
@ -4414,8 +4409,6 @@ meta_window_configure_request (MetaWindow *window,
if (event->xconfigurerequest.value_mask & (CWX | CWY)) if (event->xconfigurerequest.value_mask & (CWX | CWY))
{ {
only_resize = FALSE;
/* Once manually positioned, windows shouldn't be placed /* Once manually positioned, windows shouldn't be placed
* by the window manager. * by the window manager.
*/ */
@ -4463,18 +4456,19 @@ meta_window_configure_request (MetaWindow *window,
window->size_hints.width = width; window->size_hints.width = width;
window->size_hints.height = height; window->size_hints.height = height;
/* FIXME passing the gravity on only_resize thing is kind of crack-rock. /* NOTE: We consider ConfigureRequests to be "user" actions in one
* Basically I now have several ways of handling gravity, and things * way, but not in another. Explanation of the two cases are in the
* don't make too much sense. I think I am doing the math in a couple * next two big comments.
* places and could do it in only one function, and remove some of the
* move_resize_internal arguments.
*
* UPDATE (2005-09-17): See the huge comment at the beginning of
* meta_window_move_resize_internal() which explains why the current
* setup requires the only_resize thing. Yeah, it'd be much better to
* have a different setup for meta_window_move_resize_internal()...
*/ */
/* The constraints code allows user actions to move windows
* offscreen, etc., and configure request actions would often send
* windows offscreen when users don't want it if not constrained
* (e.g. hitting a dropdown triangle in a fileselector to show more
* options, which makes the window bigger). Thus we do not set
* META_IS_USER_ACTION in flags to the
* meta_window_move_resize_internal() call.
*/
flags = META_IS_CONFIGURE_REQUEST; flags = META_IS_CONFIGURE_REQUEST;
if (event->xconfigurerequest.value_mask & (CWX | CWY)) if (event->xconfigurerequest.value_mask & (CWX | CWY))
flags |= META_IS_MOVE_ACTION; flags |= META_IS_MOVE_ACTION;
@ -4490,6 +4484,18 @@ meta_window_configure_request (MetaWindow *window,
window->size_hints.width, window->size_hints.width,
window->size_hints.height); window->size_hints.height);
/* window->user_rect exists to allow "snapping-back" the window if a
* new strut is set (causing the window to move) and then the strut
* is later removed without the user moving the window in the
* interim. We'd like to "snap-back" to the position specified by
* ConfigureRequest events (at least the constrained version of the
* ConfigureRequest, since that is guaranteed to be onscreen) so we
* set user_rect here.
*
* See also bug 426519.
*/
meta_window_get_client_root_coords (window, &window->user_rect);
/* Handle stacking. We only handle raises/lowers, mostly because /* Handle stacking. We only handle raises/lowers, mostly because
* stack.c really can't deal with anything else. I guess we'll fix * stack.c really can't deal with anything else. I guess we'll fix
* that if a client turns up that really requires it. Only a very * that if a client turns up that really requires it. Only a very
@ -6856,10 +6862,7 @@ update_move (MetaWindow *window,
if (display->grab_wireframe_active) if (display->grab_wireframe_active)
old = display->grab_wireframe_rect; old = display->grab_wireframe_rect;
else else
{ meta_window_get_client_root_coords (window, &old);
old = window->rect;
meta_window_get_position (window, &old.x, &old.y);
}
/* Don't allow movement in the maximized directions */ /* Don't allow movement in the maximized directions */
if (window->maximized_horizontally) if (window->maximized_horizontally)
@ -7505,15 +7508,9 @@ meta_window_refresh_resize_popup (MetaWindow *window)
MetaRectangle rect; MetaRectangle rect;
if (window->display->grab_wireframe_active) if (window->display->grab_wireframe_active)
{ rect = window->display->grab_wireframe_rect;
rect = window->display->grab_wireframe_rect;
}
else else
{ meta_window_get_client_root_coords (window, &rect);
meta_window_get_position (window, &rect.x, &rect.y);
rect.width = window->rect.width;
rect.height = window->rect.height;
}
meta_ui_resize_popup_set (window->display->grab_resize_popup, meta_ui_resize_popup_set (window->display->grab_resize_popup,
rect, rect,
@ -7646,16 +7643,17 @@ warp_grab_pointer (MetaWindow *window,
int *x, int *x,
int *y) int *y)
{ {
MetaRectangle rect; MetaRectangle rect;
MetaDisplay *display;
display = window->display;
/* We may not have done begin_grab_op yet, i.e. may not be in a grab /* We may not have done begin_grab_op yet, i.e. may not be in a grab
*/ */
if (window == window->display->grab_window && if (window == display->grab_window && display->grab_wireframe_active)
window->display->grab_wireframe_active)
{ {
meta_window_get_xor_rect (window, &window->display->grab_wireframe_rect, meta_window_get_xor_rect (window, &display->grab_wireframe_rect, &rect);
&rect);
} }
else else
{ {
@ -7721,7 +7719,7 @@ warp_grab_pointer (MetaWindow *window,
*x = CLAMP (*x, 0, window->screen->rect.width-1); *x = CLAMP (*x, 0, window->screen->rect.width-1);
*y = CLAMP (*y, 0, window->screen->rect.height-1); *y = CLAMP (*y, 0, window->screen->rect.height-1);
meta_error_trap_push_with_return (window->display); meta_error_trap_push_with_return (display);
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Warping pointer to %d,%d with window at %d,%d\n", "Warping pointer to %d,%d with window at %d,%d\n",
@ -7731,28 +7729,23 @@ warp_grab_pointer (MetaWindow *window,
* events generated by the XWarpPointer() call below don't cause complete * events generated by the XWarpPointer() call below don't cause complete
* funkiness. See bug 124582 and bug 122670. * funkiness. See bug 124582 and bug 122670.
*/ */
window->display->grab_anchor_root_x = *x; display->grab_anchor_root_x = *x;
window->display->grab_anchor_root_y = *y; display->grab_anchor_root_y = *y;
window->display->grab_latest_motion_x = *x; display->grab_latest_motion_x = *x;
window->display->grab_latest_motion_y = *y; display->grab_latest_motion_y = *y;
if (window->display->grab_wireframe_active) if (display->grab_wireframe_active)
window->display->grab_anchor_window_pos = display->grab_anchor_window_pos = display->grab_wireframe_rect;
window->display->grab_wireframe_rect;
else else
{ meta_window_get_client_root_coords (window,
window->display->grab_anchor_window_pos = window->rect; &display->grab_anchor_window_pos);
meta_window_get_position (window,
&window->display->grab_anchor_window_pos.x,
&window->display->grab_anchor_window_pos.y);
}
XWarpPointer (window->display->xdisplay, XWarpPointer (display->xdisplay,
None, None,
window->screen->xroot, window->screen->xroot,
0, 0, 0, 0, 0, 0, 0, 0,
*x, *y); *x, *y);
if (meta_error_trap_pop_with_return (window->display, FALSE) != Success) if (meta_error_trap_pop_with_return (display, FALSE) != Success)
{ {
meta_verbose ("Failed to warp pointer for window %s\n", meta_verbose ("Failed to warp pointer for window %s\n",
window->desc); window->desc);

7
src/window.h
View File

@ -457,6 +457,13 @@ void meta_window_get_position (MetaWindow *window,
void meta_window_get_user_position (MetaWindow *window, void meta_window_get_user_position (MetaWindow *window,
int *x, int *x,
int *y); int *y);
/* Gets root coords for x, y, width & height of client window; uses
* meta_window_get_position for x & y.
*/
void meta_window_get_client_root_coords (MetaWindow *window,
MetaRectangle *rect);
/* gets position we need to set to stay in current position, /* gets position we need to set to stay in current position,
* assuming position will be gravity-compensated. i.e. * assuming position will be gravity-compensated. i.e.
* this is the position a client would send in a configure * this is the position a client would send in a configure