From 5a7cb2374adc34db2947d9d8c8f6223ca0769165 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 21 Feb 2005 04:09:18 +0000 Subject: [PATCH] Set have_render_with_trapezoids to GDK_YES when we have a new enough 2005-02-20 Matthias Clasen * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): Set have_render_with_trapezoids to GDK_YES when we have a new enough Render extension. (#167965,Billy Biggs) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gdk/x11/gdkdrawable-x11.c | 14 +++++++------- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a827090667..1e573a719a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-02-20 Matthias Clasen + * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): + Set have_render_with_trapezoids to GDK_YES when we have + a new enough Render extension. (#167965,Billy Biggs) + * gtk/gtkwindow.c (gtk_window_present): Use the timestamp of the last user interaction when focusing the window. (#166379, Elijah Newren) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a827090667..1e573a719a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-02-20 Matthias Clasen + * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): + Set have_render_with_trapezoids to GDK_YES when we have + a new enough Render extension. (#167965,Billy Biggs) + * gtk/gtkwindow.c (gtk_window_present): Use the timestamp of the last user interaction when focusing the window. (#166379, Elijah Newren) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a827090667..1e573a719a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-02-20 Matthias Clasen + * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): + Set have_render_with_trapezoids to GDK_YES when we have + a new enough Render extension. (#167965,Billy Biggs) + * gtk/gtkwindow.c (gtk_window_present): Use the timestamp of the last user interaction when focusing the window. (#166379, Elijah Newren) diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 5dc9a40bde..d397911883 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -336,9 +336,8 @@ _gdk_x11_have_render_with_trapezoids (GdkDisplay *display) if (x11display->have_render_with_trapezoids == GDK_UNKNOWN) { - if (!_gdk_x11_have_render (display)) - x11display->have_render_with_trapezoids = GDK_NO; - else + x11display->have_render_with_trapezoids = GDK_NO; + if (_gdk_x11_have_render (display)) { /* * Require protocol >= 0.4 for CompositeTrapezoids support. @@ -350,10 +349,11 @@ _gdk_x11_have_render_with_trapezoids (GdkDisplay *display) if (XRenderQueryVersion (xdisplay, &major_version, &minor_version)) - if ((major_version < XRENDER_TETRAPEZOIDS_MAJOR) || - ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) && - (minor_version < XRENDER_TETRAPEZOIDS_MINOR))) - x11display->have_render_with_trapezoids = GDK_NO; + { + if ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) && + (minor_version >= XRENDER_TETRAPEZOIDS_MINOR)) + x11display->have_render_with_trapezoids = GDK_YES; + } } }