We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Respect default screen from DISPLAY variable, using standard X11 function calls.

SDL2_screen_from_DISPLAY.patch (text/plain), 1.20 KB, created by Steaphan Greene on 2014-10-09 00:24:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steaphan Greene

Created: 2014-10-09 00:24:17 UTC

Size: 1.20 KB

patch

obsolete

>diff -r 3331d2f57704 src/video/x11/SDL_x11modes.c
>--- a/src/video/x11/SDL_x11modes.c	Sat Oct 04 14:59:41 2014 -0400
>+++ b/src/video/x11/SDL_x11modes.c	Wed Oct 08 11:47:08 2014 -0700
>@@ -375,7 +375,7 @@
> X11_InitModes(_THIS)
> {
>     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
>-    int screen, screencount;
>+    int snum, screen, screencount;
> #if SDL_VIDEO_DRIVER_X11_XINERAMA
>     int xinerama_major, xinerama_minor;
>     int use_xinerama = 0;
>@@ -423,7 +423,7 @@
>     }
> #endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
> 
>-    for (screen = 0; screen < screencount; ++screen) {
>+    for (snum = 0; snum < screencount; ++snum) {
>         XVisualInfo vinfo;
>         SDL_VideoDisplay display;
>         SDL_DisplayData *displaydata;
>@@ -433,6 +433,15 @@
>         char display_name[128];
>         int i, n;
> 
>+        /* Re-order screens to always put default screen first */
>+        if (snum == 0) {
>+            screen = DefaultScreen(data->display);
>+        } else if (snum == DefaultScreen(data->display)) {
>+            screen = 0;
>+        } else {
>+            screen = snum;
>+        }
>+
> #if SDL_VIDEO_DRIVER_X11_XINERAMA
>         if (xinerama) {
>             if (get_visualinfo(data->display, 0, &vinfo) < 0) {

Actions: View | Diff

Attachments on bug 2192: 1402 | 1416 | 1604 | 1606 | 1891

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.