From 72ba706b3139535e7e1b05569952d5991f6ddf66 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Fri, 10 Oct 2025 16:53:51 +0000 Subject: [PATCH] icon git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@256 b9cfdab3-6d41-4d17-bbe4-086880011989 --- doc/index.html | 76 ++++++++++++++++++++++++++++++++++++++++++ include/Mw/Icon.h | 39 ++++++++++++++++++++++ include/Mw/Milsko.h | 1 + src/icon/info.c | 81 ++++++++++++++++++++++----------------------- src/icon/note.c | 81 ++++++++++++++++++++++----------------------- src/icon/question.c | 77 +++++++++++++++++++++--------------------- src/icon/warning.c | 81 ++++++++++++++++++++++----------------------- tools/icon.sh | 29 +++++++++++++++- 8 files changed, 302 insertions(+), 163 deletions(-) create mode 100644 include/Mw/Icon.h diff --git a/doc/index.html b/doc/index.html index 4145313..bb0d513 100644 --- a/doc/index.html +++ b/doc/index.html @@ -170,6 +170,12 @@
MwGetColor
+
+ MwLoadRaw +
+
+ MwLoadXPM +
Mw/Error.h
@@ -1629,6 +1635,76 @@
+
MWDECL MwLLPixmap MwLoadRaw (
+	MwWidget handle,
+	unsigned char* rgb,
+	int width,
+	int height
+);
+
+
+ Creates a pixmap from raw data. +
+
+ Parameter handle +
+
+ Widget. +
+
+ Parameter rgb +
+
+ RGBA data. +
+
+ Parameter width +
+
+ Width. +
+
+ Parameter height +
+
+ Height. +
+
+ Returns +
+
+ Pixmap. +
+
+
+
MWDECL MwLLPixmap MwLoadXPM (
+	MwWidget handle,
+	char** data
+);
+
+
+ Creates a pixmap from XPM data. +
+
+ Parameter handle +
+
+ Widget. +
+
+ Parameter data +
+
+ Data. +
+
+ Returns +
+
+ Pixmap. +
+
+

Mw/Error.h

