Attachment 303698 Details for Bug 444089 – Add an xrandr version check

[patch] Add an xrandr version check

107_cc-randr12-check-version.patch (text/plain), 2.56 KB, created by James Westby on 2008-04-24 22:03:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Westby

Created: 2008-04-24 22:03:37 UTC

Size: 2.56 KB

patch

obsolete

>diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.22.1/capplets/display/xrandr-capplet.c gnome-control-center-2.22.1.new/capplets/display/xrandr-capplet.c
>--- gnome-control-center-2.22.1/capplets/display/xrandr-capplet.c	2008-04-09 11:02:39.000000000 +0100
>+++ gnome-control-center-2.22.1.new/capplets/display/xrandr-capplet.c	2008-04-09 11:02:40.000000000 +0100
>@@ -1516,6 +1516,10 @@
> #define GLADE_FILE GNOMECC_GLADE_DIR "/display-capplet.glade"
>     GladeXML *xml;
>     GtkWidget *align;
>+    int major, minor;
>+    int event_base, error_base;
>+    GdkDisplay *display;
>+    Display    *xdisplay;
> 
>     xml = glade_xml_new (GLADE_FILE, NULL, NULL);
>     if (!xml)
>@@ -1523,7 +1527,40 @@
> 	g_warning ("Could not open " GLADE_FILE);
> 	return;
>     }
>-    
>+
>+    display = gdk_display_get_default ();
>+    xdisplay = gdk_x11_display_get_xdisplay (display);
>+
>+    if (!XRRQueryExtension (xdisplay, &event_base, &error_base) ||
>+        XRRQueryVersion (xdisplay, &major, &minor) == 0)
>+    {
>+        GtkWidget *dialog = gtk_message_dialog_new (
>+                                                    NULL,
>+                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
>+                                                    GTK_MESSAGE_WARNING,
>+                                                    GTK_BUTTONS_OK,
>+                                                    "The X Server does not support the XRandR extension.  Runtime resolution changes to the display size are not available."
>+                                                    );
>+        gtk_window_set_title (GTK_WINDOW (dialog), "");
>+        gtk_dialog_run (GTK_DIALOG (dialog));
>+        gtk_widget_destroy (dialog);
>+        return;
>+    }
>+    else if (major != 1 || minor < 2)
>+    {
>+        GtkWidget *dialog = gtk_message_dialog_new (
>+                                                    NULL,
>+                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
>+                                                    GTK_MESSAGE_WARNING,
>+                                                    GTK_BUTTONS_OK,
>+                                                    "The version of the XRandR extension is incompatible with this program. Runtime changes to the display size are not available."
>+                                                    );
>+        gtk_window_set_title (GTK_WINDOW (dialog), "");
>+        gtk_dialog_run (GTK_DIALOG (dialog));
>+        gtk_widget_destroy (dialog);
>+        return;
>+    }
>+
>     app->screen = rw_screen_new (gdk_screen_get_default(),
> 				 on_screen_changed, app);
>

Actions: View | Diff

Attachments on bug 444089: 303698 | 303881 | 303882