|
 |
b74ef19 |
From 8c052c789b585f434da1e6b92b3f452412074361 Mon Sep 17 00:00:00 2001
|
|
|
b74ef19 |
From: Dave Airlie <airlied@redhat.com>
|
|
|
b74ef19 |
Date: Thu, 8 Oct 2009 16:09:50 +1000
|
|
|
b74ef19 |
Subject: [PATCH] rrcrtc: add initial gamma interfaces (v3)
|
|
|
b74ef19 |
|
|
|
b74ef19 |
These are used by gnome-screensaver to do the fade in/out.
|
|
|
b74ef19 |
|
|
|
b74ef19 |
Reviewed by ssp: removed unneeded crtc interfaces,
|
|
|
b74ef19 |
made get gamma to the allocs, for caller to free
|
|
|
b74ef19 |
|
|
|
b74ef19 |
New interfaces:
|
|
|
b74ef19 |
Add gamma get/set functions per crtc.
|
|
|
b74ef19 |
|
|
|
b74ef19 |
v3: coding style cleanups from ssp
|
|
|
b74ef19 |
---
|
|
|
b74ef19 |
libgnome-desktop/gnome-rr.c | 75 ++++++++++++++++++++++++++++++++
|
|
|
b74ef19 |
libgnome-desktop/libgnomeui/gnome-rr.h | 10 ++++
|
|
|
b74ef19 |
2 files changed, 85 insertions(+), 0 deletions(-)
|
|
|
b74ef19 |
|
|
|
b74ef19 |
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
|
|
|
b74ef19 |
index a64f8ae..9a93573 100644
|
|
|
b74ef19 |
--- a/libgnome-desktop/gnome-rr.c
|
|
|
b74ef19 |
+++ b/libgnome-desktop/gnome-rr.c
|
|
|
b74ef19 |
@@ -74,6 +74,7 @@ struct GnomeRRCrtc
|
|
|
b74ef19 |
|
|
|
b74ef19 |
GnomeRRRotation current_rotation;
|
|
|
b74ef19 |
GnomeRRRotation rotations;
|
|
|
b74ef19 |
+ int gamma_size;
|
|
|
b74ef19 |
};
|
|
|
b74ef19 |
|
|
|
b74ef19 |
struct GnomeRRMode
|
|
|
b74ef19 |
@@ -1447,6 +1448,9 @@ crtc_initialize (GnomeRRCrtc *crtc,
|
|
|
b74ef19 |
|
|
|
b74ef19 |
XRRFreeCrtcInfo (info);
|
|
|
b74ef19 |
|
|
|
b74ef19 |
+ /* get an store gamma size */
|
|
|
b74ef19 |
+ crtc->gamma_size = XRRGetCrtcGammaSize (DISPLAY (crtc), crtc->id);
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
return TRUE;
|
|
|
b74ef19 |
}
|
|
|
b74ef19 |
|
|
|
b74ef19 |
@@ -1516,3 +1520,74 @@ mode_free (GnomeRRMode *mode)
|
|
|
b74ef19 |
g_free (mode->name);
|
|
|
b74ef19 |
g_free (mode);
|
|
|
b74ef19 |
}
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+void
|
|
|
b74ef19 |
+gnome_rr_crtc_set_gamma (GnomeRRCrtc *crtc, int size,
|
|
|
b74ef19 |
+ unsigned short *red,
|
|
|
b74ef19 |
+ unsigned short *green,
|
|
|
b74ef19 |
+ unsigned short *blue)
|
|
|
b74ef19 |
+{
|
|
|
b74ef19 |
+ int copy_size;
|
|
|
b74ef19 |
+ XRRCrtcGamma *gamma;
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ g_return_if_fail (crtc != NULL);
|
|
|
b74ef19 |
+ g_return_if_fail (red != NULL);
|
|
|
b74ef19 |
+ g_return_if_fail (green != NULL);
|
|
|
b74ef19 |
+ g_return_if_fail (blue != NULL);
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ if (size != crtc->gamma_size)
|
|
|
b74ef19 |
+ return;
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ gamma = XRRAllocGamma (crtc->gamma_size);
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ copy_size = crtc->gamma_size * sizeof (unsigned short);
|
|
|
b74ef19 |
+ memcpy (gamma->red, red, copy_size);
|
|
|
b74ef19 |
+ memcpy (gamma->green, green, copy_size);
|
|
|
b74ef19 |
+ memcpy (gamma->blue, blue, copy_size);
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ XRRSetCrtcGamma (DISPLAY (crtc), crtc->id, gamma);
|
|
|
b74ef19 |
+ XRRFreeGamma (gamma);
|
|
|
b74ef19 |
+}
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+gboolean
|
|
|
b74ef19 |
+gnome_rr_crtc_get_gamma (GnomeRRCrtc *crtc, int *size,
|
|
|
b74ef19 |
+ unsigned short **red, unsigned short **green,
|
|
|
b74ef19 |
+ unsigned short **blue)
|
|
|
b74ef19 |
+{
|
|
|
b74ef19 |
+ int copy_size;
|
|
|
b74ef19 |
+ unsigned short *r, *g, *b;
|
|
|
b74ef19 |
+ XRRCrtcGamma *gamma;
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ g_return_val_if_fail (crtc != NULL, FALSE);
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ gamma = XRRGetCrtcGamma (DISPLAY (crtc), crtc->id);
|
|
|
b74ef19 |
+ if (!gamma)
|
|
|
b74ef19 |
+ return FALSE;
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ copy_size = crtc->gamma_size * sizeof (unsigned short);
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ if (red) {
|
|
|
b74ef19 |
+ r = g_new0 (unsigned short, crtc->gamma_size);
|
|
|
b74ef19 |
+ memcpy (r, gamma->red, copy_size);
|
|
|
b74ef19 |
+ *red = r;
|
|
|
b74ef19 |
+ }
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ if (green) {
|
|
|
b74ef19 |
+ g = g_new0 (unsigned short, crtc->gamma_size);
|
|
|
b74ef19 |
+ memcpy (g, gamma->green, copy_size);
|
|
|
b74ef19 |
+ *green = g;
|
|
|
b74ef19 |
+ }
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ if (blue) {
|
|
|
b74ef19 |
+ b = g_new0 (unsigned short, crtc->gamma_size);
|
|
|
b74ef19 |
+ memcpy (b, gamma->blue, copy_size);
|
|
|
b74ef19 |
+ *blue = b;
|
|
|
b74ef19 |
+ }
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ XRRFreeGamma (gamma);
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
+ if (size)
|
|
|
b74ef19 |
+ *size = crtc->gamma_size;
|
|
|
b74ef19 |
+ return TRUE;
|
|
|
b74ef19 |
+}
|
|
|
b74ef19 |
+
|
|
|
b74ef19 |
diff --git a/libgnome-desktop/libgnomeui/gnome-rr.h b/libgnome-desktop/libgnomeui/gnome-rr.h
|
|
|
b74ef19 |
index 6eae3d0..e149336 100644
|
|
|
b74ef19 |
--- a/libgnome-desktop/libgnomeui/gnome-rr.h
|
|
|
b74ef19 |
+++ b/libgnome-desktop/libgnomeui/gnome-rr.h
|
|
|
b74ef19 |
@@ -160,4 +160,14 @@ GnomeRRRotation gnome_rr_crtc_get_rotations (GnomeRRCrtc *crtc)
|
|
|
b74ef19 |
gboolean gnome_rr_crtc_supports_rotation (GnomeRRCrtc *crtc,
|
|
|
b74ef19 |
GnomeRRRotation rotation);
|
|
|
b74ef19 |
|
|
|
b74ef19 |
+gboolean gnome_rr_crtc_get_gamma (GnomeRRCrtc *crtc,
|
|
|
b74ef19 |
+ int *size,
|
|
|
b74ef19 |
+ unsigned short **red,
|
|
|
b74ef19 |
+ unsigned short **green,
|
|
|
b74ef19 |
+ unsigned short **blue);
|
|
|
b74ef19 |
+void gnome_rr_crtc_set_gamma (GnomeRRCrtc *crtc,
|
|
|
b74ef19 |
+ int size,
|
|
|
b74ef19 |
+ unsigned short *red,
|
|
|
b74ef19 |
+ unsigned short *green,
|
|
|
b74ef19 |
+ unsigned short *blue);
|
|
|
b74ef19 |
#endif
|
|
|
b74ef19 |
--
|
|
|
b74ef19 |
1.6.5.rc2
|
|
|
b74ef19 |
|