[Pkg-xfce-commits] r9412 - in /desktop/trunk/xfce4-settings/debian: changelog patches/02_enable-crtc.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sun May 22 07:26:04 2016
New Revision: 9412

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9412
Log:
* debian/patches:
  - 02_enable-crtc added, re-enable CRTC after resume.        closes: #785622

Added:
    desktop/trunk/xfce4-settings/debian/patches/02_enable-crtc.patch
Modified:
    desktop/trunk/xfce4-settings/debian/changelog
    desktop/trunk/xfce4-settings/debian/patches/series

Modified: desktop/trunk/xfce4-settings/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-settings/debian/changelog?rev=9412&op=diff
==============================================================================
--- desktop/trunk/xfce4-settings/debian/changelog	(original)
+++ desktop/trunk/xfce4-settings/debian/changelog	Sun May 22 07:26:04 2016
@@ -1,3 +1,10 @@
+xfce4-settings (4.12.0-3) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 02_enable-crtc added, re-enable CRTC after resume.        closes: #785622
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 22 May 2016 08:51:12 +0200
+
 xfce4-settings (4.12.0-2) unstable; urgency=medium
 
   * Upload to unstable.

Added: desktop/trunk/xfce4-settings/debian/patches/02_enable-crtc.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-settings/debian/patches/02_enable-crtc.patch?rev=9412&op=file
==============================================================================
--- desktop/trunk/xfce4-settings/debian/patches/02_enable-crtc.patch	(added)
+++ desktop/trunk/xfce4-settings/debian/patches/02_enable-crtc.patch	Sun May 22 07:26:04 2016
@@ -0,0 +1,53 @@
+Origin: https://bugzilla.xfce.org/show_bug.cgi?id=11107#c54
+Description: Enable crtc if it is disabled after power cycle
+Author: jkampe68
+diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
+index 095e323..af70256 100644
+--- a/xfsettingsd/displays.c
++++ b/xfsettingsd/displays.c
+@@ -415,6 +415,7 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent,
+     XfceRROutput       *output, *o;
+     XEvent             *e = xevent;
+     gint                event_num;
++    gint                j;
+     guint               n, m, nactive = 0;
+     gboolean            found = FALSE, changed = FALSE;
+ 
+@@ -496,9 +497,37 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent,
+                 {
+                     xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "New output connected: %s",
+                                     output->info->name);
++                    /* need to enable crtc for output ? */
++                    if (output->info->crtc == None)
++                    {
++                        xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "enabling crtc for %s", output->info->name);
++                        crtc = xfce_displays_helper_find_usable_crtc (helper, output);
++                        if (crtc)
++                        {
++                            crtc->mode = output->preferred_mode;
++                            crtc->rotation = RR_Rotate_0;
++                            crtc->x = crtc->y = 0;
++                            /* set width and height */
++                            for (j = 0; j < helper->resources->nmode; ++j)
++                            {
++                                if (helper->resources->modes[j].id == output->preferred_mode)
++                                {
++                                    crtc->width = helper->resources->modes[j].width;
++                                    crtc->height = helper->resources->modes[j].height;
++                                    break;
++                                }
++                            }
++                            xfce_displays_helper_set_outputs (crtc, output);
++                            crtc->changed = TRUE;
++                        }
++                    }
++
+                     changed = TRUE;
+                 }
+             }
++            if (changed)
++                xfce_displays_helper_apply_all (helper);
++
+             /* Start the minimal dialog according to the user preferences */
+             if (changed && xfconf_channel_get_bool (helper->channel, NOTIFY_PROP, FALSE))
+                 xfce_spawn_command_line_on_screen (NULL, "xfce4-display-settings -m", FALSE,

Modified: desktop/trunk/xfce4-settings/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-settings/debian/patches/series?rev=9412&op=diff
==============================================================================
--- desktop/trunk/xfce4-settings/debian/patches/series	(original)
+++ desktop/trunk/xfce4-settings/debian/patches/series	Sun May 22 07:26:04 2016
@@ -1 +1,2 @@
 01_use-tango-icon-theme.patch
+02_enable-crtc.patch