diff --git a/include/Mw/Icon.h b/include/Mw/Icon.h new file mode 100644 index 0000000..5ebdbc1 --- /dev/null +++ b/include/Mw/Icon.h @@ -0,0 +1,39 @@ +/* $Id$ */ +/*! + * %file Mw/Icon.h + * %brief Icon + */ +#ifndef __MW_ICON_H__ +#define __MW_ICON_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/*! + * %brief Info icon + */ +MWDECL char* MwIconInfo[]; + +/*! + * %brief Note icon + */ +MWDECL char* MwIconNote[]; + +/*! + * %brief Question icon + */ +MWDECL char* MwIconQuestion[]; + +/*! + * %brief Warning icon + */ +MWDECL char* MwIconWarning[]; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/Mw/Milsko.h b/include/Mw/Milsko.h index 8450b76..4984b3b 100644 --- a/include/Mw/Milsko.h +++ b/include/Mw/Milsko.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/src/icon/info.c b/src/icon/info.c index 6fe52ad..f76e189 100644 --- a/src/icon/info.c +++ b/src/icon/info.c @@ -2,44 +2,43 @@ #include /* XPM */ -char *MwIconInfo[] = { -/* columns rows colors chars-per-pixel */ -"32 32 4 1 ", -" c black", -". c #6632F7", -"X c white", -"o c None", -/* pixels */ -"oooooooooooooooooooooooooooooooo", -"ooooooooooo oooooooooooo", -"ooooooooo ooooooooo", -"ooooooo ......... oooooooo", -"oooooo ............. oooooo", -"ooooo ................ ooooo", -"oooo ........XX........ ooooo", -"ooo ........XXXX........ oooo", -"ooo .........XXXX......... ooo", -"oo ..........XXXX......... ooo", -"oo ...........XX........... oo", -"o ......................... oo", -"o ...........XXXX.......... oo", -"o ...........XXXX........... o", -"o ...........XXXX........... o", -"o ...........XXXX........... o", -"o ...........XXXX........... o", -"o ...........XXXX........... o", -"o ...........XXXX.......... oo", -"o ...........XXXX.......... oo", -"oo ..........XXXX.......... oo", -"oo ..........XXXX......... oo", -"oo .........XXXX......... ooo", -"ooo .........XXXX........ ooo", -"oooo ........XXXX....... oooo", -"oooo ........XX....... ooooo", -"ooooo ............... oooooo", -"ooooooo ........... ooooooo", -"oooooooo ..... oooooooo", -"oooooooooo oooooooooo", -"ooooooooooooo oooooooooooooo", -"oooooooooooooooooooooooooooooooo" -}; +char* MwIconInfo[] = { + /* columns rows colors chars-per-pixel */ + "32 32 4 1 ", + " c black", + ". c #6632F7", + "X c white", + "o c None", + /* pixels */ + "oooooooooooooooooooooooooooooooo", + "ooooooooooo oooooooooooo", + "ooooooooo ooooooooo", + "ooooooo ......... oooooooo", + "oooooo ............. oooooo", + "ooooo ................ ooooo", + "oooo ........XX........ ooooo", + "ooo ........XXXX........ oooo", + "ooo .........XXXX......... ooo", + "oo ..........XXXX......... ooo", + "oo ...........XX........... oo", + "o ......................... oo", + "o ...........XXXX.......... oo", + "o ...........XXXX........... o", + "o ...........XXXX........... o", + "o ...........XXXX........... o", + "o ...........XXXX........... o", + "o ...........XXXX........... o", + "o ...........XXXX.......... oo", + "o ...........XXXX.......... oo", + "oo ..........XXXX.......... oo", + "oo ..........XXXX......... oo", + "oo .........XXXX......... ooo", + "ooo .........XXXX........ ooo", + "oooo ........XXXX....... oooo", + "oooo ........XX....... ooooo", + "ooooo ............... oooooo", + "ooooooo ........... ooooooo", + "oooooooo ..... oooooooo", + "oooooooooo oooooooooo", + "ooooooooooooo oooooooooooooo", + "oooooooooooooooooooooooooooooooo"}; diff --git a/src/icon/note.c b/src/icon/note.c index 305f5e1..be69a53 100644 --- a/src/icon/note.c +++ b/src/icon/note.c @@ -2,44 +2,43 @@ #include /* XPM */ -char *MwIconNote[] = { -/* columns rows colors chars-per-pixel */ -"32 32 4 1 ", -" c None", -". c black", -"X c #FCFC00", -"o c black", -/* pixels */ -" ", -" ..... ", -" ............ ", -" ......XXXXX..... ", -" ....XXXXXXXXXXX... ", -" ...XXXXXXXXXXXXXXX... ", -" ...XXXXXXX..XXXXXXXX... ", -" ...XXXXXXX....XXXXXXXX.. ", -" ...XXXXXXXX....XXXXXXXXX.. ", -" ..XXXXXXXXX....XXXXXXXXX... ", -" ...XXXXXXXXX....XXXXXXXXXX.. ", -" ..XXXXXXXXXX....XXXXXXXXXX.. ", -" ..XXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXX....XXXXXXXXXXX.. ", -" ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ", -" ..XXXXXXXXXXX..XXXXXXXXXXX.. ", -" ..XXXXXXXXX....XXXXXXXXXX.. ", -" ..XXXXXXXXX....XXXXXXXXX.. ", -" ..XXXXXXXX....XXXXXXXX... ", -" ..XXXXXXXX..XXXXXXXX... ", -" ...XXXXXXXXXXXXXXXX... ", -" ....XXXXXXXXXXXXX... ", -" ....XXXXXXXXX.... ", -" .............. ", -" ......... ", -" " -}; +char* MwIconNote[] = { + /* columns rows colors chars-per-pixel */ + "32 32 4 1 ", + " c None", + ". c black", + "X c #FCFC00", + "o c black", + /* pixels */ + " ", + " ..... ", + " ............ ", + " ......XXXXX..... ", + " ....XXXXXXXXXXX... ", + " ...XXXXXXXXXXXXXXX... ", + " ...XXXXXXX..XXXXXXXX... ", + " ...XXXXXXX....XXXXXXXX.. ", + " ...XXXXXXXX....XXXXXXXXX.. ", + " ..XXXXXXXXX....XXXXXXXXX... ", + " ...XXXXXXXXX....XXXXXXXXXX.. ", + " ..XXXXXXXXXX....XXXXXXXXXX.. ", + " ..XXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXX....XXXXXXXXXXX.. ", + " ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ", + " ..XXXXXXXXXXX..XXXXXXXXXXX.. ", + " ..XXXXXXXXX....XXXXXXXXXX.. ", + " ..XXXXXXXXX....XXXXXXXXX.. ", + " ..XXXXXXXX....XXXXXXXX... ", + " ..XXXXXXXX..XXXXXXXX... ", + " ...XXXXXXXXXXXXXXXX... ", + " ....XXXXXXXXXXXXX... ", + " ....XXXXXXXXX.... ", + " .............. ", + " ......... ", + " "}; diff --git a/src/icon/question.c b/src/icon/question.c index d8d2d82..c381e5d 100644 --- a/src/icon/question.c +++ b/src/icon/question.c @@ -2,42 +2,41 @@ #include /* XPM */ -char *MwIconQuestion[] = { -/* columns rows colors chars-per-pixel */ -"32 32 2 1 ", -" c None", -". c red", -/* pixels */ -" ", -" ....... ", -" ............. ", -" ..... ...... ", -" .... ...... ", -" ... ...... ", -" .... ...... ", -" ..... ...... ", -" ..... ...... ", -" .. ...... ", -" ....... ", -" ...... ", -" ....... ", -" ....... ", -" ....... ", -" ...... ", -" ..... ", -" .... ", -" ... ", -" .... ", -" .... ", -" ..... ", -" ...... ", -" ...... ", -" .... ", -" ", -" .. ", -" ...... ", -" ...... ", -" ...... ", -" .... ", -" " -}; +char* MwIconQuestion[] = { + /* columns rows colors chars-per-pixel */ + "32 32 2 1 ", + " c None", + ". c red", + /* pixels */ + " ", + " ....... ", + " ............. ", + " ..... ...... ", + " .... ...... ", + " ... ...... ", + " .... ...... ", + " ..... ...... ", + " ..... ...... ", + " .. ...... ", + " ....... ", + " ...... ", + " ....... ", + " ....... ", + " ....... ", + " ...... ", + " ..... ", + " .... ", + " ... ", + " .... ", + " .... ", + " ..... ", + " ...... ", + " ...... ", + " .... ", + " ", + " .. ", + " ...... ", + " ...... ", + " ...... ", + " .... ", + " "}; diff --git a/src/icon/warning.c b/src/icon/warning.c index 0129fcd..06fed22 100644 --- a/src/icon/warning.c +++ b/src/icon/warning.c @@ -2,44 +2,43 @@ #include /* XPM */ -char *MwIconWarning[] = { -/* columns rows colors chars-per-pixel */ -"32 32 4 1 ", -" c None", -". c #FC0000", -"X c gray", -"o c black", -/* pixels */ -" ", -" ", -" . ", -" ... ", -" ..X.. ", -" .XXX. ", -" ..XXX.. ", -" .XXXXX. ", -" ..XXoXX.. ", -" .XXoooXX. ", -" ..XXoooXX.. ", -" .XXXoooXXX. ", -" ..XXXoooXXX.. ", -" .XXXXoooXXXX. ", -" ..XXXXoooXXXX.. ", -" .XXXXXoooXXXXX. ", -" ..XXXXXoooXXXXX.. ", -" .XXXXXXoooXXXXXX. ", -" ..XXXXXXoooXXXXXX.. ", -" .XXXXXXXoooXXXXXXX. ", -" ..XXXXXXXoooXXXXXXX.. ", -" .XXXXXXXXXoXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXoXXXXXXXXXX. ", -" ..XXXXXXXXXoooXXXXXXXXX.. ", -" .XXXXXXXXXoooooXXXXXXXXX. ", -" ..XXXXXXXXXXoooXXXXXXXXXX.. ", -" .XXXXXXXXXXXXoXXXXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ", -" ............................. ", -" ........................... ", -" " -}; +char* MwIconWarning[] = { + /* columns rows colors chars-per-pixel */ + "32 32 4 1 ", + " c None", + ". c #FC0000", + "X c gray", + "o c black", + /* pixels */ + " ", + " ", + " . ", + " ... ", + " ..X.. ", + " .XXX. ", + " ..XXX.. ", + " .XXXXX. ", + " ..XXoXX.. ", + " .XXoooXX. ", + " ..XXoooXX.. ", + " .XXXoooXXX. ", + " ..XXXoooXXX.. ", + " .XXXXoooXXXX. ", + " ..XXXXoooXXXX.. ", + " .XXXXXoooXXXXX. ", + " ..XXXXXoooXXXXX.. ", + " .XXXXXXoooXXXXXX. ", + " ..XXXXXXoooXXXXXX.. ", + " .XXXXXXXoooXXXXXXX. ", + " ..XXXXXXXoooXXXXXXX.. ", + " .XXXXXXXXXoXXXXXXXXX. ", + " ..XXXXXXXXXXXXXXXXXXX.. ", + " .XXXXXXXXXXoXXXXXXXXXX. ", + " ..XXXXXXXXXoooXXXXXXXXX.. ", + " .XXXXXXXXXoooooXXXXXXXXX. ", + " ..XXXXXXXXXXoooXXXXXXXXXX.. ", + " .XXXXXXXXXXXXoXXXXXXXXXXXX. ", + " ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ", + " ............................. ", + " ........................... ", + " "}; diff --git a/tools/icon.sh b/tools/icon.sh index 6848c25..31a0c7c 100755 --- a/tools/icon.sh +++ b/tools/icon.sh @@ -1,5 +1,19 @@ #!/bin/sh # $Id$ +echo '/* $Id$ */' > include/Mw/Icon.h +echo '/*!' >> include/Mw/Icon.h +echo ' * %file Mw/Icon.h' >> include/Mw/Icon.h +echo ' * %brief Icon' >> include/Mw/Icon.h +echo ' */' >> include/Mw/Icon.h +echo '#ifndef __MW_ICON_H__' >> include/Mw/Icon.h +echo '#define __MW_ICON_H__' >> include/Mw/Icon.h +echo '' >> include/Mw/Icon.h +echo '#include ' >> include/Mw/Icon.h +echo '' >> include/Mw/Icon.h +echo '#ifdef __cplusplus' >> include/Mw/Icon.h +echo 'extern "C" {' >> include/Mw/Icon.h +echo '#endif' >> include/Mw/Icon.h +echo '' >> include/Mw/Icon.h for i in doc/*.gif; do LOWER=`echo $i | rev | cut -d"/" -f1 | rev | cut -d"." -f1` if [ "$LOWER" = "unsure" ]; then @@ -11,5 +25,18 @@ for i in doc/*.gif; do echo '/* $Id$ */' > $OUT echo '#include ' >> $OUT echo >> $OUT - convert $i xpm:- | sed -E 's/^static //' | sed 's/xpm__/'$NAME'/' >> $OUT + convert $i xpm:- 2>/dev/null | sed -E 's/^static //' | sed 's/xpm__/'$NAME'/' >> $OUT + echo $NAME +done | while read a; do + echo '/*!' >> include/Mw/Icon.h + echo " * %brief `echo $a | sed s/MwIcon//` icon" >> include/Mw/Icon.h + echo ' */' >> include/Mw/Icon.h + echo "MWDECL char* $a[];" >> include/Mw/Icon.h + echo '' >> include/Mw/Icon.h done +echo '' >> include/Mw/Icon.h +echo '#ifdef __cplusplus' >> include/Mw/Icon.h +echo '}' >> include/Mw/Icon.h +echo '#endif' >> include/Mw/Icon.h +echo '' >> include/Mw/Icon.h +echo '#endif' >> include/Mw/Icon.h