callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Introduce API to get the preferred visual"

Browse Source 
This reverts commit 2b95d1a34e.

Conflicts:
	gdk/gdkscreen.c
This commit is contained in:
Matthias Clasen 2014-02-10 22:12:10 -05:00
parent d326507978
commit 3459a0a273
6 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gdk/gdk3-sections.txt
View File

@ -195,7 +195,6 @@ GdkScreen
gdk_screen_get_default gdk_screen_get_default
gdk_screen_get_system_visual gdk_screen_get_system_visual
gdk_screen_get_rgba_visual gdk_screen_get_rgba_visual
gdk_screen_get_preferred_visual
gdk_screen_is_composited gdk_screen_is_composited
gdk_screen_get_root_window gdk_screen_get_root_window
gdk_screen_get_display gdk_screen_get_display

9
docs/reference/gtk/running.sgml
View File

@ -478,15 +478,6 @@ nevertheless.
</para> </para>
</formalpara> </formalpara>
<formalpara>
<title><envar>GDK_RGBA</envar></title>
<para>
Since 3.12, this environment variable can be used to prevent
using RGBA visuals on the X11 backend by setting GDK_RGBA=0.
</para>
</formalpara>
<formalpara> <formalpara>
<title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title> <title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title>

30
gdk/gdkscreen.c
View File

@ -912,36 +912,6 @@ gdk_screen_get_rgba_visual (GdkScreen *screen)
return GDK_SCREEN_GET_CLASS (screen)->get_rgba_visual (screen); return GDK_SCREEN_GET_CLASS (screen)->get_rgba_visual (screen);
} }
/**
* gdk_screen_get_preferred_visual:
* @screen: a #GdkScreen
*
* Returns the visual that is preferred when creating windows.
*
* This will be the visual returned by gdk_screen_get_rgba_visual()
* unless that is not available, or unless the environment
* variable `GDK_RGBA` is set to `0`.
*
* Return value: (transfer none): the preferred visual to use
* for windows
*
* Since: 3.12
*/
GdkVisual *
gdk_screen_get_preferred_visual (GdkScreen *screen)
{
GdkVisual *visual;
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
visual = gdk_screen_get_rgba_visual (screen);
if (visual == NULL || g_strcmp0 (g_getenv ("GDK_RGBA"), "0") == 0)
visual = gdk_screen_get_system_visual (screen);
return visual;
}
/** /**
* gdk_screen_is_composited: * gdk_screen_is_composited:
* @screen: a #GdkScreen * @screen: a #GdkScreen

2
gdk/gdkscreen.h
View File

@ -45,8 +45,6 @@ GDK_AVAILABLE_IN_ALL
GdkVisual * gdk_screen_get_system_visual (GdkScreen *screen); GdkVisual * gdk_screen_get_system_visual (GdkScreen *screen);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GdkVisual * gdk_screen_get_rgba_visual (GdkScreen *screen); GdkVisual * gdk_screen_get_rgba_visual (GdkScreen *screen);
GDK_AVAILABLE_IN_3_12
GdkVisual * gdk_screen_get_preferred_visual (GdkScreen *screen);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gboolean gdk_screen_is_composited (GdkScreen *screen); gboolean gdk_screen_is_composited (GdkScreen *screen);

1
gdk/gdkscreenprivate.h
View File

@ -66,7 +66,6 @@ struct _GdkScreenClass
GList * (* list_visuals) (GdkScreen *screen); GList * (* list_visuals) (GdkScreen *screen);
GdkVisual * (* get_system_visual) (GdkScreen *screen); GdkVisual * (* get_system_visual) (GdkScreen *screen);
GdkVisual * (* get_rgba_visual) (GdkScreen *screen); GdkVisual * (* get_rgba_visual) (GdkScreen *screen);
GdkVisual * (* get_preferred_visual) (GdkScreen *screen);
gboolean (* is_composited) (GdkScreen *screen); gboolean (* is_composited) (GdkScreen *screen);
gchar * (* make_display_name) (GdkScreen *screen); gchar * (* make_display_name) (GdkScreen *screen);
GdkWindow * (* get_active_window) (GdkScreen *screen); GdkWindow * (* get_active_window) (GdkScreen *screen);

9
gtk/gtkwidget.c
View File

@ -10880,14 +10880,9 @@ gtk_widget_get_visual (GtkWidget *widget)
g_warning ("Ignoring visual set on widget `%s' that is not on the correct screen.", g_warning ("Ignoring visual set on widget `%s' that is not on the correct screen.",
gtk_widget_get_name (widget)); gtk_widget_get_name (widget));
} }
}
visual = gdk_screen_get_rgba_visual (screen); return gdk_screen_get_system_visual (screen);
if (visual == NULL ||
g_strcmp0 (g_getenv ("GDK_RGBA"), "0") != 0)
visual = gdk_screen_get_system_visual (screen);
return visual;
} }
/** /**