nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-10-09 19:49:48 +02:00
parent d661c1493c cf7ea276ba
commit a09a5c391e
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/handlers.c
View File

@ -706,35 +706,26 @@ static void handle_client_message(xcb_client_message_event_t *event) {
xcb_flush(conn); xcb_flush(conn);
free(reply); free(reply);
} else if (event->type == A__NET_REQUEST_FRAME_EXTENTS) { } else if (event->type == A__NET_REQUEST_FRAME_EXTENTS) {
// A client can request an estimate for the frame size which the window /*
// manager will put around it before actually mapping its window. Java * A client can request an estimate for the frame size which the window
// does this (as of openjdk-7). * manager will put around it before actually mapping its window. Java
// * does this (as of openjdk-7).
// Note that the calculation below is not entirely accurate — once you *
// set a different border type, it’s off. We _could_ request all the * Note that the calculation below is not entirely accurate — once you
// window properties (which have to be set up at this point according * set a different border type, it’s off. We _could_ request all the
// to EWMH), but that seems rather elaborate. The standard explicitly * window properties (which have to be set up at this point according
// says the application must cope with an estimate that is not entirely * to EWMH), but that seems rather elaborate. The standard explicitly
// accurate. * says the application must cope with an estimate that is not entirely
* accurate.
*/
DLOG("_NET_REQUEST_FRAME_EXTENTS for window 0x%08x\n", event->window); DLOG("_NET_REQUEST_FRAME_EXTENTS for window 0x%08x\n", event->window);
xcb_get_geometry_reply_t *geometry;
xcb_get_geometry_cookie_t cookie = xcb_get_geometry(conn, event->window);
if (!(geometry = xcb_get_geometry_reply(conn, cookie, NULL))) {
ELOG("Could not get geometry of X11 window 0x%08x while handling "
"the _NET_REQUEST_FRAME_EXTENTS ClientMessage\n",
event->window);
return;
}
DLOG("Current geometry = x=%d, y=%d, width=%d, height=%d\n",
geometry->x, geometry->y, geometry->width, geometry->height);
/* The reply data: approximate frame size */
Rect r = { Rect r = {
0, // left config.default_border_width, /* left */
geometry->width + 4, // right config.default_border_width, /* right */
0, // top config.font.height + 5, /* top */
geometry->height + config.font.height + 5, // bottom config.default_border_width /* bottom */
}; };
xcb_change_property( xcb_change_property(
conn, conn,