nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore monitors with size 0

Browse source
This commit is contained in:
o9000 2017-01-21 10:27:27 +01:00
parent 0392c34e71
commit f438ef712b
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/server.c
View file

@ -317,38 +317,34 @@ void get_monitors()
if (res && res->ncrtc >= num_monitors) { if (res && res->ncrtc >= num_monitors) {
// use xrandr to identify monitors (does not work with proprietery nvidia drivers) // use xrandr to identify monitors (does not work with proprietery nvidia drivers)
// Workaround for issue https://gitlab.com/o9000/tint2/issues/353
// on some recent configs, XRRGetScreenResourcesCurrent returns a fantom monitor at last position
{
int i = res->ncrtc - 1;
XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
if (!(crtc_info->x || crtc_info->y || crtc_info->width || crtc_info->height)) {
res->ncrtc -= 1;
}
XRRFreeCrtcInfo(crtc_info);
}
printf("xRandr: Found crtc's: %d\n", res->ncrtc); printf("xRandr: Found crtc's: %d\n", res->ncrtc);
server.monitors = calloc(res->ncrtc, sizeof(Monitor)); server.monitors = calloc(res->ncrtc, sizeof(Monitor));
num_monitors = 0;
for (int i = 0; i < res->ncrtc; ++i) { for (int i = 0; i < res->ncrtc; ++i) {
XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]); XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
server.monitors[i].x = crtc_info->x; // Ignore empty crtc
server.monitors[i].y = crtc_info->y; if (!crtc_info->width || !crtc_info->height) {
server.monitors[i].width = crtc_info->width; printf("xRandr: crtc %d seems disabled\n", i);
server.monitors[i].height = crtc_info->height; XRRFreeCrtcInfo(crtc_info);
server.monitors[i].names = calloc((crtc_info->noutput + 1), sizeof(gchar *)); continue;
}
int i_monitor = num_monitors;
num_monitors++;
server.monitors[i_monitor].x = crtc_info->x;
server.monitors[i_monitor].y = crtc_info->y;
server.monitors[i_monitor].width = crtc_info->width;
server.monitors[i_monitor].height = crtc_info->height;
server.monitors[i_monitor].names = calloc((crtc_info->noutput + 1), sizeof(gchar *));
for (int j = 0; j < crtc_info->noutput; ++j) { for (int j = 0; j < crtc_info->noutput; ++j) {
XRROutputInfo *output_info = XRRGetOutputInfo(server.display, res, crtc_info->outputs[j]); XRROutputInfo *output_info = XRRGetOutputInfo(server.display, res, crtc_info->outputs[j]);
printf("xRandr: Linking output %s with crtc %d\n", output_info->name, i); printf("xRandr: Linking output %s with crtc %d\n", output_info->name, i);
server.monitors[i].names[j] = g_strdup(output_info->name); server.monitors[i_monitor].names[j] = g_strdup(output_info->name);
XRRFreeOutputInfo(output_info); XRRFreeOutputInfo(output_info);
server.monitors[i].primary = crtc_info->outputs[j] == primary_output; server.monitors[i_monitor].primary = crtc_info->outputs[j] == primary_output;
} }
server.monitors[i].names[crtc_info->noutput] = NULL; server.monitors[i_monitor].names[crtc_info->noutput] = NULL;
XRRFreeCrtcInfo(crtc_info); XRRFreeCrtcInfo(crtc_info);
} }
num_monitors = res->ncrtc;
} else if (info && num_monitors > 0) { } else if (info && num_monitors > 0) {
server.monitors = calloc(num_monitors, sizeof(Monitor)); server.monitors = calloc(num_monitors, sizeof(Monitor));
for (int i = 0; i < num_monitors; i++) { for (int i = 0; i < num_monitors; i++) {
@ -356,7 +352,7 @@ void get_monitors()
server.monitors[i].y = info[i].y_org; server.monitors[i].y = info[i].y_org;
server.monitors[i].width = info[i].width; server.monitors[i].width = info[i].width;
server.monitors[i].height = info[i].height; server.monitors[i].height = info[i].height;
server.monitors[i].names = 0; server.monitors[i].names = NULL;
} }
} }