equal
deleted
inserted
replaced
215 */ |
215 */ |
216 if (xinerama) { |
216 if (xinerama) { |
217 displaydata->screen = 0; |
217 displaydata->screen = 0; |
218 displaydata->use_xinerama = xinerama_major * 100 + xinerama_minor; |
218 displaydata->use_xinerama = xinerama_major * 100 + xinerama_minor; |
219 displaydata->xinerama_info = xinerama[screen]; |
219 displaydata->xinerama_info = xinerama[screen]; |
|
220 displaydata->xinerama_screen = screen; |
220 } |
221 } |
221 else displaydata->screen = screen; |
222 else displaydata->screen = screen; |
222 #else |
223 #else |
223 displaydata->screen = screen; |
224 displaydata->screen = screen; |
224 #endif |
225 #endif |
640 int screencount; |
641 int screencount; |
641 XineramaScreenInfo *xinerama; |
642 XineramaScreenInfo *xinerama; |
642 |
643 |
643 /* Update the current screen layout information */ |
644 /* Update the current screen layout information */ |
644 xinerama = XineramaQueryScreens(display, &screencount); |
645 xinerama = XineramaQueryScreens(display, &screencount); |
645 if (xinerama && data->screen < screencount) { |
646 if (xinerama && data->xinerama_screen < screencount) { |
646 data->xinerama_info = xinerama[data->screen]; |
647 data->xinerama_info = xinerama[data->xinerama_screen]; |
647 } |
648 } |
648 if (xinerama) XFree(xinerama); |
649 if (xinerama) XFree(xinerama); |
649 |
650 |
650 *w = data->xinerama_info.width; |
651 *w = data->xinerama_info.width; |
651 *h = data->xinerama_info.height; |
652 *h = data->xinerama_info.height; |