git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@256 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
Nishi 2025-10-10 16:53:51 +00:00
commit 72ba706b31
8 changed files with 302 additions and 163 deletions

View file

@ -170,6 +170,12 @@
<dd> <dd>
<a href="#Mw_Draw_h__MwGetColor">MwGetColor</a> <a href="#Mw_Draw_h__MwGetColor">MwGetColor</a>
</dd> </dd>
<dd>
<a href="#Mw_Draw_h__MwLoadRaw">MwLoadRaw</a>
</dd>
<dd>
<a href="#Mw_Draw_h__MwLoadXPM">MwLoadXPM</a>
</dd>
<dt> <dt>
<a href="#Mw_Error_h">Mw/Error.h</a> <a href="#Mw_Error_h">Mw/Error.h</a>
</dt> </dt>
@ -1629,6 +1635,76 @@
</dd> </dd>
</dl> </dl>
<hr> <hr>
<pre id="Mw_Draw_h__MwLoadRaw">MWDECL MwLLPixmap <B><FONT COLOR="#0000FF">MwLoadRaw</FONT></B> (
MwWidget handle,
<B><FONT COLOR="#228B22">unsigned</FONT></B> <B><FONT COLOR="#228B22">char</FONT></B>* rgb,
<B><FONT COLOR="#228B22">int</FONT></B> width,
<B><FONT COLOR="#228B22">int</FONT></B> height
);</pre>
<dl>
<dd>
Creates a pixmap from raw data.
</dd>
<dt>
Parameter <code>handle</code>
</dt>
<dd>
Widget.
</dd>
<dt>
Parameter <code>rgb</code>
</dt>
<dd>
RGBA data.
</dd>
<dt>
Parameter <code>width</code>
</dt>
<dd>
Width.
</dd>
<dt>
Parameter <code>height</code>
</dt>
<dd>
Height.
</dd>
<dt>
Returns
</dt>
<dd>
Pixmap.
</dd>
</dl>
<hr>
<pre id="Mw_Draw_h__MwLoadXPM">MWDECL MwLLPixmap <B><FONT COLOR="#0000FF">MwLoadXPM</FONT></B> (
MwWidget handle,
<B><FONT COLOR="#228B22">char</FONT></B>** data
);</pre>
<dl>
<dd>
Creates a pixmap from XPM data.
</dd>
<dt>
Parameter <code>handle</code>
</dt>
<dd>
Widget.
</dd>
<dt>
Parameter <code>data</code>
</dt>
<dd>
Data.
</dd>
<dt>
Returns
</dt>
<dd>
Pixmap.
</dd>
</dl>
<hr>
<h2 align="center" id="Mw_Error_h">Mw/Error.h</h2> <h2 align="center" id="Mw_Error_h">Mw/Error.h</h2>
<dl> <dl>
<dt> <dt>

39
include/Mw/Icon.h Normal file
View file

@ -0,0 +1,39 @@
/* $Id$ */
/*!
* %file Mw/Icon.h
* %brief Icon
*/
#ifndef __MW_ICON_H__
#define __MW_ICON_H__
#include <Mw/MachDep.h>
#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

View file

@ -18,6 +18,7 @@
#include <Mw/Cursor.h> #include <Mw/Cursor.h>
#include <Mw/Constants.h> #include <Mw/Constants.h>
#include <Mw/Unicode.h> #include <Mw/Unicode.h>
#include <Mw/Icon.h>
#include <Mw/Widget/Window.h> #include <Mw/Widget/Window.h>
#include <Mw/Widget/Menu.h> #include <Mw/Widget/Menu.h>

View file

