diff -ruN mgl2-alpha-020/bin/imsoft.c mgl2-alpha-020-patched.20090418/bin/imsoft.c --- mgl2-alpha-020/bin/imsoft.c 2000-09-09 12:07:08.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/bin/imsoft.c 2009-04-18 13:29:50.000000000 +0900 @@ -57,53 +57,50 @@ */ -static char *kb_layout1="\ ------------------------------------------------+ - | ------------------------------------------------+ -Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS| ----+---+---+---+---+---+---+---+---+---+---+---+ -Tab| q | w | e | r | t | y | u | i | o | p |Ent| ----+---+---+---+---+---+---+---+---+---+---+- | -Caps| a | s | d | f | g | h | j | k | l | ; |er| -----+---+---+---+---+---+---+---+---+---+---+--| -Shift| z | x | c | v | b | n | m | , | . |¢¬|@ | ------+---+---+---+---+---+---+---+---+---+--+--+ -Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª| ------+-----+-----+-------------+-----------+---+ -"; - -static char *kb_layout2="\ ------------------------------------------------+ - | ------------------------------------------------+ -Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS| ----+---+---+---+---+---+---+---+---+---+---+---+ -Tab| Q | W | E | R | T | Y | U | I | O | P |Ent| ----+---+---+---+---+---+---+---+---+---+---+- | -Caps| A | S | D | F | G | H | J | K | L | + |er| -----+---+---+---+---+---+---+---+---+---+---+--| -Shift| Z | X | C | V | B | N | M | < | > |¢¬|` | ------+---+---+---+---+---+---+---+---+---+--+--+ -Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª| ------+-----+-----+-------------+-----------+---+ -"; - -static char *kb_layout3="\ ------------------------------------------------+ - | ------------------------------------------------+ -Esc| | BS| ----+---+---+---+---+---+---+---+---+---+---+---+ -Han| q | w | e | r | t | y | u | i | o | p |Ent| ----+---+---+---+---+---+---+---+---+---+---+- | -Zen | a | s | d | f | g | h | j | k | l | ; |er| -----+---+---+---+---+---+---+---+---+---+---+--| -Kata | z | x | c | v | b | n | m | , | . |¢¬|/ | ------+---+---+---+---+---+---+---+---+---+--+--+ -Dic | \\ | @ | - | = | |Alpha |¢«|¢­|¢ª| ------+-----+-----+-------------+-----------+---+ -"; +static char *kb_layout1= +"-----------------------------------------------+" +" |" +"-----------------------------------------------+" +"Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS|" +"---+---+---+---+---+---+---+---+---+---+---+---+" +"Tab| q | w | e | r | t | y | u | i | o | p |Ent|" +"---+---+---+---+---+---+---+---+---+---+---+- |" +"Caps| a | s | d | f | g | h | j | k | l | ; |er|" +"----+---+---+---+---+---+---+---+---+---+---+--|" +"Shift| z | x | c | v | b | n | m | , | . |¢¬|@ |" +"-----+---+---+---+---+---+---+---+---+---+--+--+" +"Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª|" +"-----+-----+-----+-------------+-----------+---+"; + +static char *kb_layout2= +"-----------------------------------------------+" +" |" +"-----------------------------------------------+" +"Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS|" +"---+---+---+---+---+---+---+---+---+---+---+---+" +"Tab| Q | W | E | R | T | Y | U | I | O | P |Ent|" +"---+---+---+---+---+---+---+---+---+---+---+- |" +"Caps| A | S | D | F | G | H | J | K | L | + |er|" +"----+---+---+---+---+---+---+---+---+---+---+--|" +"Shift| Z | X | C | V | B | N | M | < | > |¢¬|` |" +"-----+---+---+---+---+---+---+---+---+---+--+--+" +"Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª|" +"-----+-----+-----+-------------+-----------+---+"; + +static char *kb_layout3= +"-----------------------------------------------+" +" |" +"-----------------------------------------------+" +"Esc| | BS|" +"---+---+---+---+---+---+---+---+---+---+---+---+" +"Han| q | w | e | r | t | y | u | i | o | p |Ent|" +"---+---+---+---+---+---+---+---+---+---+---+- |" +"Zen | a | s | d | f | g | h | j | k | l | ; |er|" +"----+---+---+---+---+---+---+---+---+---+---+--|" +"Kata | z | x | c | v | b | n | m | , | . |¢¬|/ |" +"-----+---+---+---+---+---+---+---+---+---+--+--+" +"Dic | \\ | @ | - | = | |Alpha |¢«|¢­|¢ª|" +"-----+-----+-----+-------------+-----------+---+"; #define MK_CAPS MK_V1 #define MK_SHIFT MK_V2 diff -ruN mgl2-alpha-020/conf/config.mk mgl2-alpha-020-patched.20090418/conf/config.mk --- mgl2-alpha-020/conf/config.mk 1970-01-01 09:00:00.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/conf/config.mk 2009-04-18 14:02:21.000000000 +0900 @@ -0,0 +1,90 @@ +# MGLDIR : mgl direcory (headers,libs,shared objects,fonts ..) +MGLDIR=/usr/local/lib/mgl2 + +# MGL_SBIN_DIR mgl server directory +MGL_SBIN_DIR=/usr/local/sbin +MGL_BIN_DIR=/usr/local/bin + +# set MGL_HEADER_DIR to specify header direcotry +MGL_HEADER_DIR=/usr/local/include + +# set MGL_LIB_DIR to specify library direcotry +MGL_LIB_DIR=/usr/local/lib + +ifndef MGL_HEADER_DIR +MGL_HEADER_DIR = ${MGLDIR} +endif +ifndef MGL_LIB_DIR +MGL_LIB_DIR = ${MGLDIR} +endif + +# +# X11 event magager options +# +MAX_COLOR=4096 +DULLY_DISPLAY=y +SUPPORT_X_KEYMOUSE=y + +# +# default draw_engines +# +SUPPORT_GENERIC_16COLOR=y +SUPPORT_GENERIC_192COLOR=y +SUPPORT_GENERIC_FULLCOLOR=y + +# event magager for client +# +SUPPORT_CLIENT=y + +# server option +SERVER_X11 = mglsvrx +OBJS_X11=emx11.o +# SERVER_CONS = mglsvrcons +# OBJS_CONS=emcons.o + +NATIVE_DRAW_ENGINE1=dec4rr +FONT_ENGINE=ferom + +# X event manager +EVENT_MANAGER_X=emx11 + +# secondary event manager +EVENT_MANAGER=emx11 + + +#MGL_MACHINE=MGL_MACHINE_MAC_ADB +#MGL_MACHINE=MGL_MACHINE_MG_FREEBSD +#MGL_MACHINE=MGL_MACHINE_MG_LINUX +#MGL_MACHINE=MGL_MACHINE_HPCMIPS +#MGL_MACHINE=MGL_MACHINE_SVGA +#MGL_MACHINE=MGL_MACHINE_NONE +MGL_MACHINE=MGL_MACHINE_VGA + +# optimization +#USE_LOCAL_MEMSET=y +#USE_LOCAL_MEMMOVE=y + +OPTIMIZE_FOR=OPTTYPE_ANY + +# im option input-method +#IM_STATIC=y +IM_DYNAMIC=y +IM_PROG=imcanna.so + +# mil options +USE_JPEG = -DUSE_JPEG +JPEGINCDIR = -I/usr/local/include +JPEGLIBDIR = -L/usr/local/lib +JPEGLIB = -ljpeg + +USE_GIF = -DUSE_GIF +GIFINCDIR = -I/usr/local/include +GIFLIBDIR = -L/usr/local/lib +GIFLIB = -lungif + +USE_PNG = -DUSE_PNG +PNGINCDIR = -I/usr/local/include +PNGLIBDIR = -L/usr/local/lib +PNGLIB = -lpng + +OSTYPE=FreeBSD diff -ruN mgl2-alpha-020/demos/iconedit.c mgl2-alpha-020-patched.20090418/demos/iconedit.c --- mgl2-alpha-020/demos/iconedit.c 2000-09-10 19:02:05.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/demos/iconedit.c 2009-04-18 13:48:47.000000000 +0900 @@ -91,221 +91,210 @@ /* Æɤ߹þ¤ß¥Õ¥¡¥¤¥ë̾ */ char load_name[256]="icon_c.mgr"; -char *icon_edit ="\ -#MGR000200160016 -++++++++++++++++ -++iiiiiiiiiii+++ -+iiiiiiii@iiii++ -+iiiiiii@B@iii++ -+iiiiii@BBB@ii++ -+iiiii@BBBBB@i++ -+iiii@BBBBB@ii++ -+iii@BBBBB@iii++ -+ii@k@BBB@iiii++ -+ii@kk@B@iiiii++ -+ii@@kk@iiiiii++ -+ii@@@@iiiiiii++ -+iiiiiiiiiiiii++ -++iiiiiiiiiii+++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_pen ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -iiiiiiii@iiii+++ -iiiiiii@B@iii+++ -iiiiii@BBB@ii+++ -iiiii@BBBBB@i+++ -iiii@BBBBB@ii+++ -iii@BBBBB@iii+++ -ii@k@BBB@iiii+++ -ii@kk@B@iiiii+++ -ii@@kk@iiiiii+++ -ii@@@@iiiiiii+++ -iiiiiiiiiiiii+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_brush="\ -#MGR000200160016 -+iiiiiiiiiii++++ -iiii@@@@@iiii+++ -iiii@jjj@iiii+++ -iiii@jjj@iiii+++ -i@@@@jjj@@@@i+++ -i@jjjjjjjjj@i+++ -i@jjjjjjjjj@i+++ -i@@@@@@@@@@@i+++ -iiEBEBEBEBEii+++ -iiEBEBEBEBEii+++ -iiEBEBEBEBEii+++ -iEBEBEBEBEiii+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_pickup="\ -#MGR000200160016 -+iiiiiiiiiii++++ -ii@@@iiiiiiii+++ -ii@@@iiiiiiii+++ -i@@@@@@@@@@@i+++ -i@+++@@@+++@i+++ -i@++@SSS@++@i+++ -i@+@SSSSS@+@i+++ -i@+@SSSSS@+@i+++ -i@++@SSS@++@i+++ -i@+++@@@+++@i+++ -i@@@@@@@@@@@i+++ -iiiiiiiiiiiii+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; -char *icon_load ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -i@@@@@@@@@iii+++ -i@=@==;;@=@ii+++ -i@=@==;;@==@i+++ -i@=@==;;@==@i+++ -i@=@@@@@@==@i+++ -i@==r======@i+++ -i@==r======@i+++ -i@==r======@i+++ -i@==r======@i+++ -i@==rrrrr==@i+++ -i@@@@@@@@@@@i+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_save ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -i@@@@@@@@@iii+++ -i@=@==;;@=@ii+++ -i@=@==;;@==@i+++ -i@=@==;;@==@i+++ -i@=@@@@@@==@i+++ -i@===rrrr==@i+++ -i@==r======@i+++ -i@===rr====@i+++ -i@=====r===@i+++ -i@=rrrr====@i+++ -i@@@@@@@@@@@i+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_down ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -iiii@@@@@iiii+++ -iiii@TTT@iiii+++ -iiii@TTT@iiii+++ -iiii@TTT@iiii+++ -i@@@@TTT@@@@i+++ -i@TTTTTTTTT@i+++ -ii@TTTTTTT@ii+++ -iii@TTTTT@iii+++ -iiii@TTT@iiii+++ -iiiii@T@iiiii+++ -iiiiii@iiiiii+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; -char *icon_up ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -iiiiii@iiiiii+++ -iiiii@T@iiiii+++ -iiii@TTT@iiii+++ -iii@TTTTT@iii+++ -ii@TTTTTTT@ii+++ -i@TTTTTTTTT@i+++ -i@@@@TTT@@@@i+++ -iiii@TTT@iiii+++ -iiii@TTT@iiii+++ -iiii@TTT@iiii+++ -iiii@@@@@iiii+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; -char *icon_left ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -iiiiii@@iiiii+++ -iiiii@T@iiiii+++ -iiii@TT@iiiii+++ -iii@TTT@@@@@i+++ -ii@TTTTTTTT@i+++ -i@TTTTTTTTT@i+++ -ii@TTTTTTTT@i+++ -iii@TTT@@@@@i+++ -iiii@TT@iiiii+++ -iiiii@T@iiiii+++ -iiiiii@@iiiii+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; -char *icon_right ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -iiiii@@iiiiii+++ -iiiii@T@iiiii+++ -iiiii@TT@iiii+++ -i@@@@@TTT@iii+++ -i@TTTTTTTT@ii+++ -i@TTTTTTTTT@i+++ -i@TTTTTTTT@ii+++ -i@@@@@TTT@iii+++ -iiiii@TT@iiii+++ -iiiii@T@iiiii+++ -iiiii@@iiiiii+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_gray ="\ -#MGR000200160016 -+iiiiiiiiiii++++ -i@@@@@@@@@@@i+++ -i@@@@@@****@i+++ -i@@@@@@****@i+++ -i@@@@@@****@i+++ -i@@@@@@****@i+++ -i@@@@@@@@@@@i+++ -i@++++@....@i+++ -i@++++@....@i+++ -i@++++@....@i+++ -i@++++@....@i+++ -i@@@@@@@@@@@i+++ -+iiiiiiiiiii++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; +char *icon_edit = +"#MGR000200160016" +"++++++++++++++++" +"++iiiiiiiiiii+++" +"+iiiiiiii@iiii++" +"+iiiiiii@B@iii++" +"+iiiiii@BBB@ii++" +"+iiiii@BBBBB@i++" +"+iiii@BBBBB@ii++" +"+iii@BBBBB@iii++" +"+ii@k@BBB@iiii++" +"+ii@kk@B@iiiii++" +"+ii@@kk@iiiiii++" +"+ii@@@@iiiiiii++" +"+iiiiiiiiiiiii++" +"++iiiiiiiiiii+++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_pen = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"iiiiiiii@iiii+++" +"iiiiiii@B@iii+++" +"iiiiii@BBB@ii+++" +"iiiii@BBBBB@i+++" +"iiii@BBBBB@ii+++" +"iii@BBBBB@iii+++" +"ii@k@BBB@iiii+++" +"ii@kk@B@iiiii+++" +"ii@@kk@iiiiii+++" +"ii@@@@iiiiiii+++" +"iiiiiiiiiiiii+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_brush= +"#MGR000200160016" +"+iiiiiiiiiii++++" +"iiii@@@@@iiii+++" +"iiii@jjj@iiii+++" +"iiii@jjj@iiii+++" +"i@@@@jjj@@@@i+++" +"i@jjjjjjjjj@i+++" +"i@jjjjjjjjj@i+++" +"i@@@@@@@@@@@i+++" +"iiEBEBEBEBEii+++" +"iiEBEBEBEBEii+++" +"iiEBEBEBEBEii+++" +"iEBEBEBEBEiii+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_pickup= +"#MGR000200160016" +"+iiiiiiiiiii++++" +"ii@@@iiiiiiii+++" +"ii@@@iiiiiiii+++" +"i@@@@@@@@@@@i+++" +"i@+++@@@+++@i+++" +"i@++@SSS@++@i+++" +"i@+@SSSSS@+@i+++" +"i@+@SSSSS@+@i+++" +"i@++@SSS@++@i+++" +"i@+++@@@+++@i+++" +"i@@@@@@@@@@@i+++" +"iiiiiiiiiiiii+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; +char *icon_load = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"i@@@@@@@@@iii+++" +"i@=@==;;@=@ii+++" +"i@=@==;;@==@i+++" +"i@=@==;;@==@i+++" +"i@=@@@@@@==@i+++" +"i@==r======@i+++" +"i@==r======@i+++" +"i@==r======@i+++" +"i@==r======@i+++" +"i@==rrrrr==@i+++" +"i@@@@@@@@@@@i+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_save = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"i@@@@@@@@@iii+++" +"i@=@==;;@=@ii+++" +"i@=@==;;@==@i+++" +"i@=@==;;@==@i+++" +"i@=@@@@@@==@i+++" +"i@===rrrr==@i+++" +"i@==r======@i+++" +"i@===rr====@i+++" +"i@=====r===@i+++" +"i@=rrrr====@i+++" +"i@@@@@@@@@@@i+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_down = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"iiii@@@@@iiii+++" +"iiii@TTT@iiii+++" +"iiii@TTT@iiii+++" +"iiii@TTT@iiii+++" +"i@@@@TTT@@@@i+++" +"i@TTTTTTTTT@i+++" +"ii@TTTTTTT@ii+++" +"iii@TTTTT@iii+++" +"iiii@TTT@iiii+++" +"iiiii@T@iiiii+++" +"iiiiii@iiiiii+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; +char *icon_up = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"iiiiii@iiiiii+++" +"iiiii@T@iiiii+++" +"iiii@TTT@iiii+++" +"iii@TTTTT@iii+++" +"ii@TTTTTTT@ii+++" +"i@TTTTTTTTT@i+++" +"i@@@@TTT@@@@i+++" +"iiii@TTT@iiii+++" +"iiii@TTT@iiii+++" +"iiii@TTT@iiii+++" +"iiii@@@@@iiii+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; +char *icon_left = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"iiiiii@@iiiii+++" +"iiiii@T@iiiii+++" +"iiii@TT@iiiii+++" +"iii@TTT@@@@@i+++" +"ii@TTTTTTTT@i+++" +"i@TTTTTTTTT@i+++" +"ii@TTTTTTTT@i+++" +"iii@TTT@@@@@i+++" +"iiii@TT@iiiii+++" +"iiiii@T@iiiii+++" +"iiiiii@@iiiii+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; +char *icon_right = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"iiiii@@iiiiii+++" +"iiiii@T@iiiii+++" +"iiiii@TT@iiii+++" +"i@@@@@TTT@iii+++" +"i@TTTTTTTT@ii+++" +"i@TTTTTTTTT@i+++" +"i@TTTTTTTT@ii+++" +"i@@@@@TTT@iii+++" +"iiiii@TT@iiii+++" +"iiiii@T@iiiii+++" +"iiiii@@iiiiii+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_gray = +"#MGR000200160016" +"+iiiiiiiiiii++++" +"i@@@@@@@@@@@i+++" +"i@@@@@@****@i+++" +"i@@@@@@****@i+++" +"i@@@@@@****@i+++" +"i@@@@@@****@i+++" +"i@@@@@@@@@@@i+++" +"i@++++@....@i+++" +"i@++++@....@i+++" +"i@++++@....@i+++" +"i@++++@....@i+++" +"i@@@@@@@@@@@i+++" +"+iiiiiiiiiii++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; #ifndef NULL #define NULL (void *)0 diff -ruN mgl2-alpha-020/demos/mgldialog.c mgl2-alpha-020-patched.20090418/demos/mgldialog.c --- mgl2-alpha-020/demos/mgldialog.c 2000-09-09 11:45:13.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/demos/mgldialog.c 2009-04-18 13:49:27.000000000 +0900 @@ -5,25 +5,24 @@ #define NULL (void *)0 #endif -char *icon_warn ="\ -#MGR000200160016 -++++++++++++++++ -++++++fff+++++++ -+++++ff@ff++++++ -++++ff@@@ff+++++ -+++ff@ppp@ff++++ -++ff@@ppp@@ff+++ -+ff@@@ppp@@@ff++ -+f@@@@ppp@@@@f++ -+ff@@@@p@@@@ff++ -++ff@@@@@@@ff+++ -+++ff@ppp@ff++++ -++++ffpppff+++++ -+++++ff@ff++++++ -++++++fff+++++++ -++++++++++++++++ -++++++++++++++++ -"; +char *icon_warn = +"#MGR000200160016" +"++++++++++++++++" +"++++++fff+++++++" +"+++++ff@ff++++++" +"++++ff@@@ff+++++" +"+++ff@ppp@ff++++" +"++ff@@ppp@@ff+++" +"+ff@@@ppp@@@ff++" +"+f@@@@ppp@@@@f++" +"+ff@@@@p@@@@ff++" +"++ff@@@@@@@ff+++" +"+++ff@ppp@ff++++" +"++++ffpppff+++++" +"+++++ff@ff++++++" +"++++++fff+++++++" +"++++++++++++++++" +"++++++++++++++++"; main(int argc,char *argv[]) { int x,y,xs,ys; diff -ruN mgl2-alpha-020/demos/vkdemo.c mgl2-alpha-020-patched.20090418/demos/vkdemo.c --- mgl2-alpha-020/demos/vkdemo.c 2000-09-09 12:07:10.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/demos/vkdemo.c 2009-04-18 13:50:42.000000000 +0900 @@ -55,47 +55,44 @@ */ -char *kb_layout1="\ ------------------------------------------------+ -Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS| ----+---+---+---+---+---+---+---+---+---+---+---+ -Tab| q | w | e | r | t | y | u | i | o | p |Ent| ----+---+---+---+---+---+---+---+---+---+---+- | -Caps| a | s | d | f | g | h | j | k | l | ; |er| -----+---+---+---+---+---+---+---+---+---+---+--| -Shift| z | x | c | v | b | n | m | , | . |¢¬|@ | ------+---+---+---+---+---+---+---+---+---+--+--+ -Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª| ------+-----+-----+-------------+-----------+---+ -"; - -char *kb_layout2="\ ------------------------------------------------+ -Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS| ----+---+---+---+---+---+---+---+---+---+---+---+ -Tab| Q | W | E | R | T | Y | U | I | O | P |Ent| ----+---+---+---+---+---+---+---+---+---+---+- | -Caps| A | S | D | F | G | H | J | K | L | + |er| -----+---+---+---+---+---+---+---+---+---+---+--| -Shift| Z | X | C | V | B | N | M | < | > |¢¬|` | ------+---+---+---+---+---+---+---+---+---+--+--+ -Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª| ------+-----+-----+-------------+-----------+---+ -"; - -char *kb_layout3="\ ------------------------------------------------+ -Esc| | BS| ----+---+---+---+---+---+---+---+---+---+---+---+ -Han| q | w | e | r | t | y | u | i | o | p |Ent| ----+---+---+---+---+---+---+---+---+---+---+- | -Zen | a | s | d | f | g | h | j | k | l | ; |er| -----+---+---+---+---+---+---+---+---+---+---+--| -Kata | z | x | c | v | b | n | m | , | . |¢¬|/ | ------+---+---+---+---+---+---+---+---+---+--+--+ -Dic | \\ | @ | - | = | |Alpha |¢«|¢­|¢ª| ------+-----+-----+-------------+-----------+---+ -"; +char *kb_layout1= +"-----------------------------------------------+" +"Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS|" +"---+---+---+---+---+---+---+---+---+---+---+---+" +"Tab| q | w | e | r | t | y | u | i | o | p |Ent|" +"---+---+---+---+---+---+---+---+---+---+---+- |" +"Caps| a | s | d | f | g | h | j | k | l | ; |er|" +"----+---+---+---+---+---+---+---+---+---+---+--|" +"Shift| z | x | c | v | b | n | m | , | . |¢¬|@ |" +"-----+---+---+---+---+---+---+---+---+---+--+--+" +"Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª|" +"-----+-----+-----+-------------+-----------+---+"; + +char *kb_layout2= +"-----------------------------------------------+" +"Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS|" +"---+---+---+---+---+---+---+---+---+---+---+---+" +"Tab| Q | W | E | R | T | Y | U | I | O | P |Ent|" +"---+---+---+---+---+---+---+---+---+---+---+- |" +"Caps| A | S | D | F | G | H | J | K | L | + |er|" +"----+---+---+---+---+---+---+---+---+---+---+--|" +"Shift| Z | X | C | V | B | N | M | < | > |¢¬|` |" +"-----+---+---+---+---+---+---+---+---+---+--+--+" +"Ctrl |Alt |Hide | |Kanji |¢«|¢­|¢ª|" +"-----+-----+-----+-------------+-----------+---+"; + +char *kb_layout3= +"-----------------------------------------------+" +"Esc| | BS|" +"---+---+---+---+---+---+---+---+---+---+---+---+" +"Han| q | w | e | r | t | y | u | i | o | p |Ent|" +"---+---+---+---+---+---+---+---+---+---+---+- |" +"Zen | a | s | d | f | g | h | j | k | l | ; |er|" +"----+---+---+---+---+---+---+---+---+---+---+--|" +"Kata | z | x | c | v | b | n | m | , | . |¢¬|/ |" +"-----+---+---+---+---+---+---+---+---+---+--+--+" +"Dic | \\ | @ | - | = | |Alpha |¢«|¢­|¢ª|" +"-----+-----+-----+-------------+-----------+---+"; struct { char *str; diff -ruN mgl2-alpha-020/lib/Makefile mgl2-alpha-020-patched.20090418/lib/Makefile --- mgl2-alpha-020/lib/Makefile 2001-03-07 20:50:44.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/lib/Makefile 2009-04-18 13:24:21.000000000 +0900 @@ -139,6 +139,8 @@ ranlib libmgl2_p.a libmgl2.so.${VER} : ${SOBJS} + echo -n OBJS_X11: + echo ${OBJS_X11} ${MGLPIC_LD} ${MGLPIC_LDFLAGS} -o libmgl2.so.${VER}.${REVISION} ${SOBJS} ${DEFAULT_LIBS} ln -sf libmgl2.so.${VER}.${REVISION} libmgl2.so.${VER} ln -sf libmgl2.so.${VER} libmgl2.so diff -ruN mgl2-alpha-020/lib/draw_engine.c mgl2-alpha-020-patched.20090418/lib/draw_engine.c --- mgl2-alpha-020/lib/draw_engine.c 2000-09-09 12:40:42.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/lib/draw_engine.c 2009-04-08 18:58:35.000000000 +0900 @@ -413,6 +413,7 @@ } } ret: + return; } static void gen_bitblt(struct screen *dst, int dx, int dy, struct screen *src, diff -ruN mgl2-alpha-020/lib/emsvr.c mgl2-alpha-020-patched.20090418/lib/emsvr.c --- mgl2-alpha-020/lib/emsvr.c 2001-03-07 20:50:44.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/lib/emsvr.c 2009-04-08 19:54:31.000000000 +0900 @@ -273,145 +273,138 @@ int MK_NINE = MK_F8; #endif #endif -char *icon_mini="\ -#MGR000200160016 -++++++++++++++++ -+++WWWWWWWWW++++ -++WXXXXXXXXXW+++ -+WXXXXXXXXXXXW++ -WXXXXXXXXXXXXXW+ -WXXXXXXXXXXXXXW+ -WXXXXXXXXXXXXXW+ -WXXXXXXXXXXXXXW+ -WXXXXXXXXXXXXXW+ -WXXXXXXXXXXXXXW+ -WXXXXXXXXXXXXXW+ -WXXXXXXXXXXXXXW+ -+WXXXXXXXXXXXW++ -++WXXXXXXXXXW+++ -+++WWWWWWWWW++++ -++++++++++++++++ -"; - -char *icon_main="\ -#MGR000200160016 -++++++++++++++++ -WWWWWWWWWWWWWWW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WjjjjjjjjjjjjjW+ -WWWWWWWWWWWWWWW+ -++++++++++++++++ -"; - -char *icon_ac="\ -#MGR000200160016 -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -+++++++@@@@@++++ -++++++@@@@@@++++ -+++++@@@@@@@@@@+ -+++++@@@@@@@++++ -@@@@@@@@@@@@++++ -+++++@@@@@@@++++ -+++++@@@@@@@@@@+ -++++++@@@@@@++++ -+++++++@@@@@++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_batt="\ -#MGR000200160016 -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -@@@@@@@@@@@@@@++ -@GGGGGGGGGGGG@++ -@GGGGGGGGGGGG@++ -@GGGGGGGGGGGG@@@ -@GGGGGGGGGGGG@@@ -@GGGGGGGGGGGG@@@ -@GGGGGGGGGGGG@++ -@GGGGGGGGGGGG@++ -@@@@@@@@@@@@@@++ -++++++++++++++++ -++++++++++++++++ -++++++++++++++++ -"; - -char *icon_im="\ -#MGR000200160016 -++++++++++++++++ -+++++++@++++++++ -++++++@r@+++++++ -+++++@rrr@++++++ -++++@rrrrr@+++++ -+++@rrrrrrr@++++ -++@rrrrrrrrr@+++ -+@rrrrrrrrrrr@++ -+@@@@@rrr@@@@@++ -+++++@rrr@++++++ -+++++@rrr@++++++ -+++++@rrr@++++++ -+++++@rrr@++++++ -+++++@rrr@++++++ -+++++@rrr@++++++ -+++++@@@@@++++++ -"; - -char *icon_nine="\ -#MGR000200160016 -++++++++++++++++ -++++ggggggg+++++ -+++gkkkkkkkg++++ -++gkkkkkgkkkg+++ -+gkkkkkggkkkkg++ -+gkkkkggkkkkkg++ -+gkkkggkkkkkkg++ -+gkkggkkkkkkkg++ -+gkgggggggggkg++ -+gkkkkkkggkkkg++ -+gkkkkgggkkkkg++ -+gkkkggkkkkkkg++ -++gkkgkkkkkkg+++ -+++gkkkkkkkg++++ -++++ggggggg+++++ -++++++++++++++++ -"; - -char *icon_nine_num="\ -#MGR000200160016 -++++++++++++++++ -++++ggggggg+++++ -+++gkkkkkkkg++++ -++gkkkkkkkkkg+++ -+gkkggkkkggkkg++ -+gkkgggkkggkkg++ -+gkkgggkkggkkg++ -+gkkggkgkggkkg++ -+gkkggkgkggkkg++ -+gkkggkkgggkkg++ -+gkkggkkgggkkg++ -+gkkggkkkggkkg++ -++gkkkkkkkkgg+++ -+++gkkkkkkkg++++ -++++ggggggg+++++ -++++++++++++++++ -"; +char *icon_mini= +"#MGR000200160016" +"++++++++++++++++" +"+++WWWWWWWWW++++" +"++WXXXXXXXXXW+++" +"+WXXXXXXXXXXXW++" +"WXXXXXXXXXXXXXW+" +"WXXXXXXXXXXXXXW+" +"WXXXXXXXXXXXXXW+" +"WXXXXXXXXXXXXXW+" +"WXXXXXXXXXXXXXW+" +"WXXXXXXXXXXXXXW+" +"WXXXXXXXXXXXXXW+" +"WXXXXXXXXXXXXXW+" +"+WXXXXXXXXXXXW++" +"++WXXXXXXXXXW+++" +"+++WWWWWWWWW++++" +"++++++++++++++++"; + +char *icon_main= +"#MGR000200160016" +"++++++++++++++++" +"WWWWWWWWWWWWWWW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WjjjjjjjjjjjjjW+" +"WWWWWWWWWWWWWWW+" +"++++++++++++++++"; + +char *icon_ac= +"#MGR000200160016" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++" +"+++++++@@@@@++++" +"++++++@@@@@@++++" +"+++++@@@@@@@@@@+" +"+++++@@@@@@@++++" +"@@@@@@@@@@@@++++" +"+++++@@@@@@@++++" +"+++++@@@@@@@@@@+" +"++++++@@@@@@++++" +"+++++++@@@@@++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_batt= +"#MGR000200160016" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++" +"@@@@@@@@@@@@@@++" +"@GGGGGGGGGGGG@++" +"@GGGGGGGGGGGG@++" +"@GGGGGGGGGGGG@@@" +"@GGGGGGGGGGGG@@@" +"@GGGGGGGGGGGG@@@" +"@GGGGGGGGGGGG@++" +"@GGGGGGGGGGGG@++" +"@@@@@@@@@@@@@@++" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++++++"; + +char *icon_im= +"#MGR000200160016" +"++++++++++++++++" +"+++++++@++++++++" +"++++++@r@+++++++" +"+++++@rrr@++++++" +"++++@rrrrr@+++++" +"+++@rrrrrrr@++++" +"++@rrrrrrrrr@+++" +"+@rrrrrrrrrrr@++" +"+@@@@@rrr@@@@@++" +"+++++@rrr@++++++" +"+++++@rrr@++++++" +"+++++@rrr@++++++" +"+++++@rrr@++++++" +"+++++@rrr@++++++" +"+++++@rrr@++++++" +"+++++@@@@@++++++"; + +char *icon_nine= +"#MGR000200160016" +"++++++++++++++++" +"++++ggggggg+++++" +"+++gkkkkkkkg++++" +"++gkkkkkgkkkg+++" +"+gkkkkkggkkkkg++" +"+gkkkkggkkkkkg++" +"+gkkkggkkkkkkg++" +"+gkkggkkkkkkkg++" +"+gkgggggggggkg++" +"+gkkkkkkggkkkg++" +"+gkkkkgggkkkkg++" +"+gkkkggkkkkkkg++" +"++gkkgkkkkkkg+++" +"+++gkkkkkkkg++++" +"++++ggggggg+++++" +"++++++++++++++++"; + +char *icon_nine_num= +"#MGR000200160016" +"++++++++++++++++" +"++++ggggggg+++++" +"+++gkkkkkkkg++++" +"++gkkkkkkkkkg+++" +"+gkkggkkkggkkg++" +"+gkkgggkkggkkg++" +"+gkkgggkkggkkg++" +"+gkkggkgkggkkg++" +"+gkkggkgkggkkg++" +"+gkkggkkgggkkg++" +"+gkkggkkgggkkg++" +"+gkkggkkkggkkg++" +"++gkkkkkkkkgg+++" +"+++gkkkkkkkg++++" +"++++ggggggg+++++" +"++++++++++++++++"; #define SWS_INITIALIZING 1 #define SWS_FORGROUND 3 diff -ruN mgl2-alpha-020/lib/ferom.c mgl2-alpha-020-patched.20090418/lib/ferom.c --- mgl2-alpha-020/lib/ferom.c 2000-12-10 02:49:34.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/lib/ferom.c 2009-04-18 14:06:23.000000000 +0900 @@ -96,36 +96,36 @@ ferom_off = 0; switch (size) { case 12: - ferom_font = &romfont[0]; + (s->_pen_font.opt) = (void *)&romfont[0]; ferom_width = ferom_height = 12; break; case 16: - ferom_font = &romfont[1]; + (s->_pen_font.opt) = (void *)&romfont[1]; if (ferom_font->height == 0) { - ferom_font = &romfont[0]; + (s->_pen_font.opt) = (void *)&romfont[0]; ferom_off = 2; } ferom_width = ferom_height = 16; break; case 24: - ferom_font = &romfont[2]; + (s->_pen_font.opt) = (void *)&romfont[2]; if (ferom_font->height == 0) { - ferom_font = &romfont[0]; + (s->_pen_font.opt) = (void *)&romfont[0]; ferom_off = 6; } ferom_width = ferom_height = 24; break; default: if (size == romfont[4].height) { - ferom_font = &romfont[4]; + (s->_pen_font.opt) = (void *)&romfont[4]; ferom_width = ferom_font->width; ferom_height = ferom_font->height; } else if ( size == romfont[5].height) { - ferom_font = &romfont[5]; + (s->_pen_font.opt) = (void *)&romfont[5]; ferom_width = ferom_font->width; ferom_height = ferom_font->height; } else { - ferom_font = &romfont[0]; + (s->_pen_font.opt) = (void *)&romfont[0]; ferom_width = ferom_font->width; ferom_height = ferom_font->height; } diff -ruN mgl2-alpha-020/mgterm/mcalc.c mgl2-alpha-020-patched.20090418/mgterm/mcalc.c --- mgl2-alpha-020/mgterm/mcalc.c 2001-03-09 20:05:20.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/mgterm/mcalc.c 2009-04-18 13:42:20.000000000 +0900 @@ -257,25 +257,24 @@ void mcalc(); -static char *icon_calc="\ -#MGR000200160016 -++++++++++++++++ -++@@@@@@@@@@@@++ -++@..........@++ -++@.********.@++ -++@.********.@++ -++@.********.@++ -++@..........@++ -++@.@@.@@.@@.@++ -++@.@@.@@.@@.@++ -++@..........@++ -++@.@@.@@.@@.@++ -++@.@@.@@.@@.@++ -++@..........@++ -++@@@@@@@@@@@@++ -++++++++++++++++ -++++++++++++++++ -"; +static char *icon_calc= +"#MGR000200160016" +"++++++++++++++++" +"++@@@@@@@@@@@@++" +"++@..........@++" +"++@.********.@++" +"++@.********.@++" +"++@.********.@++" +"++@..........@++" +"++@.@@.@@.@@.@++" +"++@.@@.@@.@@.@++" +"++@..........@++" +"++@.@@.@@.@@.@++" +"++@.@@.@@.@@.@++" +"++@..........@++" +"++@@@@@@@@@@@@++" +"++++++++++++++++" +"++++++++++++++++"; main(int argc, char *argv[]) { int c; diff -ruN mgl2-alpha-020/mgterm/mdate.c mgl2-alpha-020-patched.20090418/mgterm/mdate.c --- mgl2-alpha-020/mgterm/mdate.c 2001-03-09 20:05:20.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/mgterm/mdate.c 2009-04-18 13:37:00.000000000 +0900 @@ -65,25 +65,24 @@ void mdate(); -static char *icon_mdate="\ -#MGR000200160016 -++++++++++++++++ -+@@@@@@@@@@@@@++ -+@...........@++ -+@...........@++ -+@.@.@.@.@.@.@++ -+@.@.@.@.@.@.@++ -+@...........@++ -+@.@.@.@.@.@.@++ -+@...........@++ -+@.@.@.@.@.@.@++ -+@...........@++ -+@.@.@.@.@.@.@++ -+@...........@++ -+@@@@@@@@@@@@@++ -++++++++++++++++ -++++++++++++++++ -"; +static char *icon_mdate= +"#MGR000200160016" +"++++++++++++++++" +"+@@@@@@@@@@@@@++" +"+@...........@++" +"+@...........@++" +"+@.@.@.@.@.@.@++" +"+@.@.@.@.@.@.@++" +"+@...........@++" +"+@.@.@.@.@.@.@++" +"+@...........@++" +"+@.@.@.@.@.@.@++" +"+@...........@++" +"+@.@.@.@.@.@.@++" +"+@...........@++" +"+@@@@@@@@@@@@@++" +"++++++++++++++++" +"++++++++++++++++"; main() { int c; mgl_apli_type = AT_MINIAPLI; @@ -286,6 +285,7 @@ #if (__FreeBSD__ <= 3) #include #endif +#include #include #include diff -ruN mgl2-alpha-020/mgterm/mgterm.c mgl2-alpha-020-patched.20090418/mgterm/mgterm.c --- mgl2-alpha-020/mgterm/mgterm.c 2001-03-09 20:05:20.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/mgterm/mgterm.c 2009-04-18 13:37:42.000000000 +0900 @@ -26,25 +26,24 @@ * */ #ifndef MGL1 -char *icon_mgterm="\ -#MGR000200160016 -+.............++ -...............+ -...*********...+ -..*VVVVVVVVV*..+ -..*VjjVVVjjV*..+ -..*VjVjVjVjV*..+ -..*VjVVjVVjV*..+ -..*VjVVVVVjV*..+ -..*VVVVVVVVV*..+ -.*************.+ -.*8.8.8.8.8.8*.+ -.*.8.8.8.8.8.*.+ -.*************.+ -...............+ -+.............++ -++++++++++++++++ -"; +char *icon_mgterm= +"#MGR000200160016" +"+.............++" +"...............+" +"...*********...+" +"..*VVVVVVVVV*..+" +"..*VjjVVVjjV*..+" +"..*VjVjVjVjV*..+" +"..*VjVVjVVjV*..+" +"..*VjVVVVVjV*..+" +"..*VVVVVVVVV*..+" +".*************.+" +".*8.8.8.8.8.8*.+" +".*.8.8.8.8.8.*.+" +".*************.+" +"...............+" +"+.............++" +"++++++++++++++++"; #endif #ifndef MGL1 diff -ruN mgl2-alpha-020/mgterm/msame.c mgl2-alpha-020-patched.20090418/mgterm/msame.c --- mgl2-alpha-020/mgterm/msame.c 2000-09-09 12:35:24.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/mgterm/msame.c 2009-04-18 13:41:27.000000000 +0900 @@ -32,115 +32,109 @@ #include "mgl2.h" char *picts[6] ={ -"\ -#MGR000200160016 -++++++++++++++++ -+++++++@@+++++++ -+++++@@BB@@@++++ -+++@@BBBBBBB@+++ -++@~@@B@B@B@@@++ -+@~~~~@~@~@~~~@+ -++@~+~~~+~~+~~@+ -++@~~~~~~~~~~@++ -++@~~+~~+~~+~@++ -+++@~~~~~~~~~@++ -+++@~~+~~~~~@+++ -++++@~~~~+~@++++ -+++++@~~+~~@++++ -++++++@~~~@+++++ -+++++++@@@++++++ -++++++++++++++++ -","\ -#MGR000200160016 -++++++++++++++++ -++++++++++++@@++ -++++++++++++@@++ -++@@@@++++++@@++ -+@@::@@+++@@+@++ -+@::::@@@@@++@++ -+@::::@++++++@++ -+@@:::@+++++@@++ -++@:::@++++@@+++ -+++@@@@@@@@@++++ -++++++@:::@@++++ -+++++@@::::@++++ -+++++@@::::@++++ -++++++@:::@@++++ -+++++++@@@@+++++ -++++++++++++++++ -","\ -#MGR000200160016 -++++++++++++++++ -++++++++++++++++ -++++@@@@@@@@++++ -+++@CCCBCBCB@+++ -++@CCCBBCBCBB@++ -+@BCCBBCCBBCBB@+ -+@BCCBBCCBBCBB@+ -+@BCCBBCCBBCBB@+ -+@BCCBBCCBBCCB@+ -+@BBCBBCCBBCCB@+ -+@BBCBBCCBBCBB@+ -++@BCBBCCCBCB@++ -+++@BCBCCBBB@+++ -++++@@@@@@@@++++ -++++++++++++++++ -++++++++++++++++ -","\ -#MGR000200160016 -++++++++++++++++ -++++++++++++++++ -++++++++++++@@++ -+++++@@@@+++@@++ -++++@YYY@+++@@++ -++++@YYY@++@@@++ -++++@@@Y@@@@@+++ -+++@YYY@YYY@++++ -+++@YYY@YYY@++++ -+++@YYY@YY@@@+++ -++@@@Y@@@@YYY@++ -+@YYY@YYY@YYY@++ -+@YYY@YYY@YYY@++ -+@YYY@YYY@@@@+++ -++@@@+@@@+++++++ -++++++++++++++++ -","\ -#MGR000200160016 -++++++++++++++++ -+++++++@@@++++++ -+++++@@BBB@+++++ -++++@l@BBB@@++++ -+++@lll@@@ll@+++ -++@ljlljlllll@++ -+@llllllllljll@+ -+@lljlljlllllj@+ -+@jlllllllllll@+ -+@llljllllljll@+ -+@ljllllljllll@+ -++@lljllllljl@++ -+++@llljllll@+++ -++++@@@@@@@@++++ -++++++++++++++++ -++++++++++++++++ -","\ -#MGR000200160016 -++++++++++++++++ -++++++++@+++++++ -+++++@@@@@@@++++ -+++@@ee@eeee@+++ -++@eeee@eeeee@++ -++@ee@eeee@eee@+ -+@eeee@@@@eeee@+ -+@eeeeeeeeeeee@+ -+@eeeeeeeeeeee@+ -+@eeeeeeeeeeee@+ -+@eeeeeeeeeeee@+ -++@eeeeeeeeee@++ -++@eeeeeeeeee@++ -+++@eeeeeeee@+++ -++++@@@@@@@@++++ -++++++++++++++++ -"}; +"#MGR000200160016" +"++++++++++++++++" +"+++++++@@+++++++" +"+++++@@BB@@@++++" +"+++@@BBBBBBB@+++" +"++@~@@B@B@B@@@++" +"+@~~~~@~@~@~~~@+" +"++@~+~~~+~~+~~@+" +"++@~~~~~~~~~~@++" +"++@~~+~~+~~+~@++" +"+++@~~~~~~~~~@++" +"+++@~~+~~~~~@+++" +"++++@~~~~+~@++++" +"+++++@~~+~~@++++" +"++++++@~~~@+++++" +"+++++++@@@++++++" +"++++++++++++++++", +"#MGR000200160016" +"++++++++++++++++" +"++++++++++++@@++" +"++++++++++++@@++" +"++@@@@++++++@@++" +"+@@::@@+++@@+@++" +"+@::::@@@@@++@++" +"+@::::@++++++@++" +"+@@:::@+++++@@++" +"++@:::@++++@@+++" +"+++@@@@@@@@@++++" +"++++++@:::@@++++" +"+++++@@::::@++++" +"+++++@@::::@++++" +"++++++@:::@@++++" +"+++++++@@@@+++++" +"++++++++++++++++", +"#MGR000200160016" +"++++++++++++++++" +"++++++++++++++++" +"++++@@@@@@@@++++" +"+++@CCCBCBCB@+++" +"++@CCCBBCBCBB@++" +"+@BCCBBCCBBCBB@+" +"+@BCCBBCCBBCBB@+" +"+@BCCBBCCBBCBB@+" +"+@BCCBBCCBBCCB@+" +"+@BBCBBCCBBCCB@+" +"+@BBCBBCCBBCBB@+" +"++@BCBBCCCBCB@++" +"+++@BCBCCBBB@+++" +"++++@@@@@@@@++++" +"++++++++++++++++" +"++++++++++++++++", +"#MGR000200160016" +"++++++++++++++++" +"++++++++++++++++" +"++++++++++++@@++" +"+++++@@@@+++@@++" +"++++@YYY@+++@@++" +"++++@YYY@++@@@++" +"++++@@@Y@@@@@+++" +"+++@YYY@YYY@++++" +"+++@YYY@YYY@++++" +"+++@YYY@YY@@@+++" +"++@@@Y@@@@YYY@++" +"+@YYY@YYY@YYY@++" +"+@YYY@YYY@YYY@++" +"+@YYY@YYY@@@@+++" +"++@@@+@@@+++++++" +"++++++++++++++++", +"#MGR000200160016" +"++++++++++++++++" +"+++++++@@@++++++" +"+++++@@BBB@+++++" +"++++@l@BBB@@++++" +"+++@lll@@@ll@+++" +"++@ljlljlllll@++" +"+@llllllllljll@+" +"+@lljlljlllllj@+" +"+@jlllllllllll@+" +"+@llljllllljll@+" +"+@ljllllljllll@+" +"++@lljllllljl@++" +"+++@llljllll@+++" +"++++@@@@@@@@++++" +"++++++++++++++++" +"++++++++++++++++", +"#MGR000200160016" +"++++++++++++++++" +"++++++++@+++++++" +"+++++@@@@@@@++++" +"+++@@ee@eeee@+++" +"++@eeee@eeeee@++" +"++@ee@eeee@eee@+" +"+@eeee@@@@eeee@+" +"+@eeeeeeeeeeee@+" +"+@eeeeeeeeeeee@+" +"+@eeeeeeeeeeee@+" +"+@eeeeeeeeeeee@+" +"++@eeeeeeeeee@++" +"++@eeeeeeeeee@++" +"+++@eeeeeeee@+++" +"++++@@@@@@@@++++" +"++++++++++++++++" +}; static int vk_attached=0; static struct virtual_key *vk_canvas; static struct screen *ps[6]; @@ -410,7 +404,7 @@ } *undo_top; static void push_undo() { - extern char *malloc(); + // extern char *malloc(); struct undo_buf *buf; int i,j; unsigned int x; diff -ruN mgl2-alpha-020/mil/mil.c mgl2-alpha-020-patched.20090418/mil/mil.c --- mgl2-alpha-020/mil/mil.c 2000-09-09 12:40:44.000000000 +0900 +++ mgl2-alpha-020-patched.20090418/mil/mil.c 2009-04-18 13:43:16.000000000 +0900 @@ -27,25 +27,24 @@ * */ -char *icon_mil ="\ -#MGR000200160016 -+ooooooooooooo++ -ooooooooooooooo+ -ooEEEoooooooooo+ -oooooEEoooooooo+ -ooooooooooooooo+ -ooEEEoooooooooo+ -oooooEEoooooooo+ -ooooooooEoEoooo+ -ooEEEoooEoEoooo+ -oooooEEoEoEoooo+ -ooooooooEoEooEo+ -oooooooEEoEoEoo+ -ooooooEoooEEooo+ -ooooooooooooooo+ -+ooooooooooooo++ -++++++++++++++++ -"; +char *icon_mil = +"#MGR000200160016" +"+ooooooooooooo++" +"ooooooooooooooo+" +"ooEEEoooooooooo+" +"oooooEEoooooooo+" +"ooooooooooooooo+" +"ooEEEoooooooooo+" +"oooooEEoooooooo+" +"ooooooooEoEoooo+" +"ooEEEoooEoEoooo+" +"oooooEEoEoEoooo+" +"ooooooooEoEooEo+" +"oooooooEEoEoEoo+" +"ooooooEoooEEooo+" +"ooooooooooooooo+" +"+ooooooooooooo++" +"++++++++++++++++"; #include #include