Commit b8f89db4 authored by Elijah Newren's avatar Elijah Newren Committed by Elijah Newren
Browse files

Add support for _NET_MOVERESIZE_WINDOW. #344521.

2007-04-09  Elijah Newren  <newren gmail com>

	Add support for _NET_MOVERESIZE_WINDOW.  #344521.

	* src/display.c (handle_net_moveresize_window, event_callback):
	Remove handle_net_moveresize_window() and the call to it; this
	code was highly buggy, though to be fair it was never tested and
	had simply been put into the code in commented out form.

	* src/screen.c (set_supported_hint):
	add atom_net_moveresize_window

	* src/window.[ch]:
	(meta_window_configure_request, meta_window_move_resize_request):
	Split out the moving/resize part of the configure request and put
	it into meta_window_move_resize_request

	(meta_window_client_message):
	check for NET_MOVERESIZE_WINDOW messages and call
	meta_window_move_resize_request() with the appropriate parameters
	to handle them

	(meta_window_move_resize_internal):
	fix some of the big comment at this function -- it wasn't quite
	right, use the passed in gravity instead of
	window->size_hints.win_gravity when calling adjust_for_gravity()
	to make sure the correct adjustments are used.

	(meta_window_get_gravity_position,
	 meta_window_get_geometry, meta_window_move_resize_request):
	add a gravity parameter to meta_window_get_gravity_position and
	have it use that gravity instead of window->size_hints.win_gravity

