fix icon

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@588 b9cfdab3-6d41-4d17-bbe4-086880011989

include/Mw/Icon.h

@@ -87,6 +87,7 @@ MWDECL unsigned int MwIconUp[];
  */
 MWDECL unsigned int MwIconWarning[];
 
+
 #ifdef __cplusplus
 }
 #endif

src/backend/x11.c

@@ -410,11 +410,8 @@ void MwLLNextEvent(MwLL handle) {
 
 			MwLLDispatch(handle, draw, NULL);
 			if(handle->copy_buffer) {
-#if 0
 				XCopyArea(handle->display, handle->pixmap, handle->window, handle->gc, 0, 0, w, h, 0, 0);
-#endif
 				XSetWindowBackgroundPixmap(handle->display, handle->window, handle->pixmap);
-				XClearWindow(handle->display, handle->window);
 			}
 		}
 	}

src/icon/back.c

@@ -443,4 +443,5 @@ unsigned int MwIconBack[] = {
 	0xCCFFFF00,
 	0xCCFFFF00,
 	0xCCFFFF00,
-    0};
+	0
+};

src/icon/computer.c

@@ -259,4 +259,5 @@ unsigned int MwIconComputer[] = {
 	0x00000000,
 	0x00000000,
 	0x00000000,
-    0};
+	0
+};

src/icon/directory.c

@@ -259,4 +259,5 @@ unsigned int MwIconDirectory[] = {
 	0x2B251DFF,
 	0xC0C0C000,
 	0xC0C0C000,
-    0};
+	0
+};

src/icon/down.c

@@ -443,4 +443,5 @@ unsigned int MwIconDown[] = {
 	0xCCFFFF00,
 	0xCCFFFF00,
 	0xCCFFFF00,
-    0};
+	0
+};

src/icon/error.c

