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

Merge branch 'master' into next

next
Michael Stapelberg 2011-08-17 13:37:33 +02:00
parent 2eab8d7f20 84afc79e0b
commit 4cf2cab626
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@ -281,6 +281,7 @@ int main(int argc, char *argv[]) {
root = root_screen->root;
root_depth = root_screen->root_depth;
xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);
xcb_query_pointer_cookie_t pointercookie = xcb_query_pointer(conn, root);
load_configuration(conn, override_configpath, false);
if (only_check_config) {
@ -430,6 +431,20 @@ int main(int argc, char *argv[]) {
randr_init(&randr_base);
}
xcb_query_pointer_reply_t *pointerreply;
if (!(pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL)))
die("Could not query pointer position\n");
DLOG("Pointer at %d, %d\n", pointerreply->root_x, pointerreply->root_y);
Output *output = get_output_containing(pointerreply->root_x, pointerreply->root_y);
if (!output) {
ELOG("ERROR: No screen at (%d, %d), starting on the first screen\n",
pointerreply->root_x, pointerreply->root_y);
output = get_first_output();
}
con_focus(con_descend_focused(output_get_content(output->con)));
tree_render();
/* Create the UNIX domain socket for IPC */