提交: ffd378e47ff29c9830c7cb9d4262df58117fa14f - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修訂: ffd378e47ff29c9830c7cb9d4262df58117fa14f (tree)
• 時間: 2015-01-31 02:02:43
• 作者: Chris 'Nano' Bratusek <Nanolx@user...>
• Commiter: Chris 'Nano' Bratusek

Log Message

Merge pull request #11 from hans1024/master

using NET_WM_ICON to get 16x16 icons

Change Summary

• modified: lisp/sawfish/wm/ext/cabinet.jl
• modified: lisp/sawfish/wm/util/display-wininfo.jl
• modified: src/images.c
• modified: src/sawfish.h
• modified: src/sawfish_subrs.h
• modified: src/windows.c

差異

--- a/lisp/sawfish/wm/ext/cabinet.jl
+++ b/lisp/sawfish/wm/ext/cabinet.jl
@@ -396,8 +396,8 @@
            (t cabinet:default-item-forground))))
 
   (define (cabinet-item-format w)
-    (let ((item (cons (if (window-icon-image w)
-                          (window-icon-image w)
+    (let ((item (cons (if (window-icon-image w 32)
+                          (window-icon-image w 32)
                         (require 'rep.io.files)
                         (if (file-exists-p (concat (car (cdr image-load-path)) "/" "cabinet-missing.png"))
                             (make-image (concat (cdr image-load-path) "cabinet-missing.png"))))

--- a/lisp/sawfish/wm/util/display-wininfo.jl
+++ b/lisp/sawfish/wm/util/display-wininfo.jl
@@ -110,7 +110,7 @@ If W is nil previous window is removed."
 
     (when w
       (let* ((text (make-text-item (window-info w) default-font))
-	     (icon (let ((i (window-icon-image w)))
+	     (icon (let ((i (window-icon-image w 32)))
 		     (and i (scale-image i (car icon-size) (cdr icon-size)))))
 	     (icon-dims (if icon icon-size '(0 . 0)))
 	     (win-size (cons (+ (car icon-dims)

--- a/src/images.c
+++ b/src/images.c
@@ -990,6 +990,49 @@ defines the color of its pixels.
     return Qnil;
 }
 
+#ifdef HAVE_GDK_PIXBUF
+static void
+argbdata_to_pixdata (gulong * argb_data, int len, unsigned char ** pixdata)
+{
+    guchar *p;
+    guint argb;
+    guint rgba;
+    int i;
+
+    *pixdata = rep_alloc (len * 4);
+    p = *pixdata;
+
+    i = 0;
+    while (i < len)
+    {
+        argb = argb_data[i];
+        rgba = (argb << 8) | (argb >> 24);
+
+        *p = rgba >> 24; ++p;
+        *p = (rgba >> 16) & 0xff; ++p;
+        *p = (rgba >> 8) & 0xff; ++p;
+        *p = rgba & 0xff; ++p;
+
+        ++i;
+    }
+}
+
+repv make_image_from_data (long * data, int size)
+{
+    unsigned char * pixdata;
+    argbdata_to_pixdata(data, size * size, &pixdata);
+
+    GdkPixbuf * img = gdk_pixbuf_new_from_data(pixdata,
+					       GDK_COLORSPACE_RGB,
+					       TRUE, 8,
+					       size, size,
+					       size * 4,
+					       free_pixbuf_data,
+					       pixdata);
+    return make_image(img, Qnil);
+}
+#endif
+
 DEFUN("tile-image", Ftile_image, Stile_image, (repv dst, repv src), rep_Subr2) /*
 ::doc:sawfish.wm.images#tile-image::
 tile-image DEST-IMAGE SOURCE-IMAGE

--- a/src/sawfish.h
+++ b/src/sawfish.h
@@ -157,6 +157,7 @@ typedef struct lisp_window {
     repv net_name, net_icon_name;
     int frame_vis;
     repv icon_image;
+    int icon_size;
 
     /* Frame data */
     Window frame; /* Reparenter window */

--- a/src/sawfish_subrs.h
+++ b/src/sawfish_subrs.h
@@ -230,6 +230,9 @@ extern int image_channels (Lisp_Image *im);
 extern void image_changed (Lisp_Image *im);
 extern void images_init (void);
 extern void images_kill (void);
+#ifdef HAVE_GDK_PIXBUF
+extern repv make_image_from_data (long * data, int size);
+#endif
 
 /* from keys.c */
 extern repv Qglobal_keymap, Qunbound_key_hook, Qkeymap;

--- a/src/windows.c
+++ b/src/windows.c
@@ -1404,7 +1404,7 @@ out:
 }
 
 DEFUN("window-icon-image", Fwindow_icon_image,
-      Swindow_icon_image, (repv win), rep_Subr1) /*
+      Swindow_icon_image, (repv args), rep_SubrN) /*
 ::doc:sawfish.wm.windows.subrs#window-icon-image::
 window-icon-image WINDOW
 
@@ -1412,10 +1412,59 @@ Returns an image object representing the icon currently associated with
 WINDOW. Returns the symbol `nil' if no such image.
 ::end:: */
 {
+   if (!rep_CONSP(args))
+       return rep_signal_missing_arg (1);
+   repv win = rep_CAR(args);
    rep_DECLARE1 (win, WINDOWP);
 
-   if (VWIN (win)->icon_image == rep_NULL)
+   int iconsize = 16;
+   if (rep_CONSP(rep_CDR(args)) && rep_INTP(rep_CAR(rep_CDR(args))))
    {
+       iconsize = rep_INT(rep_CAR(rep_CDR(args)));
+   }
+
+   if (VWIN (win)->icon_image == rep_NULL || VWIN (win)->icon_size != iconsize)
+   {
+       VWIN (win)->icon_size = iconsize;
+
+       #ifdef HAVE_GDK_PIXBUF
+       if (!WINDOW_IS_GONE_P (VWIN (win)))
+       {
+	   Atom actual_type;
+	   int actual_format;
+	   unsigned long nitems, bytes_after;
+	   union {
+	       unsigned long *l;
+	       unsigned char *c;
+	   } data;
+
+	   static Atom net_wm_icon = 0;
+
+	   if (net_wm_icon == 0)
+	       net_wm_icon = XInternAtom (dpy, "_NET_WM_ICON", False);
+
+	   data.l = 0;
+	   if (XGetWindowProperty (dpy, VWIN (win)->id, net_wm_icon,
+				   0L, G_MAXLONG, False, AnyPropertyType,
+				   &actual_type, &actual_format,
+				   &nitems, &bytes_after,
+				   &data.c) == Success)
+	   {
+	       int i;
+	       for (i = 0; i < nitems; i += 2 + data.l[i] * data.l[i + 1])
+		   if (data.l[i] == iconsize && data.l[i + 1] == iconsize)
+		   {
+			VWIN (win)->icon_image =
+				make_image_from_data(&(data.l[i + 2]), iconsize);
+			XFree (data.l);
+			return VWIN (win)->icon_image;
+		   }
+	   }
+	   if (data.l != 0)
+	       XFree (data.l);
+       }
+       #endif
+
        Window pixmap_id = 0, mask_id = 0;
 
        if (VWIN (win)->wmhints != 0)