@ -2,44 +2,43 @@
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
/* XPM */ /* XPM */
char *MwIconInfo[] = { char* MwIconInfo[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 4 1 ", "32 32 4 1 ",
" c black", " c black",
". c #6632F7", ". c #6632F7",
"X c white", "X c white",
"o c None", "o c None",
/* pixels */ /* pixels */
"oooooooooooooooooooooooooooooooo", "oooooooooooooooooooooooooooooooo",
"ooooooooooo oooooooooooo", "ooooooooooo oooooooooooo",
"ooooooooo ooooooooo", "ooooooooo ooooooooo",
"ooooooo ......... oooooooo", "ooooooo ......... oooooooo",
"oooooo ............. oooooo", "oooooo ............. oooooo",
"ooooo ................ ooooo", "ooooo ................ ooooo",
"oooo ........XX........ ooooo", "oooo ........XX........ ooooo",
"ooo ........XXXX........ oooo", "ooo ........XXXX........ oooo",
"ooo .........XXXX......... ooo", "ooo .........XXXX......... ooo",
"oo ..........XXXX......... ooo", "oo ..........XXXX......... ooo",
"oo ...........XX........... oo", "oo ...........XX........... oo",
"o ......................... oo", "o ......................... oo",
"o ...........XXXX.......... oo", "o ...........XXXX.......... oo",
"o ...........XXXX........... o", "o ...........XXXX........... o",
"o ...........XXXX........... o", "o ...........XXXX........... o",
"o ...........XXXX........... o", "o ...........XXXX........... o",
"o ...........XXXX........... o", "o ...........XXXX........... o",
"o ...........XXXX........... o", "o ...........XXXX........... o",
"o ...........XXXX.......... oo", "o ...........XXXX.......... oo",
"o ...........XXXX.......... oo", "o ...........XXXX.......... oo",
"oo ..........XXXX.......... oo", "oo ..........XXXX.......... oo",
"oo ..........XXXX......... oo", "oo ..........XXXX......... oo",
"oo .........XXXX......... ooo", "oo .........XXXX......... ooo",
"ooo .........XXXX........ ooo", "ooo .........XXXX........ ooo",
"oooo ........XXXX....... oooo", "oooo ........XXXX....... oooo",
"oooo ........XX....... ooooo", "oooo ........XX....... ooooo",
"ooooo ............... oooooo", "ooooo ............... oooooo",
"ooooooo ........... ooooooo", "ooooooo ........... ooooooo",
"oooooooo ..... oooooooo", "oooooooo ..... oooooooo",
"oooooooooo oooooooooo", "oooooooooo oooooooooo",
"ooooooooooooo oooooooooooooo", "ooooooooooooo oooooooooooooo",
"oooooooooooooooooooooooooooooooo" "oooooooooooooooooooooooooooooooo"};
};

View file

@ -2,44 +2,43 @@
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
/* XPM */ /* XPM */
char *MwIconNote[] = { char* MwIconNote[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 4 1 ", "32 32 4 1 ",
" c None", " c None",
". c black", ". c black",
"X c #FCFC00", "X c #FCFC00",
"o c black", "o c black",
/* pixels */ /* pixels */
" ", " ",
" ..... ", " ..... ",
" ............ ", " ............ ",
" ......XXXXX..... ", " ......XXXXX..... ",
" ....XXXXXXXXXXX... ", " ....XXXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXX... ", " ...XXXXXXXXXXXXXXX... ",
" ...XXXXXXX..XXXXXXXX... ", " ...XXXXXXX..XXXXXXXX... ",
" ...XXXXXXX....XXXXXXXX.. ", " ...XXXXXXX....XXXXXXXX.. ",
" ...XXXXXXXX....XXXXXXXXX.. ", " ...XXXXXXXX....XXXXXXXXX.. ",
" ..XXXXXXXXX....XXXXXXXXX... ", " ..XXXXXXXXX....XXXXXXXXX... ",
" ...XXXXXXXXX....XXXXXXXXXX.. ", " ...XXXXXXXXX....XXXXXXXXXX.. ",
" ..XXXXXXXXXX....XXXXXXXXXX.. ", " ..XXXXXXXXXX....XXXXXXXXXX.. ",
" ..XXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXX....XXXXXXXXXXX.. ", " ..XXXXXXXXXX....XXXXXXXXXXX.. ",
" ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ", " ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ",
" ..XXXXXXXXXXX..XXXXXXXXXXX.. ", " ..XXXXXXXXXXX..XXXXXXXXXXX.. ",
" ..XXXXXXXXX....XXXXXXXXXX.. ", " ..XXXXXXXXX....XXXXXXXXXX.. ",
" ..XXXXXXXXX....XXXXXXXXX.. ", " ..XXXXXXXXX....XXXXXXXXX.. ",
" ..XXXXXXXX....XXXXXXXX... ", " ..XXXXXXXX....XXXXXXXX... ",
" ..XXXXXXXX..XXXXXXXX... ", " ..XXXXXXXX..XXXXXXXX... ",
" ...XXXXXXXXXXXXXXXX... ", " ...XXXXXXXXXXXXXXXX... ",
" ....XXXXXXXXXXXXX... ", " ....XXXXXXXXXXXXX... ",
" ....XXXXXXXXX.... ", " ....XXXXXXXXX.... ",
" .............. ", " .............. ",
" ......... ", " ......... ",
" " " "};
};

View file

