Merge lp:~sylvain-pineau/checkbox/gsd-res-change into lp:checkbox

[Sylvain Pineau]

-- WIP --

A new program to replace all calls to xrandr to perform screen resolution changes (on I+N systems).

New build dep for the checkbox provider are (so far):

 - libgtk-3-dev
 - unity-settings-daemon-dev
 - pkg-config

[lp:~sylvain-pineau/checkbox/gsd-res-change]

4070. By Sylvain Pineau on 2015-11-02

providers:checkbox: Added a nex executable to perform screen resolution changes

The xrandr command does not always work with Intel+Nvidia systems.
This new program uses the same backend as System Settings
(unity-settings-daemon) to change the screen resolution.

Unmerged revisions

4070. By Sylvain Pineau on 2015-11-02

providers:checkbox: Added a nex executable to perform screen resolution changes

The xrandr command does not always work with Intel+Nvidia systems.
This new program uses the same backend as System Settings
(unity-settings-daemon) to change the screen resolution.

=== added file 'providers/plainbox-provider-checkbox/requirements/deb-base.txt'
--- providers/plainbox-provider-checkbox/requirements/deb-base.txt	1970-01-01 00:00:00 +0000
+++ providers/plainbox-provider-checkbox/requirements/deb-base.txt	2015-11-02 23:14:35 +0000
@@ -0,0 +1,3 @@
+libgtk-3-dev
+unity-settings-daemon-dev
+pkg-config

=== modified file 'providers/plainbox-provider-checkbox/src/EXECUTABLES'
--- providers/plainbox-provider-checkbox/src/EXECUTABLES	2014-04-07 16:29:32 +0000
+++ providers/plainbox-provider-checkbox/src/EXECUTABLES	2015-11-02 23:14:35 +0000
@@ -1,2 +1,3 @@
 clocktest
 threaded_memtest
+screen_resolution

=== modified file 'providers/plainbox-provider-checkbox/src/Makefile'
--- providers/plainbox-provider-checkbox/src/Makefile	2014-04-16 15:22:37 +0000
+++ providers/plainbox-provider-checkbox/src/Makefile	2015-11-02 23:14:35 +0000
@@ -1,13 +1,15 @@
 .PHONY:
-all: clocktest threaded_memtest
+all: clocktest threaded_memtest screen_resolution
 
 .PHONY: clean
 clean:
-	rm -f clocktest threaded_memtest
+	rm -f clocktest threaded_memtest screen_resolution
 
 threaded_memtest: CFLAGS += -pthread
 threaded_memtest: CFLAGS += -Wno-unused-but-set-variable
 clocktest: CFLAGS += -D_POSIX_C_SOURCE=199309L
 clocktest: LDLIBS += -lrt
+screen_resolution: CFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 unity-settings-daemon)
+screen_resolution: LDLIBS += $(shell pkg-config --libs gtk+-3.0) -lunity-settings-daemon
 
 CFLAGS += -Wall

=== added file 'providers/plainbox-provider-checkbox/src/screen_resolution.c'
--- providers/plainbox-provider-checkbox/src/screen_resolution.c	1970-01-01 00:00:00 +0000
+++ providers/plainbox-provider-checkbox/src/screen_resolution.c	2015-11-02 23:14:35 +0000
@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * This file is part of Checkbox.
+ *
+ * Copyright 2015 Canonical Ltd.
+ * Written by:
+ *   Sylvain Pineau <[e-mail]>
+ *
+ * Checkbox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * Checkbox is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gdk/gdkx.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <libunity-settings-daemon/gsd-rr.h>
+#include <libunity-settings-daemon/gsd-rr-config.h>
+
+static gint height = 0;
+static gint width  = 0;
+static gint screen = 0;
+static gint x      = 0;
+static gint y      = 0;
+
+static GOptionEntry entries[] =
+{
+  { "height",     'h', 0, G_OPTION_ARG_INT, &height, "Set screen width to H",         "H" },
+  { "width",      'w', 0, G_OPTION_ARG_INT, &width,  "Set screen width to W",         "W" },
+  { "x_position", 'x', 0, G_OPTION_ARG_INT, &x,      "Set x position to X",           "X" },
+  { "y_position", 'y', 0, G_OPTION_ARG_INT, &y,      "Set y position to Y",           "Y" },
+  { "screen",     's', 0, G_OPTION_ARG_INT, &screen, "Apply resolution to screen #N", "N" },
+  { NULL }
+};
+
+int main (int argc, char *argv[])
+{
+    GsdRROutputInfo **outputs;
+    GsdRRScreen *rr_screen;
+    GsdRRConfig *rr_config;
+    GError *error = NULL;
+    GOptionContext *context;
+
+    context = g_option_context_new ("- Change screen resolution");
+    g_option_context_add_main_entries (context, entries, NULL);
+    g_option_context_add_group (context, gtk_get_option_group (TRUE));
+    if (!g_option_context_parse (context, &argc, &argv, &error))
+    {
+        g_print ("option parsing failed: %s\n", error->message);
+        return 1;
+    }
+    gtk_init (&argc, &argv);
+    rr_screen = gsd_rr_screen_new (gdk_screen_get_default (), NULL);
+    if (!rr_screen)
+        return 1;
+    rr_config = gsd_rr_config_new_current (rr_screen, NULL);
+    gsd_rr_config_ensure_primary (rr_config);
+    outputs = gsd_rr_config_get_outputs (rr_config);
+    gsd_rr_output_info_set_geometry (outputs[screen], x, y, height, width);
+    if (!gsd_rr_config_apply_with_time(rr_config, rr_screen, 0, &error)) {
+        g_warning ("failed to apply resolution %dx%d to %s: %s", height, width, gsd_rr_output_info_get_display_name(outputs[screen]), error->message);
+        return 1;
+    }
+    g_object_unref (rr_config);
+    g_object_unref (rr_screen);
+    return 0;
+}