diff options
| author | infirit <[email protected]> | 2015-09-16 11:40:39 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-16 11:40:39 +0200 |
| commit | 0f78f71ba16b975921944c4436e4e4e9400b4b74 (patch) | |
| tree | 460f31c86df6b04b7883d35d68316b79180ef80d | |
| parent | 437b085f123f3c019bca2481000e936ee87e7c31 (diff) | |
| download | marco-0f78f71ba16b975921944c4436e4e4e9400b4b74.tar.bz2 marco-0f78f71ba16b975921944c4436e4e4e9400b4b74.tar.xz | |
Remove more unused functions
| -rw-r--r-- | src/include/ui.h | 14 | ||||
| -rw-r--r-- | src/ui/ui.c | 105 |
2 files changed, 0 insertions, 119 deletions
diff --git a/src/include/ui.h b/src/include/ui.h index a3e4975c..70987d33 100644 --- a/src/include/ui.h +++ b/src/include/ui.h @@ -134,20 +134,6 @@ void meta_ui_window_menu_popup (MetaWindowMenu *menu, guint32 timestamp); void meta_ui_window_menu_free (MetaWindowMenu *menu); -#if !GTK_CHECK_VERSION (3, 0, 0) -MetaImageWindow* meta_image_window_new (Display *xdisplay, - int screen_number, - int max_width, - int max_height); -void meta_image_window_free (MetaImageWindow *iw); -void meta_image_window_set_showing (MetaImageWindow *iw, - gboolean showing); -void meta_image_window_set (MetaImageWindow *iw, - GdkPixbuf *pixbuf, - int x, - int y); -#endif - GdkPixbuf* meta_gdk_pixbuf_get_from_pixmap (GdkPixbuf *dest, Pixmap xpixmap, int src_x, diff --git a/src/ui/ui.c b/src/ui/ui.c index 41273eaa..fd90fe62 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -584,111 +584,6 @@ meta_ui_window_menu_free (MetaWindowMenu *menu) } #if !GTK_CHECK_VERSION (3, 0, 0) -struct _MetaImageWindow -{ - GtkWidget *window; - GdkPixmap *pixmap; -}; - -MetaImageWindow* -meta_image_window_new (Display *xdisplay, - int screen_number, - int max_width, - int max_height) -{ - MetaImageWindow *iw; - GdkDisplay *gdisplay; - GdkScreen *gscreen; - - iw = g_new (MetaImageWindow, 1); - iw->window = gtk_window_new (GTK_WINDOW_POPUP); - - gdisplay = gdk_x11_lookup_xdisplay (xdisplay); - gscreen = gdk_display_get_screen (gdisplay, screen_number); - - gtk_window_set_screen (GTK_WINDOW (iw->window), gscreen); - - gtk_widget_realize (iw->window); - iw->pixmap = gdk_pixmap_new (gtk_widget_get_window (iw->window), - max_width, max_height, - -1); - - gtk_widget_set_size_request (iw->window, 1, 1); - gtk_widget_set_double_buffered (iw->window, FALSE); - gtk_widget_set_app_paintable (iw->window, TRUE); - - return iw; -} - -void -meta_image_window_free (MetaImageWindow *iw) -{ - gtk_widget_destroy (iw->window); - g_object_unref (G_OBJECT (iw->pixmap)); - g_free (iw); -} - -void -meta_image_window_set_showing (MetaImageWindow *iw, - gboolean showing) -{ - if (showing) - gtk_widget_show_all (iw->window); - else - { - gtk_widget_hide (iw->window); - meta_core_increment_event_serial (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); - } -} - -void -meta_image_window_set (MetaImageWindow *iw, - GdkPixbuf *pixbuf, - int x, - int y) -{ - GdkWindow *window; -#if GTK_CHECK_VERSION (3, 0, 0) - cairo_t *cr; -#endif - - /* We use a back pixmap to avoid having to handle exposes, because - * it's really too slow for large clients being minimized, etc. - * and this way flicker is genuinely zero. - */ - -#if !GTK_CHECK_VERSION (3, 0, 0) - gdk_draw_pixbuf (iw->pixmap, - gtk_widget_get_style (iw->window)->black_gc, - pixbuf, - 0, 0, - 0, 0, - gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf), - GDK_RGB_DITHER_NORMAL, - 0, 0); -#else - cr = gdk_cairo_create (iw->pixmap); - gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); - cairo_paint (cr); - cairo_destroy (cr); -#endif - - window = gtk_widget_get_window (iw->window); - gdk_window_set_back_pixmap (window, - iw->pixmap, - FALSE); - - gdk_window_move_resize (window, - x, y, - gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf)); - - gdk_window_clear (window); -} -#endif - -#if !GTK_CHECK_VERSION (3, 0, 0) static GdkColormap* get_cmap (GdkPixmap *pixmap) { |