1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
http://bugzilla.gnome.org/show_bug.cgi?id=342850
http://bugs.gentoo.org/show_bug.cgi?id=201019
Index: src/gs-fade.c
===================================================================
--- src/gs-fade.c (revision 1322)
+++ src/gs-fade.c (working copy)
@@ -296,6 +296,10 @@
}
# endif
+ if (fade->priv->gamma_info) {
+ return TRUE;
+ }
+
info = g_new0 (xf86_gamma_info, fade->priv->num_screens);
fade->priv->gamma_info = info;
@@ -402,8 +406,10 @@
int screen;
gboolean res;
- for (screen = 0; screen < fade->priv->num_screens; screen++) {
- res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
+ if (fade->priv->gamma_info) {
+ for (screen = 0; screen < fade->priv->num_screens; screen++) {
+ res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
+ }
}
return TRUE;
@@ -523,6 +529,8 @@
g_return_if_fail (GS_IS_FADE (fade));
+ gamma_info_init (fade);
+
if (fade->priv->timer_id > 0) {
gs_fade_stop (fade);
}
@@ -641,6 +649,8 @@
fade->priv->current_alpha = 1.0;
gs_fade_set_alpha (fade, fade->priv->current_alpha);
+
+ gamma_info_free (fade);
}
static void
@@ -681,7 +691,9 @@
display = gdk_display_get_default ();
fade->priv->num_screens = gdk_display_get_n_screens (display);
- gamma_info_init (fade);
+#ifdef HAVE_XF86VMODE_GAMMA
+ fade->priv->gamma_info = NULL;
+#endif
}
static void
|
GitWeb
