diff options
Diffstat (limited to 'src/compositor/compositor-xrender.c')
| -rw-r--r-- | src/compositor/compositor-xrender.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index e913c937..40347e26 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -24,8 +24,6 @@ #include <config.h> -#ifdef HAVE_COMPOSITE_EXTENSIONS - #include <stdlib.h> #include <string.h> #include <math.h> @@ -2819,22 +2817,18 @@ xrender_add_window (MetaCompositor *compositor, Window xwindow, XWindowAttributes *attrs) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaCompositorXRender *xrc = (MetaCompositorXRender *) compositor; MetaScreen *screen = meta_screen_for_x_screen (attrs->screen); meta_error_trap_push (xrc->display); add_win (screen, window, xwindow); meta_error_trap_pop (xrc->display, FALSE); -#endif } static void xrender_remove_window (MetaCompositor *compositor, Window xwindow) { -#ifdef HAVE_COMPOSITE_EXTENSIONS -#endif } static void @@ -2887,7 +2881,6 @@ static void xrender_manage_screen (MetaCompositor *compositor, MetaScreen *screen) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaCompScreen *info; MetaDisplay *display = meta_screen_get_display (screen); Display *xdisplay = meta_display_get_xdisplay (display); @@ -2966,14 +2959,12 @@ xrender_manage_screen (MetaCompositor *compositor, /* Now we're up and running we can show the output if needed */ show_overlay_window (screen, info->output); -#endif } static void xrender_unmanage_screen (MetaCompositor *compositor, MetaScreen *screen) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaDisplay *display = meta_screen_get_display (screen); Display *xdisplay = meta_display_get_xdisplay (display); MetaCompScreen *info; @@ -3020,7 +3011,6 @@ xrender_unmanage_screen (MetaCompositor *compositor, g_free (info); meta_screen_set_compositor_data (screen, NULL); -#endif } static void @@ -3028,17 +3018,12 @@ xrender_set_updates (MetaCompositor *compositor, MetaWindow *window, gboolean updates) { -#ifdef HAVE_COMPOSITE_EXTENSIONS - -#endif } static void xrender_destroy (MetaCompositor *compositor) { -#ifdef HAVE_COMPOSITE_EXTENSIONS g_free (compositor); -#endif } #if 0 @@ -3053,8 +3038,6 @@ xrender_begin_move (MetaCompositor *compositor, int grab_x, int grab_y) { -#ifdef HAVE_COMPOSITE_EXTENSIONS -#endif } static void @@ -3063,16 +3046,12 @@ xrender_update_move (MetaCompositor *compositor, int x, int y) { -#ifdef HAVE_COMPOSITE_EXTENSIONS -#endif } static void xrender_end_move (MetaCompositor *compositor, MetaWindow *window) { -#ifdef HAVE_COMPOSITE_EXTENSIONS -#endif } #endif /* 0 */ @@ -3080,7 +3059,6 @@ static void xrender_free_window (MetaCompositor *compositor, MetaWindow *window) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaCompositorXRender *xrc; MetaFrame *frame; Window xwindow; @@ -3094,7 +3072,6 @@ xrender_free_window (MetaCompositor *compositor, xwindow = meta_window_get_xwindow (window); destroy_win (xrc->display, xwindow, FALSE); -#endif } static void @@ -3102,7 +3079,6 @@ xrender_process_event (MetaCompositor *compositor, XEvent *event, MetaWindow *window) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaCompositorXRender *xrc = (MetaCompositorXRender *) compositor; /* * This trap is so that none of the compositor functions cause @@ -3165,16 +3141,12 @@ xrender_process_event (MetaCompositor *compositor, #ifndef USE_IDLE_REPAINT repair_display (xrc->display); #endif - - return; -#endif } static cairo_surface_t * xrender_get_window_surface (MetaCompositor *compositor, MetaWindow *window) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaFrame *frame; Window xwindow; MetaScreen *screen; @@ -3206,7 +3178,6 @@ xrender_get_window_surface (MetaCompositor *compositor, return cairo_xlib_surface_create (display, pixmap, cw->attrs.visual, cw->attrs.width, cw->attrs.height); -#endif } static void @@ -3214,7 +3185,6 @@ xrender_set_active_window (MetaCompositor *compositor, MetaScreen *screen, MetaWindow *window) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaCompositorXRender *xrc = (MetaCompositorXRender *) compositor; MetaDisplay *display; Display *xdisplay; @@ -3360,14 +3330,12 @@ xrender_set_active_window (MetaCompositor *compositor, #ifdef USE_IDLE_REPAINT add_repair (display); #endif -#endif } static void xrender_maximize_window (MetaCompositor *compositor, MetaWindow *window) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaFrame *frame = meta_window_get_frame (window); Window xid = frame ? meta_frame_get_xwindow (frame) : meta_window_get_xwindow (window); MetaCompWindow *cw = find_window_in_display (meta_window_get_display (window), xid); @@ -3376,14 +3344,12 @@ xrender_maximize_window (MetaCompositor *compositor, return; cw->needs_shadow = window_has_shadow (cw); -#endif } static void xrender_unmaximize_window (MetaCompositor *compositor, MetaWindow *window) { -#ifdef HAVE_COMPOSITE_EXTENSIONS MetaFrame *frame = meta_window_get_frame (window); Window xid = frame ? meta_frame_get_xwindow (frame) : meta_window_get_xwindow (window); MetaCompWindow *cw = find_window_in_display (meta_window_get_display (window), xid); @@ -3392,7 +3358,6 @@ xrender_unmaximize_window (MetaCompositor *compositor, return; cw->needs_shadow = window_has_shadow (cw); -#endif } static MetaCompositor comp_info = { @@ -3413,7 +3378,6 @@ static MetaCompositor comp_info = { MetaCompositor * meta_compositor_xrender_new (MetaDisplay *display) { -#ifdef HAVE_COMPOSITE_EXTENSIONS const gchar *atom_names[] = { "_XROOTPMAP_ID", "_XSETROOT_ID", @@ -3474,10 +3438,4 @@ meta_compositor_xrender_new (MetaDisplay *display) g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc); return compositor; -#else - return NULL; -#endif } - -#endif /* HAVE_COMPOSITE_EXTENSIONS */ - |