wallpaper mode Transparent UNSTABLE #269

IgnorantGuru · Apr 2, 2013 · 5e4e148 · 5e4e148
1 parent 738522e
commit 5e4e148
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 2 deletions.
diff --git a/data/ui/prefdlg.ui b/data/ui/prefdlg.ui
@@ -129,6 +129,9 @@
       <row>
         <col id="0" translatable="yes">Zoom</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">Transparent</col>
+      </row>
     </data>
   </object>
   <object class="GtkListStore" id="modelsu">

diff --git a/data/ui/prefdlg2.ui b/data/ui/prefdlg2.ui
@@ -129,6 +129,9 @@
       <row>
         <col id="0" translatable="yes">Zoom</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">Transparent</col>
+      </row>
     </data>
   </object>
   <object class="GtkListStore" id="modelsu">

diff --git a/src/desktop/desktop-window.c b/src/desktop/desktop-window.c
@@ -755,6 +755,43 @@ void desktop_window_set_background( DesktopWindow* win, GdkPixbuf* src_pix, DWBg
         gdk_window_set_back_pixmap( gtk_widget_get_window( ((GtkWidget*)win) ), pixmap, FALSE );
 #endif
     }
+    else if ( type == DW_BG_TRANSPARENT )
+    {
+        int dest_w = gdk_screen_get_width( 
+                                gtk_widget_get_screen( (GtkWidget*)win ) );
+        int dest_h = gdk_screen_get_height( 
+                                gtk_widget_get_screen( (GtkWidget*)win ) );
+#if GTK_CHECK_VERSION (3, 0, 0)
+        pixmap = XCreatePixmap(xdisplay, xroot, dest_w, dest_h, depth);
+        surface = cairo_xlib_surface_create (xdisplay, pixmap, xvisual,
+                                             dest_w, dest_h);
+        cr = cairo_create ( surface );
+#else
+        // set rgba colormap for GTK2
+        gtk_widget_set_default_colormap( gdk_screen_get_rgba_colormap( 
+                                gtk_widget_get_screen( (GtkWidget*)win ) ) );
+
+        pixmap = gdk_pixmap_new( gtk_widget_get_window( ((GtkWidget*)win) ),
+                                 dest_w, dest_h, -1 );
+        cr = gdk_cairo_create ( pixmap );
+#endif
+        cairo_save( cr );
+        cairo_set_operator( cr, CAIRO_OPERATOR_SOURCE );
+        cairo_set_source_rgba( cr, 0.0, 0.0, 0.0, 0.0 );
+        cairo_rectangle( cr, 0, 0, dest_w, dest_h );
+        cairo_paint( cr );
+        cairo_restore( cr );
+
+        // free
+#if GTK_CHECK_VERSION (3, 0, 0)
+        XFreePixmap ( xdisplay, pixmap );
+        pixmap = 0;
+#else
+        g_object_unref( pixmap );
+        pixmap = NULL;
+#endif
+        cairo_destroy ( cr );
+    }
     else
         gdk_window_set_background( gtk_widget_get_window( ((GtkWidget*)win) ), &win->bg );
 

diff --git a/src/desktop/desktop-window.h b/src/desktop/desktop-window.h
@@ -62,6 +62,7 @@ typedef enum {
     DW_BG_STRETCH,
     DW_BG_CENTER,
     DW_BG_ZOOM,
+    DW_BG_TRANSPARENT
 }DWBgType;
 
 typedef enum {

diff --git a/src/desktop/desktop.c b/src/desktop/desktop.c
@@ -130,7 +130,13 @@ void fm_desktop_update_wallpaper()
     GdkPixbuf* pix;
     int i;
 
-    if( app_settings.show_wallpaper && app_settings.wallpaper )
+    if ( app_settings.show_wallpaper && 
+                            app_settings.wallpaper_mode == WPM_TRANSPARENT )
+    {
+        type = DW_BG_TRANSPARENT;
+        pix = NULL;
+    }
+    else if( app_settings.show_wallpaper && app_settings.wallpaper )
     {
         switch( app_settings.wallpaper_mode )
         {

diff --git a/src/settings.h b/src/settings.h
@@ -16,7 +16,8 @@ typedef enum {
     WPM_FULL,
     WPM_CENTER,
     WPM_TILE,
-    WPM_ZOOM
+    WPM_ZOOM,
+    WPM_TRANSPARENT
 }WallpaperMode;
 
 typedef struct