@@ -24,7 +24,6 @@ unsigned int MwIconError[] = {
 	0x0000006F,
 	0x00000033,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -110,7 +109,6 @@ unsigned int MwIconError[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x00000058,
 	0x000000DD,
 	0x000000FF,
@@ -299,7 +297,6 @@ unsigned int MwIconError[] = {
 	0x00000000,
 	0x00000000,
 	0x00000002,
-    0x00784314,
 	0x000000E7,
 	0x552422FF,
 	0xCD6963FF,
@@ -563,7 +560,6 @@ unsigned int MwIconError[] = {
 	0x2F0101FF,
 	0x000000E4,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1327,7 +1323,6 @@ unsigned int MwIconError[] = {
 	0x000000FF,
 	0x0000009D,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1375,7 +1370,6 @@ unsigned int MwIconError[] = {
 	0x000000FF,
 	0x0000009E,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1508,7 +1502,6 @@ unsigned int MwIconError[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x000000AB,
 	0x010000FF,
 	0x6A1411FF,
@@ -1524,7 +1517,6 @@ unsigned int MwIconError[] = {
 	0x000000FF,
 	0x000000A9,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1927,7 +1919,6 @@ unsigned int MwIconError[] = {
 	0x00000066,
 	0x0000002C,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1978,7 +1969,6 @@ unsigned int MwIconError[] = {
 	0x00000066,
 	0x0000002C,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2029,7 +2019,6 @@ unsigned int MwIconError[] = {
 	0x00000066,
 	0x0000002C,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2089,7 +2078,6 @@ unsigned int MwIconError[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x000000A9,
 	0x000000FF,
 	0x600806FF,
@@ -2319,4 +2307,5 @@ unsigned int MwIconError[] = {
 	0x00000000,
 	0x00000000,
 	0x00000000,
-    0};
+	0
+};

src/icon/file.c

@@ -259,4 +259,5 @@ unsigned int MwIconFile[] = {
 	0xC0C0C000,
 	0xC0C0C000,
 	0xC0C0C000,
-    0};
+	0
+};

src/icon/forward.c

@@ -443,4 +443,5 @@ unsigned int MwIconForward[] = {
 	0xCCFFFF00,
 	0xCCFFFF00,
 	0xCCFFFF00,
-    0};
+	0
+};

src/icon/info.c

@@ -62,7 +62,6 @@ unsigned int MwIconInfo[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x00000076,
 	0x000000F2,
 	0x000001FF,
@@ -75,7 +74,6 @@ unsigned int MwIconInfo[] = {
 	0x000000F1,
 	0x00000073,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -655,7 +653,6 @@ unsigned int MwIconInfo[] = {
 	0x000000FF,
 	0x0000006C,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1451,7 +1448,6 @@ unsigned int MwIconInfo[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x00000065,
 	0x000000EE,
 	0x020305FF,
@@ -1590,7 +1586,6 @@ unsigned int MwIconInfo[] = {
 	0x00000047,
 	0x00000024,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1937,7 +1932,6 @@ unsigned int MwIconInfo[] = {
 	0x00000000,
 	0x00000000,
 	0x00000002,
-    0x00784314,
 	0x00000055,
 	0x000000DF,
 	0x000000FF,
@@ -2237,7 +2231,6 @@ unsigned int MwIconInfo[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x00000051,
 	0x000000D7,
 	0x000000FF,
@@ -2288,7 +2281,6 @@ unsigned int MwIconInfo[] = {
 	0x00000000,
 	0x00000000,
 	0x00000002,
-    0x00784314,
 	0x00000055,
 	0x000000DF,
 	0x000000F4,
@@ -2315,4 +2307,5 @@ unsigned int MwIconInfo[] = {
 	0x00000000,
 	0x00000000,
 	0x00000000,
-    0};
+	0
+};

src/icon/left.c

@@ -443,4 +443,5 @@ unsigned int MwIconLeft[] = {
 	0xCCFFFF00,
 	0xCCFFFF00,
 	0xCCFFFF00,
-    0};
+	0
+};

src/icon/news.c

@@ -522,7 +522,6 @@ unsigned int MwIconNews[] = {
 	0x262624FF,
 	0x010101E0,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -782,7 +781,6 @@ unsigned int MwIconNews[] = {
 	0x00000000,
 	0x00000000,
 	0x00000002,
-    0x00784314,
 	0x02020286,
 	0x010101EF,
 	0x010101FF,
@@ -1442,7 +1440,6 @@ unsigned int MwIconNews[] = {
 	0x00000074,
 	0x00000046,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1724,7 +1721,6 @@ unsigned int MwIconNews[] = {
 	0x00000074,
 	0x00000046,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2148,7 +2144,6 @@ unsigned int MwIconNews[] = {
 	0x00000074,
 	0x0000004F,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2196,7 +2191,6 @@ unsigned int MwIconNews[] = {
 	0x0000006C,
 	0x00000041,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2243,7 +2237,6 @@ unsigned int MwIconNews[] = {
 	0x00000022,
 	0x00000014,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2314,4 +2307,5 @@ unsigned int MwIconNews[] = {
 	0x00000000,
 	0x00000000,
 	0x00000000,
-    0};
+	0
+};

src/icon/note.c

@@ -84,7 +84,6 @@ unsigned int MwIconNote[] = {
 	0x010000C3,
 	0x00000056,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -477,7 +476,6 @@ unsigned int MwIconNote[] = {
 	0x231D00FF,
 	0x010000D2,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1456,7 +1454,6 @@ unsigned int MwIconNote[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x0200008D,
 	0x010000FF,
 	0x594F00FF,
@@ -1484,7 +1481,6 @@ unsigned int MwIconNote[] = {
 	0x010000FF,
 	0x0200008B,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1827,7 +1823,6 @@ unsigned int MwIconNote[] = {
 	0x0000000E,
 	0x00000008,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -1896,7 +1891,6 @@ unsigned int MwIconNote[] = {
 	0x00000000,
 	0x00000000,
 	0x00000002,
-    0x00784314,
 	0x0000008E,
 	0x010000FF,
 	0x010000FF,
@@ -1976,7 +1970,6 @@ unsigned int MwIconNote[] = {
 	0x00000012,
 	0x0000000A,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2073,7 +2066,6 @@ unsigned int MwIconNote[] = {
 	0x00000012,
 	0x0000000A,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2091,7 +2083,6 @@ unsigned int MwIconNote[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x00000047,
 	0x010000FF,
 	0x6F6F6FFF,
@@ -2141,7 +2132,6 @@ unsigned int MwIconNote[] = {
 	0x00000000,
 	0x00000000,
 	0x00000001,
-    0x00392157,
 	0x010000D3,
 	0x191818FF,
 	0xBFBFBFFF,
@@ -2262,7 +2252,6 @@ unsigned int MwIconNote[] = {
 	0x0000000C,
 	0x00000008,
 	0x00000002,
-    0x00784314,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2307,7 +2296,6 @@ unsigned int MwIconNote[] = {
 	0x00000005,
 	0x00000003,
 	0x00000001,
-    0x00392157,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -2319,4 +2307,5 @@ unsigned int MwIconNote[] = {
 	0x00000000,
 	0x00000000,
 	0x00000000,
-    0};
+	0
+};

src/icon/right.c

@@ -443,4 +443,5 @@ unsigned int MwIconRight[] = {
 	0xCCFFFF00,
 	0xCCFFFF00,
 	0xCCFFFF00,
-    0};
+	0
+};

src/icon/search.c

@@ -1,4 +1,4 @@
-/* $Id: icon.sh 514 2025-10-30 02:54:50Z nishi $ */
+/* $Id: icon.sh 538 2025-10-31 21:18:11Z nishi $ */
 #include <Mw/Milsko.h>
 
 unsigned int MwIconSearch[] = {
@@ -443,4 +443,5 @@ unsigned int MwIconSearch[] = {
 	0x000000FF,
 	0xCCFFFF00,
 	0xCCFFFF00,
-    0};
+	0
+};

src/icon/up.c

@@ -443,4 +443,5 @@ unsigned int MwIconUp[] = {
 	0xCCFFFF00,
 	0xCCFFFF00,
 	0xCCFFFF00,
-    0};
+	0
+};

src/icon/warning.c

@@ -2307,4 +2307,5 @@ unsigned int MwIconWarning[] = {
 	0x00000000,
 	0x00000000,
 	0x00000000,
-    0};
+	0
+};

tools/icon.sh

@@ -31,7 +31,7 @@ for i in resource/icon/*.png; do
 	echo >> $OUT
 	echo "unsigned int $NAME[] = {" >> $OUT
 	echo "	($WIDTH << 16) | $HEIGHT," >> $OUT
-	convert $i txt:- 2>/dev/null | grep -oE '[0-9a-fA-F]{8}' | xargs printf '	0x%s,\n' >> $OUT
+	convert $i txt:- 2>/dev/null | grep -oE '#[0-9a-fA-F]{8}' | sed 's/^#/	0x/' | sed -E 's/$/,/' >> $OUT
 	echo "	0" >> $OUT
 	echo "};" >> $OUT
 	echo $NAME