svn path=/trunk/; revision=3186
parent 63ca4e8b
2007-04-09 Elijah Newren <newren gmail com>
Add support for _NET_MOVERESIZE_WINDOW. #344521.
* src/display.c (handle_net_moveresize_window, event_callback):
Remove handle_net_moveresize_window() and the call to it; this
code was highly buggy, though to be fair it was never tested and
had simply been put into the code in commented out form.
* src/screen.c (set_supported_hint):
add atom_net_moveresize_window
* src/window.[ch]:
(meta_window_configure_request, meta_window_move_resize_request):
Split out the moving/resize part of the configure request and put
it into meta_window_move_resize_request
(meta_window_client_message):
check for NET_MOVERESIZE_WINDOW messages and call
meta_window_move_resize_request() with the appropriate parameters
to handle them
(meta_window_move_resize_internal):
fix some of the big comment at this function -- it wasn't quite
right, use the passed in gravity instead of
window->size_hints.win_gravity when calling adjust_for_gravity()
to make sure the correct adjustments are used.
(meta_window_get_gravity_position,
meta_window_get_geometry, meta_window_move_resize_request):
add a gravity parameter to meta_window_get_gravity_position and
have it use that gravity instead of window->size_hints.win_gravity
2007-04-09 Elijah Newren <newren gmail com>
* configure.in: post-release bump to 2.19.3.
......
......@@ -1365,80 +1365,6 @@ meta_display_queue_autoraise_callback (MetaDisplay *display,
}
#if 0
static void
handle_net_moveresize_window (MetaDisplay* display,
XEvent *event)
{
MetaWindow *window;
int x, y, width, height;
gboolean only_resize;
unsigned int gravity;
unsigned int mode;
window = meta_display_lookup_x_window (display,
event->xclient.window);
/*
* FIXME: The specification seems to have serious endian issues
* here. Does bits 8-11 mean the high-order byte, or the low-order
* byte?
*/
gravity = (event->xclient.data.l[0] & ~0xff);
mode = (event->xclient.data.l[0] & ~0xff00) >> 8;
if (window)
{
/* FIXME!!!! This function is _wrong_ except for the resize-only
* case. Even then, it sucks to special case the code instead of
* factoring out common functionality with the configure reqest
* handling, especially since the EWMH says this message should be
* treated identically to a configure request with the exception of
* having a special gravity specified.
*/
meta_window_get_gravity_position (window, &x, &y);
width = window->rect.width;
height = window->rect.height;
if (mode & (CWX | CWY))
only_resize = FALSE;
else
only_resize = TRUE;
if (mode & CWX)
x = event->xclient.data.l[1];
if (mode & CWY)
y = event->xclient.data.l[2];
if (mode & CWWidth)
width = event->xclient.data.l[3];
if (mode & CWHeight)
height = event->xclient.data.l[4];
if (only_resize)
{
if (gravity)
meta_window_resize_with_gravity (window,
FALSE,
width,
height,
gravity);
else
meta_window_resize (window,
FALSE,
width,
height);
}
else
{
meta_window_move_resize (window,
FALSE,
x,
y,
width,
height);
}
}
}
static void
handle_net_restack_window (MetaDisplay* display,
XEvent *event)
......@@ -2228,9 +2154,6 @@ event_callback (XEvent *event,
else if (event->xproperty.atom ==
display->atom_net_restack_window)
handle_net_restack_window (display, event);
else if (event->xproperty.atom ==
display->atom_net_moveresize_window)
handle_net_moveresize_window (display, event);
#endif
/* we just use this property as a sentinel to avoid
......
......@@ -89,7 +89,7 @@ set_wm_check_hint (MetaScreen *screen)
static int
set_supported_hint (MetaScreen *screen)
{
#define N_SUPPORTED 59
#define N_SUPPORTED 60
Atom atoms[N_SUPPORTED];
atoms[0] = screen->display->atom_net_wm_name;
......@@ -151,8 +151,9 @@ set_supported_hint (MetaScreen *screen)
atoms[56] = screen->display->atom_net_desktop_geometry;
atoms[57] = screen->display->atom_net_desktop_viewport;
atoms[58] = screen->display->atom_net_wm_user_time_window;
//atoms[58] = screen->display->atom_net_restack_window;
//atoms[59] = screen->display->atom_net_moveresize_window;
atoms[59] = screen->display->atom_net_moveresize_window;
/* atoms[58] = screen->display->atom_net_restack_window; */
XChangeProperty (screen->display->xdisplay, screen->xroot,
screen->display->atom_net_supported,
......
......@@ -2940,34 +2940,34 @@ send_sync_request (MetaWindow *window)
#endif
static void
meta_window_move_resize_internal (MetaWindow *window,
MetaMoveResizeFlags flags,
int resize_gravity,
int root_x_nw,
int root_y_nw,
int w,
int h)
meta_window_move_resize_internal (MetaWindow *window,
MetaMoveResizeFlags flags,
int gravity,
int root_x_nw,
int root_y_nw,
int w,
int h)
{
/* meta_window_move_resize_internal gets called with very different
* meanings for root_x_nw and root_y_nw. w & h are always the area of
* the inner or client window (i.e. excluding the frame) and the
* resize_gravity is always the gravity associated with the resize or
* move_resize request (the gravity is ignored for move-only operations).
* But the location is different because of how this function gets
* called; note that in all cases what we want to find out is the upper
* left corner of the position of the inner window:
* meanings for root_x_nw and root_y_nw. w & h are always the area
* of the inner or client window (i.e. excluding the frame) and
* gravity is the relevant gravity associated with the request (note
* that gravity is ignored for move-only operations unless its
* e.g. a configure request). The location is different for
* different cases because of how this function gets called; note
* that in all cases what we want to find out is the upper left
* corner of the position of the inner window:
*
* Case | Called from (flags; resize_gravity)
* Case | Called from (flags; gravity)
* -----+-----------------------------------------------
* 1 | A resize only ConfigureRequest
* 1 | meta_window_resize
* 1 | meta_window_resize_with_gravity
* 2 | New window
* 2 | Session restore
* 2 | A not-resize-only ConfigureRequest
* 2 | A not-resize-only ConfigureRequest/net_moveresize_window request
* 3 | meta_window_move
* 3 | meta_window_move_resize
* 4 | various functions via handle_net_moveresize_window() in display.c
*
* For each of the cases, root_x_nw and root_y_nw must be treated as follows:
*
......@@ -2980,8 +2980,6 @@ meta_window_move_resize_internal (MetaWindow *window,
* know the location of the upper left corner of the inner window.
* (3) These values are already the desired positon of the NW corner
* of the inner window
* (4) The place that calls this function this way must be fixed; it is
* wrong.
*/
XWindowChanges values;
unsigned int mask;
......@@ -3045,7 +3043,7 @@ meta_window_move_resize_internal (MetaWindow *window,
{
meta_rectangle_resize_with_gravity (&old_rect,
&new_rect,
resize_gravity,
gravity,
new_rect.width,
new_rect.height);
......@@ -3061,7 +3059,7 @@ meta_window_move_resize_internal (MetaWindow *window,
* the border width existed
*/
is_configure_request,
window->size_hints.win_gravity,
gravity,
&new_rect);
meta_topic (META_DEBUG_GEOMETRY,
......@@ -3073,7 +3071,7 @@ meta_window_move_resize_internal (MetaWindow *window,
meta_window_constrain (window,
window->frame ? &fgeom : NULL,
flags,
resize_gravity,
gravity,
&old_rect,
&new_rect);
......@@ -3297,7 +3295,7 @@ meta_window_move_resize_internal (MetaWindow *window,
if (configure_frame_first && window->frame)
meta_frame_sync_to_window (window->frame,
resize_gravity,
gravity,
need_move_frame, need_resize_frame);
values.border_width = 0;
......@@ -3354,7 +3352,7 @@ meta_window_move_resize_internal (MetaWindow *window,
if (!configure_frame_first && window->frame)
meta_frame_sync_to_window (window->frame,
resize_gravity,
gravity,
need_move_frame, need_resize_frame);
/* Put gravity back to be nice to lesser window managers */
......@@ -3633,6 +3631,7 @@ meta_window_get_user_position (MetaWindow *window,
void
meta_window_get_gravity_position (MetaWindow *window,
int gravity,
int *root_x,
int *root_y)
{
......@@ -3643,7 +3642,7 @@ meta_window_get_gravity_position (MetaWindow *window,
w = window->rect.width;
h = window->rect.height;
if (window->size_hints.win_gravity == StaticGravity)
if (gravity == StaticGravity)
{
frame_extents = window->rect;
if (window->frame)
......@@ -3663,7 +3662,7 @@ meta_window_get_gravity_position (MetaWindow *window,
x = frame_extents.x;
y = frame_extents.y;
switch (window->size_hints.win_gravity)
switch (gravity)
{
case NorthGravity:
case CenterGravity:
......@@ -3686,7 +3685,7 @@ meta_window_get_gravity_position (MetaWindow *window,
break;
}
switch (window->size_hints.win_gravity)
switch (gravity)
{
case WestGravity:
case CenterGravity:
......@@ -3721,7 +3720,9 @@ meta_window_get_geometry (MetaWindow *window,
int *width,
int *height)
{
meta_window_get_gravity_position (window, x, y);
meta_window_get_gravity_position (window,
window->size_hints.win_gravity,
x, y);
*width = (window->rect.width - window->size_hints.base_width) /
window->size_hints.width_inc;
......@@ -4325,9 +4326,14 @@ meta_window_send_icccm_message (MetaWindow *window,
meta_error_trap_pop (window->display, FALSE);
}
gboolean
meta_window_configure_request (MetaWindow *window,
XEvent *event)
void
meta_window_move_resize_request (MetaWindow *window,
guint value_mask,
int gravity,
int new_x,
int new_y,
int new_width,
int new_height)
{
int x, y, width, height;
gboolean allow_position_change;
......@@ -4372,8 +4378,9 @@ meta_window_configure_request (MetaWindow *window,
* server-side position in effect when the configure request was
* generated.
*/
meta_window_get_gravity_position (window, &x, &y);
meta_window_get_gravity_position (window,
gravity,
&x, &y);
allow_position_change = FALSE;
......@@ -4401,13 +4408,11 @@ meta_window_configure_request (MetaWindow *window,
if (allow_position_change)
{
if (event->xconfigurerequest.value_mask & CWX)
x = event->xconfigurerequest.x;
if (event->xconfigurerequest.value_mask & CWY)
y = event->xconfigurerequest.y;
if (event->xconfigurerequest.value_mask & (CWX | CWY))
if (value_mask & CWX)
x = new_x;
if (value_mask & CWY)
y = new_y;
if (value_mask & (CWX | CWY))
{
/* Once manually positioned, windows shouldn't be placed
* by the window manager.
......@@ -4426,31 +4431,20 @@ meta_window_configure_request (MetaWindow *window,
width = window->rect.width;
height = window->rect.height;
if (!in_grab_op)
{
if (event->xconfigurerequest.value_mask & CWWidth)
width = event->xconfigurerequest.width;
if (value_mask & CWWidth)
width = new_width;
if (event->xconfigurerequest.value_mask & CWHeight)
height = event->xconfigurerequest.height;
if (value_mask & CWHeight)
height = new_height;
}
/* ICCCM 4.1.5 */
/* Note that x, y is the corner of the window border,
* and width, height is the size of the window inside
* its border, but that we always deny border requests
* and give windows a border of 0. But we save the
* requested border here.
*/
if (event->xconfigurerequest.value_mask & CWBorderWidth)
window->border_width = event->xconfigurerequest.border_width;
/* We're ignoring the value_mask here, since sizes
* not in the mask will be the current window geometry.
*/
window->size_hints.x = x;
window->size_hints.y = y;
window->size_hints.width = width;
......@@ -4470,19 +4464,19 @@ meta_window_configure_request (MetaWindow *window,
* meta_window_move_resize_internal() call.
*/
flags = META_IS_CONFIGURE_REQUEST;
if (event->xconfigurerequest.value_mask & (CWX | CWY))
if (value_mask & (CWX | CWY))
flags |= META_IS_MOVE_ACTION;
if (event->xconfigurerequest.value_mask & (CWWidth | CWHeight))
if (value_mask & (CWWidth | CWHeight))
flags |= META_IS_RESIZE_ACTION;
if (flags & (META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION))
meta_window_move_resize_internal (window,
flags,
window->size_hints.win_gravity,
window->size_hints.x,
window->size_hints.y,
window->size_hints.width,
window->size_hints.height);
gravity,
x,
y,
width,
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
......@@ -4495,6 +4489,28 @@ meta_window_configure_request (MetaWindow *window,
* See also bug 426519.
*/
meta_window_get_client_root_coords (window, &window->user_rect);
}
gboolean
meta_window_configure_request (MetaWindow *window,
XEvent *event)
{
/* Note that x, y is the corner of the window border,
* and width, height is the size of the window inside
* its border, but that we always deny border requests
* and give windows a border of 0. But we save the
* requested border here.
*/
if (event->xconfigurerequest.value_mask & CWBorderWidth)
window->border_width = event->xconfigurerequest.border_width;
meta_window_move_resize_request(window,
event->xconfigurerequest.value_mask,
window->size_hints.win_gravity,
event->xconfigurerequest.x,
event->xconfigurerequest.y,
event->xconfigurerequest.width,
event->xconfigurerequest.height);
/* Handle stacking. We only handle raises/lowers, mostly because
* stack.c really can't deal with anything else. I guess we'll fix
......@@ -4966,6 +4982,27 @@ meta_window_client_message (MetaWindow *window,
return TRUE;
}
else if (event->xclient.message_type ==
display->atom_net_moveresize_window)
{
int gravity, source;
guint value_mask;
gravity = (event->xclient.data.l[0] & 0xff);
value_mask = (event->xclient.data.l[0] & 0xf00) >> 8;
source = (event->xclient.data.l[0] & 0xf000) >> 12;
if (gravity == 0)
gravity = window->size_hints.win_gravity;
meta_window_move_resize_request(window,
value_mask,
gravity,
event->xclient.data.l[1], // x
event->xclient.data.l[2], // y
event->xclient.data.l[3], // width
event->xclient.data.l[4]); // height
}
else if (event->xclient.message_type ==
display->atom_net_active_window)
{
......
......@@ -470,6 +470,7 @@ void meta_window_get_client_root_coords (MetaWindow *window,
* request.
*/
void meta_window_get_gravity_position (MetaWindow *window,
int gravity,
int *x,
int *y);
/* Get geometry for saving in the session; x/y are gravity
......@@ -509,6 +510,13 @@ void meta_window_send_icccm_message (MetaWindow *window,
guint32 timestamp);
void meta_window_move_resize_request(MetaWindow *window,
guint value_mask,
int gravity,
int x,
int y,
int width,
int height);
gboolean meta_window_configure_request (MetaWindow *window,
XEvent *event);
gboolean meta_window_property_notify (MetaWindow *window,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment