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

Merge pull request #1943 from tcatm/fix-no-randr-output 

Don't create empty workspaces on restart
This commit is contained in:
Michael Stapelberg 2015-09-21 13:56:43 +02:00
parent f3d898be4b f14efe85d1
commit 5775147d37
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/randr.h
View File

@ -118,4 +118,4 @@ Output *get_output_next_wrap(direction_t direction, Output *current);
* Creates an output covering the root window.
*
*/
void create_root_output(xcb_connection_t *conn);
Output *create_root_output(xcb_connection_t *conn);

31
src/randr.c
View File

@ -239,19 +239,17 @@ Output *get_output_next(direction_t direction, Output *current, output_close_far
* Creates an output covering the root window.
*
*/
void create_root_output(xcb_connection_t *conn) {
root_output = scalloc(1, sizeof(Output));
Output *create_root_output(xcb_connection_t *conn) {
Output *s = scalloc(1, sizeof(Output));
root_output->active = true;
root_output->rect.x = 0;
root_output->rect.y = 0;
root_output->rect.width = root_screen->width_in_pixels;
root_output->rect.height = root_screen->height_in_pixels;
root_output->name = "xroot-0";
output_init_con(root_output);
init_ws_for_output(root_output, output_get_content(root_output->con));
s->active = false;
s->rect.x = 0;
s->rect.y = 0;
s->rect.width = root_screen->width_in_pixels;
s->rect.height = root_screen->height_in_pixels;
s->name = "xroot-0";
TAILQ_INSERT_TAIL(&outputs, root_output, outputs);
return s;
}
/*
@ -833,11 +831,18 @@ void randr_query_outputs(void) {
void randr_init(int *event_base) {
const xcb_query_extension_reply_t *extreply;
create_root_output(conn);
root_output = create_root_output(conn);
TAILQ_INSERT_TAIL(&outputs, root_output, outputs);
extreply = xcb_get_extension_data(conn, &xcb_randr_id);
if (!extreply->present)
if (!extreply->present) {
DLOG("RandR is not present, activating root output.\n");
root_output->active = true;
output_init_con(root_output);
init_ws_for_output(root_output, output_get_content(root_output->con));
return;
}
randr_query_outputs();

17
src/xinerama.c
View File

@ -87,6 +87,19 @@ static void query_screens(xcb_connection_t *conn) {
}
}
/*
* This creates the root_output (borrowed from randr.c) and uses it
* as the sole output for this session.
*
*/
static void use_root_output(xcb_connection_t *conn) {
Output *s = create_root_output(conn);
s->active = true;
TAILQ_INSERT_TAIL(&outputs, s, outputs);
output_init_con(s);
init_ws_for_output(s, output_get_content(s->con));
}
/*
* We have just established a connection to the X server and need the initial Xinerama
* information to setup workspaces for each screen.
@ -95,14 +108,14 @@ static void query_screens(xcb_connection_t *conn) {
void xinerama_init(void) {
if (!xcb_get_extension_data(conn, &xcb_xinerama_id)->present) {
DLOG("Xinerama extension not found, using root output.\n");
create_root_output(conn);
use_root_output(conn);
} else {
xcb_xinerama_is_active_reply_t *reply;
reply = xcb_xinerama_is_active_reply(conn, xcb_xinerama_is_active(conn), NULL);
if (reply == NULL || !reply->state) {
DLOG("Xinerama is not active (in your X-Server), using root output.\n");
create_root_output(conn);
use_root_output(conn);
} else
query_screens(conn);