aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKylie McClain <kylie@somas.is>2021-06-04 12:03:17 -0400
committerKylie McClain <kylie@somas.is>2021-06-05 19:01:27 -0400
commitea59fd2840f44e81e9e898184ba967d9efb81118 (patch)
tree76d5e37070478581630e1930c248167000d1e2f6
parentb8ff61efe51796b24d3221ec7bbeb104b9c9db8e (diff)
downloadxmascot-ea59fd2840f44e81e9e898184ba967d9efb81118.tar.gz
xmascot-ea59fd2840f44e81e9e898184ba967d9efb81118.tar.xz
xmascot-ea59fd2840f44e81e9e898184ba967d9efb81118.zip
mascots: consolidate locations, fix typos
-rw-r--r--Makefile52
-rw-r--r--main.c4
-rw-r--r--mascots/icon.xbm (renamed from xbmfile/icon.xbm)0
-rw-r--r--mascots/osu.xbm (renamed from xbmfile/osu.xbm)0
-rw-r--r--mascots/osu.xbmmsk (renamed from xbmfile/osu.xbmmsk)0
-rw-r--r--mascots/select.xbm (renamed from xbmfile/select.xbm)0
-rw-r--r--mascots/tumamu.xbm (renamed from xbmfile/tumamu.xbm)0
-rw-r--r--mascots/tumamu.xbmmsk (renamed from xbmfile/tumamu.xbmmsk)0
-rw-r--r--mascots/yubi.xbm (renamed from xbmfile/yubi.xbm)0
-rw-r--r--mascots/yubi.xbmmsk (renamed from xbmfile/yubi.xbmmsk)0
-rw-r--r--mascots/zodiac-README39
-rw-r--r--mascots/zodiac-README.jp39
-rw-r--r--mascots/zodiac-aquarius.gif (renamed from mascots/zodiac/aquarius.gif)bin1530 -> 1530 bytes
-rw-r--r--mascots/zodiac-aries.gif (renamed from mascots/zodiac/aries.gif)bin936 -> 936 bytes
-rw-r--r--mascots/zodiac-cancer.gif (renamed from mascots/zodiac/canser.gif)bin1239 -> 1239 bytes
-rw-r--r--mascots/zodiac-capricorn.gif (renamed from mascots/zodiac/capric.gif)bin1448 -> 1448 bytes
-rw-r--r--mascots/zodiac-gemini.gif (renamed from mascots/zodiac/gemini.gif)bin1545 -> 1545 bytes
-rw-r--r--mascots/zodiac-leo.gif (renamed from mascots/zodiac/leo.gif)bin1167 -> 1167 bytes
-rw-r--r--mascots/zodiac-libra.gif (renamed from mascots/zodiac/libra.gif)bin2283 -> 2283 bytes
-rw-r--r--mascots/zodiac-pisces.gif (renamed from mascots/zodiac/pisces.gif)bin809 -> 809 bytes
-rw-r--r--mascots/zodiac-sagittarius.gif (renamed from mascots/zodiac/sagitt.gif)bin1282 -> 1282 bytes
-rw-r--r--mascots/zodiac-scorpio.gif (renamed from mascots/zodiac/scorpio.gif)bin1172 -> 1172 bytes
-rw-r--r--mascots/zodiac-taurus.gif (renamed from mascots/zodiac/taurus.gif)bin980 -> 980 bytes
-rw-r--r--mascots/zodiac-virgo.gif (renamed from mascots/zodiac/virgo.gif)bin2133 -> 2133 bytes
-rw-r--r--mascots/zodiac.Xdefaults (renamed from mascots/zodiac/zodiac.Xdefaults)10
-rw-r--r--mascots/zodiac.Xdefaults.jp (renamed from mascots/zodiac/zodiac.Xdefaults.jp)6
-rw-r--r--mascots/zodiac/README39
27 files changed, 112 insertions, 77 deletions
diff --git a/Makefile b/Makefile
index 2ac2691..8d3fe1f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,39 +40,37 @@ OBJS := \
MASCOTS := \
mascots/chain.gif \
mascots/fish.gif \
+ mascots/icon.xbm \
mascots/inu.gif \
mascots/kuma.gif \
mascots/logo.gif \
mascots/monohosi.gif \
mascots/neko2.gif \
mascots/neko.gif \
+ mascots/osu.xbm \
+ mascots/osu.xbmmsk \
mascots/pen.gif \
mascots/pin.gif \
mascots/rabi.gif \
mascots/saru.gif \
+ mascots/select.xbm \
mascots/teru.gif \
- xbmfile/icon.xbm \
- xbmfile/osu.xbm \
- xbmfile/osu.xbmmsk \
- xbmfile/select.xbm \
- xbmfile/tumamu.xbm \
- xbmfile/tumamu.xbmmsk \
- xbmfile/yubi.xbm \
- xbmfile/yubi.xbmmsk
-
-ZODIAC := \
- mascots/zodiac/aquarius.gif \
- mascots/zodiac/aries.gif \
- mascots/zodiac/canser.gif \
- mascots/zodiac/capric.gif \
- mascots/zodiac/gemini.gif \
- mascots/zodiac/leo.gif \
- mascots/zodiac/libra.gif \
- mascots/zodiac/pisces.gif \
- mascots/zodiac/sagitt.gif \
- mascots/zodiac/scorpio.gif \
- mascots/zodiac/taurus.gif \
- mascots/zodiac/virgo.gif
+ mascots/tumamu.xbm \
+ mascots/tumamu.xbmmsk \
+ mascots/yubi.xbm \
+ mascots/yubi.xbmmsk \
+ mascots/zodiac-aquarius.gif \
+ mascots/zodiac-aries.gif \
+ mascots/zodiac-cancer.gif \
+ mascots/zodiac-capricorn.gif \
+ mascots/zodiac-gemini.gif \
+ mascots/zodiac-leo.gif \
+ mascots/zodiac-libra.gif \
+ mascots/zodiac-pisces.gif \
+ mascots/zodiac-sagittarius.gif \
+ mascots/zodiac-scorpio.gif \
+ mascots/zodiac-taurus.gif \
+ mascots/zodiac-virgo.gif
all: xmascot XMascot.ad japanese/XMascot.ad
@@ -82,9 +80,9 @@ imagelib/image.a:
xmascot: ${OBJS} imagelib/image.a
${CC} ${LDFLAGS} ${OBJS} ${LDLIBS} imagelib/image.a -o $@
-XMascot.ad: XMascot.ad.sed mascots/zodiac/zodiac.Xdefaults
+XMascot.ad: XMascot.ad.sed mascots/zodiac.Xdefaults
sed 's!XMASCOTDIR!${xmascotdir}!' XMascot.ad.sed > $@
- sed 's!menu1!menu1!' mascots/zodiac/zodiac.Xdefaults >> $@
+ sed 's!menu1!menu1!' mascots/zodiac.Xdefaults >> $@
# sed 's!menu1!menu2!' mascots/dokyu2/dokyu2.Xdefaults >> $@
# sed 's!menu1!menu3!' mascots/nadesico/nadesico.Xdefaults >> $@
# sed 's!menu1!menu4!' mascots/kakyu/kakyu.Xdefaults >> $@
@@ -92,9 +90,9 @@ XMascot.ad: XMascot.ad.sed mascots/zodiac/zodiac.Xdefaults
# sed 's!menu1!menu6!' mascots/etc/etc.Xdefaults >> $@
echo "*menusNum: 2" >> $@
-japanese/XMascot.ad: japanese/XMascot.ad.sed mascots/zodiac/zodiac.Xdefaults
+japanese/XMascot.ad: japanese/XMascot.ad.sed mascots/zodiac.Xdefaults
sed 's!XMASCOTDIR!${xmascotdir}!' japanese/XMascot.ad.sed > $@
- sed 's!menu1!menu1!' mascots/zodiac/zodiac.Xdefaults >> $@
+ sed 's!menu1!menu1!' mascots/zodiac.Xdefaults >> $@
# sed 's!menu1!menu2!' mascots/dokyu2/dokyu2.Xdefaults >> $@
# sed 's!menu1!menu3!' mascots/nadesico/nadesico.Xdefaults >> $@
# sed 's!menu1!menu4!' mascots/kakyu/kakyu.Xdefaults >> $@
@@ -114,9 +112,7 @@ install: xmascot XMascot.ad japanese/XMascot.ad ${MASCOTS}
install -d ${DESTDIR}${x11dir}/ja_JP.eucJP/app-defaults
install -m0644 japanese/XMascot.ad ${DESTDIR}${x11dir}/ja_JP.eucJP/app-defaults/XMascot
install -d ${DESTDIR}${xmascotdir}
- install -d ${DESTDIR}${xmascotdir}/zodiac
for f in ${MASCOTS}; do install -m0644 $${f} ${DESTDIR}${xmascotdir}/$${f##*/}; done
- for f in ${ZODIAC}; do install -m0644 $${f} ${DESTDIR}${xmascotdir}/zodiac/$${f##*/}; done
clean:
rm -f ${OBJS} xmascot XMascot.ad japanese/XMascot.ad
diff --git a/main.c b/main.c
index 7dd7dd1..b718bf1 100644
--- a/main.c
+++ b/main.c
@@ -40,11 +40,11 @@ extern AppData adat; /* リソースデータ構造体 */
/* 変更メニュー用の選択マーク */
Pixmap select_mark;
-#include "xbmfile/select.xbm"
+#include "mascots/select.xbm"
/* アイコン */
Pixmap icon;
-#include "xbmfile/icon.xbm"
+#include "mascots/icon.xbm"
/* コマンドラインオプション */
static XrmOptionDescRec options[] = {
diff --git a/xbmfile/icon.xbm b/mascots/icon.xbm
index 0a8768f..0a8768f 100644
--- a/xbmfile/icon.xbm
+++ b/mascots/icon.xbm
diff --git a/xbmfile/osu.xbm b/mascots/osu.xbm
index 8b2e05c..8b2e05c 100644
--- a/xbmfile/osu.xbm
+++ b/mascots/osu.xbm
diff --git a/xbmfile/osu.xbmmsk b/mascots/osu.xbmmsk
index 1343f80..1343f80 100644
--- a/xbmfile/osu.xbmmsk
+++ b/mascots/osu.xbmmsk
diff --git a/xbmfile/select.xbm b/mascots/select.xbm
index a422984..a422984 100644
--- a/xbmfile/select.xbm
+++ b/mascots/select.xbm
diff --git a/xbmfile/tumamu.xbm b/mascots/tumamu.xbm
index c1f3838..c1f3838 100644
--- a/xbmfile/tumamu.xbm
+++ b/mascots/tumamu.xbm
diff --git a/xbmfile/tumamu.xbmmsk b/mascots/tumamu.xbmmsk
index b318ed1..b318ed1 100644
--- a/xbmfile/tumamu.xbmmsk
+++ b/mascots/tumamu.xbmmsk
diff --git a/xbmfile/yubi.xbm b/mascots/yubi.xbm
index 6818614..6818614 100644
--- a/xbmfile/yubi.xbm
+++ b/mascots/yubi.xbm
diff --git a/xbmfile/yubi.xbmmsk b/mascots/yubi.xbmmsk
index 3d97bf7..3d97bf7 100644
--- a/xbmfile/yubi.xbmmsk
+++ b/mascots/yubi.xbmmsk
diff --git a/mascots/zodiac-README b/mascots/zodiac-README
new file mode 100644
index 0000000..b83dbdd
--- /dev/null
+++ b/mascots/zodiac-README
@@ -0,0 +1,39 @@
+-------------------------------------
+ XMascot 菴遵鴻潟
+
+ 藥12絎綺
+
+ Copyright 1996 TUT Computer Club
+-------------------------------------
+
+1.篏睡号
+
+ (1) 絽障 mag <ゃXMascot 泣若
+ ccャ障XMascot 激鴻c
+ ( $(LIBDIR)/X11/xmascot , 絽 /usr/X11R6/lib/X11/xmascot )
+ 潟c障 XMascot 激с -search
+ 純若 XMascot*search ф絎с障
+
+ (2) 篁絮 zodiac.Xdefaults 純若鴻<ゃ
+ ( ~/.Xdefaults ) 菴遵障
+ 筝с泣若鴻 zodiac*search: mag
+ 絎с
+ XMascot <ゃ菴遵障障
+
+ xrdb 篏帥c翫% xrdb -merge .zodiac.Xdefaults
+ 茯粋昭障с
+
+ (3) % xmascot -name zodiac
+ 莎桁違<ャ若12絎綺сц儀障
+
+2.篏罔
+
+ 絽>散 XMascot 羣障
+ 宴若吾障鴻潟若帥篏罔
+ ч 紕 (makino@cclub.tutcc.tut.ac.jp)篆障
+
+
+
+
+
+ \ No newline at end of file
diff --git a/mascots/zodiac-README.jp b/mascots/zodiac-README.jp
new file mode 100644
index 0000000..b83dbdd
--- /dev/null
+++ b/mascots/zodiac-README.jp
@@ -0,0 +1,39 @@
+-------------------------------------
+ XMascot 菴遵鴻潟
+
+ 藥12絎綺
+
+ Copyright 1996 TUT Computer Club
+-------------------------------------
+
+1.篏睡号
+
+ (1) 絽障 mag <ゃXMascot 泣若
+ ccャ障XMascot 激鴻c
+ ( $(LIBDIR)/X11/xmascot , 絽 /usr/X11R6/lib/X11/xmascot )
+ 潟c障 XMascot 激с -search
+ 純若 XMascot*search ф絎с障
+
+ (2) 篁絮 zodiac.Xdefaults 純若鴻<ゃ
+ ( ~/.Xdefaults ) 菴遵障
+ 筝с泣若鴻 zodiac*search: mag
+ 絎с
+ XMascot <ゃ菴遵障障
+
+ xrdb 篏帥c翫% xrdb -merge .zodiac.Xdefaults
+ 茯粋昭障с
+
+ (3) % xmascot -name zodiac
+ 莎桁違<ャ若12絎綺сц儀障
+
+2.篏罔
+
+ 絽>散 XMascot 羣障
+ 宴若吾障鴻潟若帥篏罔
+ ч 紕 (makino@cclub.tutcc.tut.ac.jp)篆障
+
+
+
+
+
+ \ No newline at end of file
diff --git a/mascots/zodiac/aquarius.gif b/mascots/zodiac-aquarius.gif
index e1d4905..e1d4905 100644
--- a/mascots/zodiac/aquarius.gif
+++ b/mascots/zodiac-aquarius.gif
Binary files differ
diff --git a/mascots/zodiac/aries.gif b/mascots/zodiac-aries.gif
index 159a0d7..159a0d7 100644
--- a/mascots/zodiac/aries.gif
+++ b/mascots/zodiac-aries.gif
Binary files differ
diff --git a/mascots/zodiac/canser.gif b/mascots/zodiac-cancer.gif
index 68cd6f3..68cd6f3 100644
--- a/mascots/zodiac/canser.gif
+++ b/mascots/zodiac-cancer.gif
Binary files differ
diff --git a/mascots/zodiac/capric.gif b/mascots/zodiac-capricorn.gif
index 8177b5a..8177b5a 100644
--- a/mascots/zodiac/capric.gif
+++ b/mascots/zodiac-capricorn.gif
Binary files differ
diff --git a/mascots/zodiac/gemini.gif b/mascots/zodiac-gemini.gif
index c0dad53..c0dad53 100644
--- a/mascots/zodiac/gemini.gif
+++ b/mascots/zodiac-gemini.gif
Binary files differ
diff --git a/mascots/zodiac/leo.gif b/mascots/zodiac-leo.gif
index 41017da..41017da 100644
--- a/mascots/zodiac/leo.gif
+++ b/mascots/zodiac-leo.gif
Binary files differ
diff --git a/mascots/zodiac/libra.gif b/mascots/zodiac-libra.gif
index 8cad299..8cad299 100644
--- a/mascots/zodiac/libra.gif
+++ b/mascots/zodiac-libra.gif
Binary files differ
diff --git a/mascots/zodiac/pisces.gif b/mascots/zodiac-pisces.gif
index de61eb1..de61eb1 100644
--- a/mascots/zodiac/pisces.gif
+++ b/mascots/zodiac-pisces.gif
Binary files differ
diff --git a/mascots/zodiac/sagitt.gif b/mascots/zodiac-sagittarius.gif
index fb388a9..fb388a9 100644
--- a/mascots/zodiac/sagitt.gif
+++ b/mascots/zodiac-sagittarius.gif
Binary files differ
diff --git a/mascots/zodiac/scorpio.gif b/mascots/zodiac-scorpio.gif
index f84d4bc..f84d4bc 100644
--- a/mascots/zodiac/scorpio.gif
+++ b/mascots/zodiac-scorpio.gif
Binary files differ
diff --git a/mascots/zodiac/taurus.gif b/mascots/zodiac-taurus.gif
index 5055055..5055055 100644
--- a/mascots/zodiac/taurus.gif
+++ b/mascots/zodiac-taurus.gif
Binary files differ
diff --git a/mascots/zodiac/virgo.gif b/mascots/zodiac-virgo.gif
index 2a56e15..2a56e15 100644
--- a/mascots/zodiac/virgo.gif
+++ b/mascots/zodiac-virgo.gif
Binary files differ
diff --git a/mascots/zodiac/zodiac.Xdefaults b/mascots/zodiac.Xdefaults
index 2e0216c..7520c34 100644
--- a/mascots/zodiac/zodiac.Xdefaults
+++ b/mascots/zodiac.Xdefaults
@@ -1,6 +1,6 @@
! XMascot Zodiac Data
-*menu1.title: Zodiac Mascot Menu
+*menu1.title: Mascots: Zodiac
*menu1.numsOfMenu: 12
*menu1.masDat0.title: Aries
@@ -12,8 +12,8 @@
*menu1.masDat2.title: Gemini
*menu1.masDat2.filename: gemini.gif
-*menu1.masDat3.title: Canser
-*menu1.masDat3.filename: canser.gif
+*menu1.masDat3.title: Cancer
+*menu1.masDat3.filename: cancer.gif
*menu1.masDat4.title: Leo
*menu1.masDat4.filename: leo.gif
@@ -28,10 +28,10 @@
*menu1.masDat7.filename: scorpio.gif
*menu1.masDat8.title: Sagittarius
-*menu1.masDat8.filename: sagitt.gif
+*menu1.masDat8.filename: sagittarius.gif
*menu1.masDat9.title: Capricorn
-*menu1.masDat9.filename: capric.gif
+*menu1.masDat9.filename: capricorn.gif
*menu1.masDat10.title: Aquarius
*menu1.masDat10.filename: aquarius.gif
diff --git a/mascots/zodiac/zodiac.Xdefaults.jp b/mascots/zodiac.Xdefaults.jp
index 153e63f..2140c9d 100644
--- a/mascots/zodiac/zodiac.Xdefaults.jp
+++ b/mascots/zodiac.Xdefaults.jp
@@ -13,7 +13,7 @@
*menu1.masDat2.filename: gemini.gif
*menu1.masDat3.title: 蟹座
-*menu1.masDat3.filename: canser.gif
+*menu1.masDat3.filename: cancer.gif
*menu1.masDat4.title: 獅子座
*menu1.masDat4.filename: leo.gif
@@ -28,10 +28,10 @@
*menu1.masDat7.filename: scorpio.gif
*menu1.masDat8.title: 射手座
-*menu1.masDat8.filename: sagitt.gif
+*menu1.masDat8.filename: sagittarius.gif
*menu1.masDat9.title: 山羊座
-*menu1.masDat9.filename: capric.gif
+*menu1.masDat9.filename: capricorn.gif
*menu1.masDat10.title: 水瓶座
*menu1.masDat10.filename: aquarius.gif
diff --git a/mascots/zodiac/README b/mascots/zodiac/README
deleted file mode 100644
index df10206..0000000
--- a/mascots/zodiac/README
+++ /dev/null
@@ -1,39 +0,0 @@
--------------------------------------
- XMascot $BDI2C%^%9%3%C%H(B
-
- $B2+F;(B12$B5\@1:B(B
-
- Copyright 1996 TUT Computer Club
--------------------------------------
-
-1.$B;HMQJ}K!(B
-
- (1) $BG[I[$K4^$^$l$k(B mag $B%U%!%$%k$r!"(BXMascot $B$N%5!<%A%Q%9(B
- $B$,DL$C$?%G%#%l%/%H%j$KF~$l$^$9!#(BXMascot $B$N%7%9%F%`%G%#%l%/%H%j(B
- ( $(LIBDIR)/X11/xmascot , $BDL>o(B /usr/X11R6/lib/X11/xmascot )
- $B$+!"%+%l%s%H%G%#%l%/%H%j!"$^$?(B XMascot $B$N%*%W%7%g%s(B -search
- $B$d(B $B%j%=!<%9(B XMascot*search $B$G;XDj$G$-$^$9!#(B
-
- (2) $BIUB0$N(B zodiac.Xdefaults $B$r!"<+J,$N%j%=!<%9%U%!%$%k(B
- ( ~/.Xdefaults $B$J$I(B ) $B$KDI2C$7$^$9!#(B
- $B$3$NCf$G%5!<%A%Q%9$r(B zodiac*search: mag$B$r$$$l$?$H$3$m(B
- $B$H;XDj$7$F$b$$$$$G$7$g$&!#(B
- XMascot $B$N%G%U%)%k%H%U%!%$%k$KDI2C$7$F$b$+$^$$$^$;$s!#(B
-
- xrdb $B$r;H$C$F$$$k>l9g$O!"(B% xrdb -merge .zodiac.Xdefaults $B$H(B
- $B$7$FFI$_9~$^$;$F$b$$$$$G$7$g$&!#(B
-
- (3) % xmascot -name zodiac
- $B$H$7$F5/F0$9$l$P!"%a%K%e!<$,(B12$B5\@1:B$G5/F0$7$^$9!#(B
-
-2.$BCx:n8"(B
-
- $BG[I[$J$I$N>r7o$O(B XMascot $B$K=`$8$^$9!#(B
- $B$3$N%Q%C%1!<%8$K4^$^$l$k%^%9%3%C%H$N%G!<%?$NCx:n8"$O!"(B
- $BKRLn(B $BDp;N(B (makino@cclub.tutcc.tut.ac.jp)$B$,J]M-$7$^$9!#(B
-
-
-
-
-
- \ No newline at end of file