[gtk+/rendering-cleanup: 79/81] gdk-xft: Don't call render about the subpixel order
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 79/81] gdk-xft: Don't call render about the subpixel order
- Date: Fri, 6 Aug 2010 02:58:54 +0000 (UTC)
commit d8f979abe3d9c4e8e6cf2e25663ade3577743307
Author: Benjamin Otte <otte redhat com>
Date: Fri Aug 6 04:23:34 2010 +0200
gdk-xft: Don't call render about the subpixel order
Instead assume that the root window property is working properly. This
removes the last real Xrender call from GTK.
gdk/x11/gdkxftdefaults.c | 37 +------------------------------------
1 files changed, 1 insertions(+), 36 deletions(-)
---
diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index 79dd26c..c037ee0 100644
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -168,42 +168,7 @@ init_xft_settings (GdkScreen *screen)
screen_x11->xft_hintstyle = FC_HINT_FULL;
if (!get_integer_default (xdisplay, "rgba", &screen_x11->xft_rgba))
-
- {
- int subpixel = FC_RGBA_UNKNOWN;
-
-#if RENDER_MAJOR > 0 || RENDER_MINOR >= 6
- if (_gdk_x11_have_render (screen_x11->display))
- {
- int render_order = XRenderQuerySubpixelOrder (xdisplay, xscreen);
-
- switch (render_order)
- {
- default:
- case SubPixelUnknown:
- subpixel = FC_RGBA_UNKNOWN;
- break;
- case SubPixelHorizontalRGB:
- subpixel = FC_RGBA_RGB;
- break;
- case SubPixelHorizontalBGR:
- subpixel = FC_RGBA_BGR;
- break;
- case SubPixelVerticalRGB:
- subpixel = FC_RGBA_VRGB;
- break;
- case SubPixelVerticalBGR:
- subpixel = FC_RGBA_VBGR;
- break;
- case SubPixelNone:
- subpixel = FC_RGBA_NONE;
- break;
- }
- }
-#endif
-
- screen_x11->xft_rgba = subpixel;
- }
+ screen_x11->xft_rgba = FC_RGBA_UNKNOWN;
if (!get_double_default (xdisplay, "dpi", &dpi_double))
dpi_double = (((double) DisplayHeight (xdisplay, xscreen) * 25.4) /
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]