diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-02 17:50:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-02 17:50:09 +0000 |
| commit | 88c1c94651750789dcad613ee8b09024df142ba2 (patch) | |
| tree | c7ee5d339304d0b75d98d79a0b9bfd25918ed25a /gdk/x11/gdkpango-x11.c | |
| parent | c466752212dc8aed884aa00877c5d32ecb081f12 (diff) | |
| download | gtk+-88c1c94651750789dcad613ee8b09024df142ba2.tar.gz | |
Requires glib-2.3.0, pango-1.2.0.
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
* configure.in: Require Xft version 2,
remove code for handling older versions of pango and Xft.
Many miscellaneous improvements to X checks
* acinclude.m4: Add GTK_ADD_LIB() macro for adding
a library to a variable, avoiding dups.
* gdk/x11/gdkfont-x11.c (gdk_font_from_description_for_display):
Always load "fixed"
* gdk/x11/gdk*-x11.[ch]: Remove support for Xft1 and
for pangox.
Diffstat (limited to 'gdk/x11/gdkpango-x11.c')
| -rw-r--r-- | gdk/x11/gdkpango-x11.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/gdk/x11/gdkpango-x11.c b/gdk/x11/gdkpango-x11.c index 4645651887..b4bf0cf290 100644 --- a/gdk/x11/gdkpango-x11.c +++ b/gdk/x11/gdkpango-x11.c @@ -23,10 +23,7 @@ #include "gdkx.h" #include "gdkdisplay-x11.h" #include "gdkpango.h" -#include <pango/pangox.h> -#ifdef HAVE_XFT #include <pango/pangoxft.h> -#endif /** * gdk_pango_context_get_for_screen: @@ -48,40 +45,14 @@ PangoContext * gdk_pango_context_get_for_screen (GdkScreen *screen) { PangoContext *context; - GdkDisplayX11 *display_x11; g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); if (screen->closed) return NULL; - display_x11 = GDK_DISPLAY_X11 (GDK_SCREEN_DISPLAY (screen)); - -#ifdef HAVE_XFT - if (display_x11->use_xft == -1) - { - const char *val = g_getenv ("GDK_USE_XFT"); - - /* Version 2 of Xft supports rendering FreeType fonts via - * the core X protocol, so we default to it everywhere. - * - * For Xft1, we only enable Xft if the user explicitely - * specifies it, and we have the RENDER extension - */ -# ifdef HAVE_XFT2 - display_x11->use_xft = !val || (atoi (val) != 0); -# else - display_x11->use_xft = val && (atoi (val) != 0) && - _gdk_x11_have_render (GDK_SCREEN_DISPLAY (screen)); -# endif /* HAVE_XFT2 */ - } - - if (display_x11->use_xft) - context = pango_xft_get_context (GDK_SCREEN_XDISPLAY (screen), - GDK_SCREEN_X11 (screen)->screen_num); - else -#endif /* HAVE_XFT */ - context = pango_x_get_context (GDK_SCREEN_XDISPLAY (screen)); + context = pango_xft_get_context (GDK_SCREEN_XDISPLAY (screen), + GDK_SCREEN_X11 (screen)->screen_num); g_object_set_data (G_OBJECT (context), "gdk-pango-screen", screen); |