diff options
| author | monsta <[email protected]> | 2016-10-15 15:39:12 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-10-15 15:39:12 +0300 |
| commit | 40e26ed6d0e9ef84522ad0723f630bd7d796beec (patch) | |
| tree | 67374984e9b7d2c60525976a008889775f7de4f3 /src/compositor/compositor-xrender.c | |
| parent | 3b69fd200912e27ce64caf3bf5d4338aab73177b (diff) | |
| download | marco-40e26ed6d0e9ef84522ad0723f630bd7d796beec.tar.bz2 marco-40e26ed6d0e9ef84522ad0723f630bd7d796beec.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'src/compositor/compositor-xrender.c')
| -rw-r--r-- | src/compositor/compositor-xrender.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index 1da598c5..4ad4a6aa 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -36,9 +36,7 @@ #include <gdk/gdk.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 0, 0) #include <cairo/cairo-xlib.h> -#endif #include "display.h" #include "screen.h" @@ -2802,7 +2800,6 @@ xrender_process_event (MetaCompositor *compositor, #endif } -#if GTK_CHECK_VERSION (3, 0, 0) static cairo_surface_t * xrender_get_window_surface (MetaCompositor *compositor, MetaWindow *window) @@ -2841,28 +2838,6 @@ xrender_get_window_surface (MetaCompositor *compositor, cw->attrs.width, cw->attrs.height); #endif } -#else -static Pixmap -xrender_get_window_pixmap (MetaCompositor *compositor, - MetaWindow *window) -{ -#ifdef HAVE_COMPOSITE_EXTENSIONS - MetaCompWindow *cw = NULL; - MetaScreen *screen = meta_window_get_screen (window); - MetaFrame *frame = meta_window_get_frame (window); - - cw = find_window_for_screen (screen, frame ? meta_frame_get_xwindow (frame) : - meta_window_get_xwindow (window)); - if (cw == NULL) - return None; - - if (meta_window_is_shaded (window)) - return cw->shaded_back_pixmap; - else - return cw->back_pixmap; -#endif -} -#endif /* GTK_CHECK_VERSION */ static void xrender_set_active_window (MetaCompositor *compositor, @@ -3046,11 +3021,7 @@ static MetaCompositor comp_info = { xrender_remove_window, xrender_set_updates, xrender_process_event, -#if GTK_CHECK_VERSION (3, 0, 0) xrender_get_window_surface, -#else - xrender_get_window_pixmap, -#endif xrender_set_active_window, xrender_free_window, xrender_maximize_window, |