applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Stapelberg 2011-08-20 17:48:49 +02:00
commit 2cd8231fce
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -432,11 +432,13 @@ int main(int argc, char *argv[]) {
} }
xcb_query_pointer_reply_t *pointerreply; xcb_query_pointer_reply_t *pointerreply;
if (!(pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL))) Output *output = NULL;
die("Could not query pointer position\n"); if (!(pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL))) {
ELOG("Could not query pointer position, using first screen\n");
output = get_first_output();
} else {
DLOG("Pointer at %d, %d\n", pointerreply->root_x, pointerreply->root_y); DLOG("Pointer at %d, %d\n", pointerreply->root_x, pointerreply->root_y);
Output *output = get_output_containing(pointerreply->root_x, pointerreply->root_y); output = get_output_containing(pointerreply->root_x, pointerreply->root_y);
if (!output) { if (!output) {
ELOG("ERROR: No screen at (%d, %d), starting on the first screen\n", ELOG("ERROR: No screen at (%d, %d), starting on the first screen\n",
pointerreply->root_x, pointerreply->root_y); pointerreply->root_x, pointerreply->root_y);
@ -444,6 +446,7 @@ int main(int argc, char *argv[]) {
} }
con_focus(con_descend_focused(output_get_content(output->con))); con_focus(con_descend_focused(output_get_content(output->con)));
}
tree_render(); tree_render();