Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/client-side-decorations' into client-side-decorations

Browse Source
This commit is contained in:
Federico Mena Quintero
2010-06-09 16:43:25 -05:00
parent 6da936a452 68a12cf28c
commit 8b2f6bc673
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gdk/x11/gdkscreen-x11.c
View File

@@ -238,6 +238,36 @@ gdk_screen_get_root_window (GdkScreen *screen)
return GDK_SCREEN_X11 (screen)->root_window;
}
static gboolean
should_disable_rgba ()
{
static gint should_disable = -1;
if (should_disable == -1)
{
if (g_getenv ("GTK_RGBA_DISABLE_APPS"))
{
gchar **apps = g_strsplit (g_getenv ("GTK_RGBA_DISABLE_APPS"), ":", -1);
gchar *name = g_get_prgname ();
gint i;
should_disable = FALSE;
for (i = 0; apps[i] != NULL; i++)
{
if (g_strcmp0 (apps[i], name) == 0)
{
g_strfreev (apps);
should_disable = TRUE;
break;
}
}
}
}
return should_disable;
}
/**
* gdk_screen_get_default_colormap:
* @screen: a #GdkScreen
@@ -253,6 +283,7 @@ gdk_screen_get_default_colormap (GdkScreen *screen)
{
GdkScreenX11 *screen_x11;
GdkColormap *colormap;
gboolean disable_rgba = should_disable_rgba ();
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
@@ -260,7 +291,7 @@ gdk_screen_get_default_colormap (GdkScreen *screen)
if (!screen_x11->default_colormap)
{
if (!screen_x11->rgba_visual)
if (!screen_x11->rgba_visual || disable_rgba == TRUE)
{
colormap = g_object_ref (gdk_screen_get_system_colormap (screen));
}