---
 wmcliphist/Makefile                |   8 +++----
 wmcliphist/gui.c                   |   4 ----
 wmcliphist/icon/ico_16x16.xcf.bz2  | Bin 383 -> 0 bytes
 wmcliphist/icon/ico_16x16_mask.xbm |   7 ------
 wmcliphist/icon/ico_30x30.xcf.bz2  | Bin 2134 -> 0 bytes
 wmcliphist/icon/ico_30x30_mask.xbm |  14 ------------
 wmcliphist/icon/ico_40x40.xcf.bz2  | Bin 3309 -> 0 bytes
 wmcliphist/icon/ico_40x40_mask.xbm |  21 ------------------
 wmcliphist/icon/ico_60x60.xcf.bz2  | Bin 5612 -> 0 bytes
 wmcliphist/icon/ico_60x60_mask.xbm |  44 -------------------------------------
 wmcliphist/wmcliphist.c            |  33 ++++++++--------------------
 wmcliphist/wmcliphist.h            |   4 ----
 12 files changed, 12 insertions(+), 123 deletions(-)
 delete mode 100644 wmcliphist/icon/ico_16x16.xcf.bz2
 delete mode 100644 wmcliphist/icon/ico_16x16_mask.xbm
 delete mode 100644 wmcliphist/icon/ico_30x30.xcf.bz2
 delete mode 100644 wmcliphist/icon/ico_30x30_mask.xbm
 delete mode 100644 wmcliphist/icon/ico_40x40.xcf.bz2
 delete mode 100644 wmcliphist/icon/ico_40x40_mask.xbm
 delete mode 100644 wmcliphist/icon/ico_60x60.xcf.bz2
 delete mode 100644 wmcliphist/icon/ico_60x60_mask.xbm

diff --git a/wmcliphist/Makefile b/wmcliphist/Makefile
index 2b0eb3b..109834c 100644
--- a/wmcliphist/Makefile
+++ b/wmcliphist/Makefile
@@ -3,7 +3,7 @@ INSTALL = install
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 DATADIR = $(PREFIX)/share/wmcliphist
-INCLUDES = `pkg-config --cflags gtk+-2.0 x11`
+INCLUDES = `pkg-config --cflags gtk+-3.0 x11`
 
 # for normal use
 CFLAGS += -Wall -ansi -pedantic $(INCLUDES) -DDATADIR=\"$(DATADIR)\"
@@ -15,7 +15,7 @@ DEBUG =
 #CFLAGS += -Wall -g -ansi $(INCLUDES) -DFNCALL_DEBUG
 #DEBUG = debug.o
 
-LIBS = `pkg-config --libs gtk+-2.0 x11`
+LIBS = `pkg-config --libs gtk+-3.0 x11`
 
 OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o 
utils.o $(DEBUG)
 TARGET = wmcliphist