@ -2,42 +2,41 @@
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
/* XPM */ /* XPM */
char *MwIconQuestion[] = { char* MwIconQuestion[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 2 1 ", "32 32 2 1 ",
" c None", " c None",
". c red", ". c red",
/* pixels */ /* pixels */
" ", " ",
" ....... ", " ....... ",
" ............. ", " ............. ",
" ..... ...... ", " ..... ...... ",
" .... ...... ", " .... ...... ",
" ... ...... ", " ... ...... ",
" .... ...... ", " .... ...... ",
" ..... ...... ", " ..... ...... ",
" ..... ...... ", " ..... ...... ",
" .. ...... ", " .. ...... ",
" ....... ", " ....... ",
" ...... ", " ...... ",
" ....... ", " ....... ",
" ....... ", " ....... ",
" ....... ", " ....... ",
" ...... ", " ...... ",
" ..... ", " ..... ",
" .... ", " .... ",
" ... ", " ... ",
" .... ", " .... ",
" .... ", " .... ",
" ..... ", " ..... ",
" ...... ", " ...... ",
" ...... ", " ...... ",
" .... ", " .... ",
" ", " ",
" .. ", " .. ",
" ...... ", " ...... ",
" ...... ", " ...... ",
" ...... ", " ...... ",
" .... ", " .... ",
" " " "};
};

View file

@ -2,44 +2,43 @@
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
/* XPM */ /* XPM */
char *MwIconWarning[] = { char* MwIconWarning[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 4 1 ", "32 32 4 1 ",
" c None", " c None",
". c #FC0000", ". c #FC0000",
"X c gray", "X c gray",
"o c black", "o c black",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" . ", " . ",
" ... ", " ... ",
" ..X.. ", " ..X.. ",
" .XXX. ", " .XXX. ",
" ..XXX.. ", " ..XXX.. ",
" .XXXXX. ", " .XXXXX. ",
" ..XXoXX.. ", " ..XXoXX.. ",
" .XXoooXX. ", " .XXoooXX. ",
" ..XXoooXX.. ", " ..XXoooXX.. ",
" .XXXoooXXX. ", " .XXXoooXXX. ",
" ..XXXoooXXX.. ", " ..XXXoooXXX.. ",
" .XXXXoooXXXX. ", " .XXXXoooXXXX. ",
" ..XXXXoooXXXX.. ", " ..XXXXoooXXXX.. ",
" .XXXXXoooXXXXX. ", " .XXXXXoooXXXXX. ",
" ..XXXXXoooXXXXX.. ", " ..XXXXXoooXXXXX.. ",
" .XXXXXXoooXXXXXX. ", " .XXXXXXoooXXXXXX. ",
" ..XXXXXXoooXXXXXX.. ", " ..XXXXXXoooXXXXXX.. ",
" .XXXXXXXoooXXXXXXX. ", " .XXXXXXXoooXXXXXXX. ",
" ..XXXXXXXoooXXXXXXX.. ", " ..XXXXXXXoooXXXXXXX.. ",
" .XXXXXXXXXoXXXXXXXXX. ", " .XXXXXXXXXoXXXXXXXXX. ",
" ..XXXXXXXXXXXXXXXXXXX.. ", " ..XXXXXXXXXXXXXXXXXXX.. ",
" .XXXXXXXXXXoXXXXXXXXXX. ", " .XXXXXXXXXXoXXXXXXXXXX. ",
" ..XXXXXXXXXoooXXXXXXXXX.. ", " ..XXXXXXXXXoooXXXXXXXXX.. ",
" .XXXXXXXXXoooooXXXXXXXXX. ", " .XXXXXXXXXoooooXXXXXXXXX. ",
" ..XXXXXXXXXXoooXXXXXXXXXX.. ", " ..XXXXXXXXXXoooXXXXXXXXXX.. ",
" .XXXXXXXXXXXXoXXXXXXXXXXXX. ", " .XXXXXXXXXXXXoXXXXXXXXXXXX. ",
" ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ", " ..XXXXXXXXXXXXXXXXXXXXXXXXX.. ",
" ............................. ", " ............................. ",
" ........................... ", " ........................... ",
" " " "};
};

View file

@ -1,5 +1,19 @@
#!/bin/sh #!/bin/sh
# $Id$ # $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 <Mw/MachDep.h>' >> 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 for i in doc/*.gif; do
LOWER=`echo $i | rev | cut -d"/" -f1 | rev | cut -d"." -f1` LOWER=`echo $i | rev | cut -d"/" -f1 | rev | cut -d"." -f1`
if [ "$LOWER" = "unsure" ]; then if [ "$LOWER" = "unsure" ]; then
@ -11,5 +25,18 @@ for i in doc/*.gif; do
echo '/* $Id$ */' > $OUT echo '/* $Id$ */' > $OUT
echo '#include <Mw/Milsko.h>' >> $OUT echo '#include <Mw/Milsko.h>' >> $OUT
echo >> $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 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