@@ -34,9 +34,7 @@ lclint:
 wmcliphist: $(OBJECTS)
        $(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
 
-wmcliphist.o: wmcliphist.c wmcliphist.h \
-       icon/ico_60x60_mask.xbm icon/ico_40x40_mask.xbm \
-       icon/ico_30x30_mask.xbm icon/ico_16x16_mask.xbm
+wmcliphist.o: wmcliphist.c wmcliphist.h
 
 clipboard.o: clipboard.c wmcliphist.h
 
diff --git a/wmcliphist/gui.c b/wmcliphist/gui.c
index 550a0d9..0b02b5e 100644
--- a/wmcliphist/gui.c
+++ b/wmcliphist/gui.c
@@ -34,10 +34,6 @@ GtkWidget    *button;
 
 /* pixmap */
 GtkWidget      *pixmap;
-GdkPixmap      *icon;
-GdkBitmap      *icon_mask;
-GdkBitmap      *mask;
-
 
 /* ==========================================================================
  *                                                     clipboard history menu
diff --git a/wmcliphist/icon/ico_16x16.xcf.bz2 
b/wmcliphist/icon/ico_16x16.xcf.bz2
deleted file mode 100644
index 
ee1e4fc823e5e863e81e92dbdf60a79de076e60e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmV-_0f7EOT4*^jL0KkKSx&l)#sC2Z|NsB~{QyV+2mla(01T_H(ZE0;KmY&;AOHXa
z0RR91fLpKuY&OI+l>HRYG;K80*+I1c3Ik0t0ijdVP}-Q9XwxGE$Y=vi8W<!=G$SPR
z)Wm2s83uqDnKXlu+|>~Uy@sS?qY6?K(*Tz%CTnlLH-nx$L>K!q!j#-pNe)mU8JZ5j
z_Yc5<K%iY%#@}4$IEbW03`;_0&4eXdw<C!?0w4?O-F^sm6#-iY!LcgBn&T^1U38`)
zf(pY*3MicdHlem9GEf*@2rW5e1uo>bib9a87}yBhGy!N3*xMAPr%ry9CTbJB2Z+gr
zi_=QlBD@70mQ!t2)#CKCdQ3vUb~@GpKnNO92RcdA3B)dBeh5%Tq@=W<!P0me_*GUS
zv4jIPJMX^SWW{<P3MolS15z?F^NCr+kx{JAj|>XHXu=jV5C*Yc)6N8v%##&{RG>`3
dY_7?zBWWCzq+AyO&>2thcO+AV2?Xn?%wSW*nWq2%

diff --git a/wmcliphist/icon/ico_16x16_mask.xbm 
b/wmcliphist/icon/ico_16x16_mask.xbm
deleted file mode 100644
index 3b82ead..0000000
--- a/wmcliphist/icon/ico_16x16_mask.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Created with The GIMP */
-#define ico_16x16_mask_width 16
-#define ico_16x16_mask_height 16
-static unsigned char ico_16x16_mask_bits[] = {
-   0xc0, 0x03, 0xf8, 0x1f, 0xfc, 0x3f, 0xfc, 0x7f, 0xfc, 0x7f, 0xfc, 0x7f,
-   0xfc, 0x7f, 0xfc, 0x7f, 0xfc, 0x7f, 0xfc, 0x7f, 0xfc, 0x7f, 0xfc, 0x7f,
-   0xfc, 0x7f, 0xfc, 0x7f, 0xf8, 0x7f, 0xf0, 0x3f };
diff --git a/wmcliphist/icon/ico_30x30.xcf.bz2 
b/wmcliphist/icon/ico_30x30.xcf.bz2
deleted file mode 100644
index 
6bb2f1117d3f84c898888ffee8ceddae1520d899..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2134
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
Mk}1N3g~^z>KzaAw`~Uy|

diff --git a/wmcliphist/icon/ico_30x30_mask.xbm 
b/wmcliphist/icon/ico_30x30_mask.xbm
deleted file mode 100644
index fd44d1b..0000000
--- a/wmcliphist/icon/ico_30x30_mask.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Created with The GIMP */
-#define ico_30x30_mask_width 30
-#define ico_30x30_mask_height 30
-static unsigned char ico_30x30_mask_bits[] = {
-   0x00, 0xf8, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0xfc, 0x03, 0x00,
-   0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07,
-   0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07,
-   0xfc, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x07,
-   0xfe, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x07,
-   0xfc, 0xff, 0xff, 0x07, 0xfc, 0xff, 0xff, 0x07, 0xfc, 0xff, 0xff, 0x07,
-   0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07,
-   0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07,
-   0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/wmcliphist/icon/ico_40x40.xcf.bz2 
b/wmcliphist/icon/ico_40x40.xcf.bz2
deleted file mode 100644
index 
22425beca57aa6623f1c89abf00ea51c0497a639..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3309
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

diff --git a/wmcliphist/icon/ico_40x40_mask.xbm 
b/wmcliphist/icon/ico_40x40_mask.xbm
deleted file mode 100644
index 559724e..0000000
--- a/wmcliphist/icon/ico_40x40_mask.xbm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Created with The GIMP */
-#define ico_40x40_mask_width 40
-#define ico_40x40_mask_height 40
-static unsigned char ico_40x40_mask_bits[] = {
-   0x00, 0x80, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0xe0,
-   0x7f, 0x00, 0x00, 0x00, 0xe0, 0xfb, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff,
-   0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0,
-   0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff,
-   0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f,
-   0xf0, 0xff, 0xff, 0xff, 0x0f, 0xfc, 0xff, 0xff, 0xff, 0x0f, 0xfe, 0xff,
-   0xff, 0xff, 0x0f, 0xfe, 0xff, 0xff, 0xff, 0x0f, 0xfe, 0xff, 0xff, 0xff,
-   0x0f, 0xfe, 0xff, 0xff, 0xff, 0x0f, 0xfe, 0xff, 0xff, 0xff, 0x0f, 0xfc,
-   0xff, 0xff, 0xff, 0x0f, 0xfc, 0xff, 0xff, 0xff, 0x0f, 0xfc, 0xff, 0xff,
-   0xff, 0x0f, 0xf8, 0xff, 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0xff, 0x0f,
-   0xf8, 0xff, 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff,
-   0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff,
-   0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0,
-   0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff,
-   0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0x0f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/wmcliphist/icon/ico_60x60.xcf.bz2 
b/wmcliphist/icon/ico_60x60.xcf.bz2
deleted file mode 100644
index 
2ec31670934139774fee44f430aeb683aff03abe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5612
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
GKJ~y}0*><l

diff --git a/wmcliphist/icon/ico_60x60_mask.xbm 
b/wmcliphist/icon/ico_60x60_mask.xbm
deleted file mode 100644
index 42ac06e..0000000
--- a/wmcliphist/icon/ico_60x60_mask.xbm
+++ /dev/null
@@ -1,44 +0,0 @@
-#define ico_60x60_mask_width 60
-#define ico_60x60_mask_height 60
-static unsigned char ico_60x60_mask_bits[] = {
-  0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff,
-  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x03, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xe0, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff,
-  0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xe7, 0x1f, 0x00, 0x00, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xe0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xfc, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xfc, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xe0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  };
diff --git a/wmcliphist/wmcliphist.c b/wmcliphist/wmcliphist.c
index e167f6b..63d276e 100644
--- a/wmcliphist/wmcliphist.c
+++ b/wmcliphist/wmcliphist.c
@@ -4,11 +4,6 @@
 
 #include "wmcliphist.h"
 
-#include "icon/ico_60x60_mask.xbm"
-#include "icon/ico_40x40_mask.xbm"
-#include "icon/ico_30x30_mask.xbm"
-#include "icon/ico_16x16_mask.xbm"
-
 /*
  * print some help
  */
@@ -195,11 +190,6 @@ main(int argc, char **argv)
                /* create icon_mask */
                if (icon_size == 60) {
                        /* 60x60 icon */
-                       icon_mask = 
gdk_bitmap_create_from_data(gtk_widget_get_window(main_window),
-                                       (gchar *) ico_60x60_mask_bits,
-                                       ico_60x60_mask_width,
-                                       ico_60x60_mask_height);
-                       /* create icon */
                        if (icon_number == 0) {
                                icon_file = "ico_60x60_gray.png";
                        } else if (icon_number == 1) {
@@ -209,10 +199,6 @@ main(int argc, char **argv)
                        }
                } else if (icon_size == 40) {
                        /* 40x40 icon */
-                       icon_mask = 
gdk_bitmap_create_from_data(gtk_widget_get_window(main_window),
-                                       (gchar *) ico_40x40_mask_bits,
-                                       ico_40x40_mask_width,
-                                       ico_40x40_mask_height);
                        /* create icon */
                        if (icon_number == 0) {
                                icon_file = "ico_40x40_gray.png";
@@ -223,10 +209,6 @@ main(int argc, char **argv)
                        }
                } else if (icon_size == 30) {
                        /* 30x30 icon */
-                       icon_mask = 
gdk_bitmap_create_from_data(gtk_widget_get_window(main_window),
-                                       (gchar *) ico_30x30_mask_bits,
-                                       ico_30x30_mask_width,
-                                       ico_30x30_mask_height);
                        /* create icon */
                        if (icon_number == 0) {
                                icon_file = "ico_30x30_gray.png";
@@ -237,10 +219,6 @@ main(int argc, char **argv)
                        }
                } else {
                        /* 16x16 icon */
-                       icon_mask = 
gdk_bitmap_create_from_data(gtk_widget_get_window(main_window),
-                                       (gchar *) ico_16x16_mask_bits,
-                                       ico_16x16_mask_width,
-                                       ico_16x16_mask_height);
                        /* create icon */
                        icon_file = "ico_16x16.png";
                }
@@ -365,6 +343,9 @@ main(int argc, char **argv)
 
 
        if (icon_size) {
+               cairo_region_t *region;
+               cairo_surface_t *surface;
+
                /* connect signal for menu popup */
                gtk_widget_add_events(dock_app, GDK_BUTTON_PRESS_MASK);
                g_signal_connect(G_OBJECT(dock_app),
@@ -372,8 +353,12 @@ main(int argc, char **argv)
                                G_CALLBACK(button_press),
                                G_OBJECT(menu_hist));
 
-               
gdk_window_shape_combine_mask(gtk_widget_get_window(main_window), icon_mask, 0, 
0);
-               gdk_window_shape_combine_mask(gtk_widget_get_window(dock_app), 
icon_mask, 0, 0);
+               surface = cairo_image_surface_create_from_png(icon_file);
+               region = gdk_cairo_region_create_from_surface(surface);
+               gdk_window_shape_combine_region(gtk_widget_get_window(dock_app),
+                                               region, 0, 0);
+
+
        }
 
 
diff --git a/wmcliphist/wmcliphist.h b/wmcliphist/wmcliphist.h
index 29b101b..0ea3c7d 100644
--- a/wmcliphist/wmcliphist.h
+++ b/wmcliphist/wmcliphist.h
@@ -280,10 +280,6 @@ extern GtkWidget   *button;
 
 /* pixmap */
 extern GtkWidget       *pixmap;
-extern GdkPixmap       *icon;
-extern GdkBitmap       *icon_mask;
-extern GdkBitmap       *mask;
-
 
 /*
  * dock button click response
-- 
2.1.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

Reply via email to