From 2fe31eec46d8629b25a11f51fc88256c8ef8cf44 Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 9 Dec 2019 11:15:49 -0800 Subject: [PATCH] more Qt rename In order for 'make depend' to be able to handle both Qt4/5 and Qt3, they need to operate on different object file names. renames qt*.o to qt3*.o for Qt3 renames qt*.cpp to qt3*.cpp for Qt3 (not essential but seems worthwhile) moves Qt3's headers from include/qt*.h to win/Qt3/qt3*.h copies include/qt_xpms.h (before rename) or win/Qt3/qt3_xpms.h (after) to win/Qt/qt_xpms.h so that Qt4/5 no longer shares one header file modifies win/Qt3/*.cpp and win/Qt3/qt3_win.h to reflect new header names modifies Makefile.src to have Qt3 'moc' commands use new names updates Makefile.src via re-running 'make depend' 'make depend' was only looking at include/*.h to find nested inclusion. Now it will also look at win/*/*.h. That found a bunch of missing dependencies for the old gnome sources and a few for Qt3. Building without Qt still works. Building with it (any version) has not been tested. --- sys/unix/Makefile.src | 188 ++- sys/unix/depend.awk | 29 +- {include => win/Qt}/qt_xpms.h | 0 win/Qt3/{qt_clust.cpp => qt3_clust.cpp} | 4 +- include/qt_clust.h => win/Qt3/qt3_clust.h | 0 include/qt_kde0.h => win/Qt3/qt3_kde0.h | 0 win/Qt3/{qt_win.cpp => qt3_win.cpp} | 14 +- include/qt_win.h => win/Qt3/qt3_win.h | 6 +- win/Qt3/qt3_xpms.h | 1422 +++++++++++++++++ win/Qt3/{qttableview.cpp => qt3tableview.cpp} | 4 +- .../qttableview.h => win/Qt3/qt3tableview.h | 0 11 files changed, 1576 insertions(+), 91 deletions(-) rename {include => win/Qt}/qt_xpms.h (100%) rename win/Qt3/{qt_clust.cpp => qt3_clust.cpp} (96%) rename include/qt_clust.h => win/Qt3/qt3_clust.h (100%) rename include/qt_kde0.h => win/Qt3/qt3_kde0.h (100%) rename win/Qt3/{qt_win.cpp => qt3_win.cpp} (99%) rename include/qt_win.h => win/Qt3/qt3_win.h (99%) create mode 100644 win/Qt3/qt3_xpms.h rename win/Qt3/{qttableview.cpp => qt3tableview.cpp} (99%) rename include/qttableview.h => win/Qt3/qt3tableview.h (100%) diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 3efc6fa7b..8e22fc003 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -1,5 +1,5 @@ # NetHack Makefile. -# NetHack 3.6 Makefile.src $NHDT-Date: 1575767152 2019/12/08 01:05:52 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.83 $ +# NetHack 3.6 Makefile.src $NHDT-Date: 1575917700 2019/12/09 18:55:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.86 $ # Copyright (c) 2018 by Pasi Kallinen # NetHack may be freely redistributed. See license for details. @@ -224,10 +224,11 @@ WINX11SRC = ../win/X11/Window.c ../win/X11/dialogs.c ../win/X11/winX.c \ WINX11OBJ = Window.o dialogs.o winX.o winmap.o winmenu.o winmesg.o \ winmisc.o winstat.o wintext.o winval.o tile.o # -# Files for a Qt port +# Files for a Qt 3 port (renamed since nethack 3.6.x) # -WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_clust.cpp ../win/Qt/qttableview.cpp -WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o +WINQT3SRC = ../win/Qt3/qt3_win.cpp ../win/Qt3/qt3_clust.cpp \ + ../win/Qt3/qt3tableview.cpp +WINQT3OBJ = qt3_win.o qt3_clust.o qt3tableview.o tile.o # # Files for a Qt 4 or 5 port # @@ -473,7 +474,7 @@ GENCSRC = vis_tab.c #tile.c # all windowing-system-dependent .c (for dependencies and such) WINCSRC = $(WINTTYSRC) $(WINCURSESSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC) # all windowing-system-dependent .cpp (for dependencies and such) -WINCXXSRC = $(WINQTSRC) $(WINBESRC) +WINCXXSRC = $(WINQTSRC) $(WINQT3SRC) $(WINBESRC) # Files for window system chaining. Requires SYSCF; include via HINTSRC/HINTOBJ CHAINSRC = ../win/chain/wc_chainin.c ../win/chain/wc_chainout.c \ @@ -601,14 +602,12 @@ objects.o: @rm -f $(MAKEDEFS) # Qt 3 windowport meta-object-compiler output -qt3kde0.moc: ../include/qt_kde0.h - $(QTDIR)/bin/moc -o qt3kde0.moc ../include/qt_kde0.h - -qt3win.moc: ../include/qt_win.h - $(QTDIR)/bin/moc -o qt3win.moc ../include/qt_win.h - -qttableview.moc: ../include/qttableview.h - $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h +qt3_kde0.moc: ../win/Qt3/qt3_kde0.h + $(QTDIR)/bin/moc -o qt3kde0.moc ../win/Qt3/qt3_kde0.h +qt3_win.moc: ../win/Qt3/qt3_win.h + $(QTDIR)/bin/moc -o qt3win.moc ../win/Qt3/qt3_win.h +qt3tableview.moc: ../win/Qt3/qt3tableview.h + $(QTDIR)/bin/moc -o qt3tableview.moc ../win/Qt/qt3tableview.h # Qt 4 windowport meta-object-compiler output qt_kde0.moc : ../win/Qt/qt_kde0.h @@ -709,7 +708,7 @@ spotless: clean depend: ../sys/unix/depend.awk \ $(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \ $(CHAINSRC) $(GENCSRC) $(HACKCSRC) - $(AWK) -f ../sys/unix/depend.awk ../include/*.h \ + $(AWK) -f ../sys/unix/depend.awk ../include/*.h ../win/*/*.h \ $(SYSCSRC) $(WINCSRC) $(SYSCXXSRC) $(WINCXXSRC) \ $(CHAINSRC) $(GENCSRC) $(HACKCSRC) >makedep @echo '/^# DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT/+2,$$d' >eddep @@ -841,44 +840,82 @@ tile.o: tile.c $(HACK_H) gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \ ../win/gnome/gnmain.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnaskstr.c -gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \ - ../win/gnome/gnmenu.h ../win/gnome/gnaskstr.h \ - ../win/gnome/gnyesno.h +gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnomeprv.h \ + $(HACK_H) ../include/dlb.h ../include/patchlevel.h \ + ../include/winGnome.h ../win/gnome/gnmain.h \ + ../win/gnome/gnmap.h ../win/gnome/gnmenu.h \ + ../win/gnome/gnplayer.h ../win/gnome/gnsignal.h \ + ../win/gnome/gnglyph.h ../win/gnome/gnstatus.h \ + ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ + ../win/gnome/gnyesno.h ../win/gnome/gnworn.h \ + ../win/gnome/gnaskstr.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnbind.c -gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h ../include/tile2x11.h +gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(CONFIG_H) \ + ../include/tile2x11.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnglyph.c gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \ - ../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \ - ../include/date.h + ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ + ../include/patchlevel.h ../include/winGnome.h \ + ../win/gnome/gnglyph.h ../win/gnome/gnbind.h \ + ../win/gnome/gnmap.h ../win/gnome/gnmenu.h \ + ../win/gnome/gnplayer.h ../win/gnome/gnstatus.h \ + ../win/gnome/gntext.h ../win/gnome/gnmesg.h \ + ../win/gnome/gnyesno.h ../win/gnome/gnworn.h \ + ../win/gnome/gnopts.h ../include/date.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmain.c -gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnsignal.h $(HACK_H) +gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h $(CONFIG_H) \ + ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \ + ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ + ../include/patchlevel.h ../include/winGnome.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmap.c -gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \ - ../win/gnome/gnbind.h ../include/func_tab.h +gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h $(CONFIG_H) \ + ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ + ../include/patchlevel.h ../include/winGnome.h \ + ../win/gnome/gnmain.h ../win/gnome/gnbind.h \ + ../win/gnome/gnmap.h ../win/gnome/gnplayer.h \ + ../win/gnome/gnsignal.h ../win/gnome/gnglyph.h \ + ../win/gnome/gnstatus.h ../win/gnome/gntext.h \ + ../win/gnome/gnmesg.h ../win/gnome/gnyesno.h \ + ../win/gnome/gnworn.h ../include/func_tab.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmenu.c -gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h +gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h $(CONFIG_H) \ + ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h $(HACK_H) \ + ../include/dlb.h ../include/patchlevel.h ../include/winGnome.h \ + ../win/gnome/gnglyph.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnmesg.c gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) + $(CONFIG_H) ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H) $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnopts.c gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \ ../win/gnome/gnmain.h $(HACK_H) $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnplayer.c gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \ - ../win/gnome/gnmain.h + ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ + ../include/patchlevel.h ../include/winGnome.h \ + ../win/gnome/gnglyph.h ../win/gnome/gnmain.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnsignal.c -gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h \ - ../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \ - ../win/gnome/gnomeprv.h +gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h $(CONFIG_H) \ + ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h $(HACK_H) \ + ../include/dlb.h ../include/patchlevel.h ../include/winGnome.h \ + ../win/gnome/gnglyph.h ../win/gnome/gn_xpms.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnstatus.c -gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \ - ../win/gnome/gn_rip.h +gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h $(CONFIG_H) \ + ../win/gnome/gnmain.h ../win/gnome/gn_rip.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gntext.c -gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h +gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h \ + ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ + ../include/patchlevel.h ../include/winGnome.h \ + ../win/gnome/gnmain.h ../win/gnome/gnmap.h \ + ../win/gnome/gnmenu.h ../win/gnome/gnplayer.h \ + ../win/gnome/gnsignal.h ../win/gnome/gnglyph.h \ + ../win/gnome/gnstatus.h ../win/gnome/gntext.h \ + ../win/gnome/gnmesg.h ../win/gnome/gnyesno.h \ + ../win/gnome/gnworn.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnyesno.c -gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \ - ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h +gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h $(CONFIG_H) \ + ../win/gnome/gnglyph.h ../win/gnome/gnsignal.h \ + ../win/gnome/gnomeprv.h $(HACK_H) ../include/dlb.h \ + ../include/patchlevel.h ../include/winGnome.h $(CC) $(CFLAGS) $(GNOMEINC) -c -o $@ ../win/gnome/gnworn.c wingem.o: ../win/gem/wingem.c $(HACK_H) ../include/func_tab.h ../include/dlb.h \ ../include/patchlevel.h ../include/wingem.h @@ -894,11 +931,14 @@ tile.o: tile.c $(HACK_H) cppregex.o: ../sys/share/cppregex.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../sys/share/cppregex.cpp qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_bind.h \ - ../win/Qt/qt_click.h ../win/Qt/qt_delay.h ../win/Qt/qt_xcmd.h \ - ../win/Qt/qt_key.h ../win/Qt/qt_map.h ../win/Qt/qt_menu.h \ - ../win/Qt/qt_msg.h ../win/Qt/qt_plsel.h ../win/Qt/qt_svsel.h \ - ../win/Qt/qt_set.h ../win/Qt/qt_stat.h ../win/Qt/qt_streq.h \ - ../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h ../include/dlb.h + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h \ + ../win/Qt/qt_delay.h ../win/Qt/qt_xcmd.h ../win/Qt/qt_key.h \ + ../win/Qt/qt_map.h ../win/Qt/qt_win.h ../win/Qt/qt_clust.h \ + ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h ../win/Qt/qt_msg.h \ + ../win/Qt/qt_plsel.h ../win/Qt/qt_svsel.h ../win/Qt/qt_set.h \ + ../win/Qt/qt_stat.h ../win/Qt/qt_icon.h ../win/Qt/qt_streq.h \ + ../win/Qt/qt_line.h ../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h \ + ../include/dlb.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_bind.cpp qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_click.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp @@ -919,56 +959,76 @@ qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_key.h qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_line.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_line.cpp qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) ../include/patchlevel.h \ - ../win/Qt/qt_main.h qt_main.moc ../win/Qt/qt_bind.h \ - ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h ../win/Qt/qt_key.h \ - ../win/Qt/qt_map.h ../win/Qt/qt_msg.h ../win/Qt/qt_set.h \ - ../win/Qt/qt_stat.h ../win/Qt/qt_str.h qt_kde0.moc + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h qt_main.moc \ + ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h \ + ../win/Qt/qt_key.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ + ../win/Qt/qt_clust.h ../win/Qt/qt_msg.h ../win/Qt/qt_set.h \ + ../win/Qt/qt_stat.h ../win/Qt/qt_icon.h ../win/Qt/qt_str.h \ + qt_kde0.moc $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_main.cpp -qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_map.h qt_map.moc \ - ../win/Qt/qt_click.h ../win/Qt/qt_glyph.h ../include/qt_xpms.h \ - ../win/Qt/qt_set.h ../win/Qt/qt_str.h - $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp -qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_menu.h qt_menu.moc \ - ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_streq.h \ +qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ + ../win/Qt/qt_clust.h qt_map.moc ../win/Qt/qt_click.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_xpms.h ../win/Qt/qt_set.h \ ../win/Qt/qt_str.h + $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp +qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_menu.h \ + ../win/Qt/qt_win.h ../win/Qt/qt_rip.h qt_menu.moc \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_streq.h \ + ../win/Qt/qt_line.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_menu.cpp -qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_msg.h qt_msg.moc \ - ../win/Qt/qt_map.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h +qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_msg.h ../win/Qt/qt_win.h \ + qt_msg.moc ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \ + ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_msg.cpp qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_plsel.h qt_plsel.moc \ - ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h \ - ../win/Qt/qt_str.h + ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_plsel.cpp qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_rip.h \ - ../win/Qt/qt_bind.h ../win/Qt/qt_str.h + ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_rip.cpp qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_set.h qt_set.moc \ ../win/Qt/qt_glyph.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_set.cpp -qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_stat.h qt_stat.moc \ - ../win/Qt/qt_set.h ../win/Qt/qt_str.h ../include/qt_xpms.h +qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_stat.h \ + ../win/Qt/qt_win.h ../win/Qt/qt_icon.h qt_stat.moc \ + ../win/Qt/qt_set.h ../win/Qt/qt_str.h ../win/Qt/qt_xpms.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp qt_str.o: ../win/Qt/qt_str.cpp ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_str.cpp qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_streq.h \ - ../win/Qt/qt_str.h + ../win/Qt/qt_line.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_svsel.h \ - ../win/Qt/qt_bind.h ../win/Qt/qt_str.h + ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_svsel.cpp qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_win.h \ - ../win/Qt/qt_bind.h ../win/Qt/qt_click.h ../win/Qt/qt_glyph.h \ - ../win/Qt/qt_inv.h ../win/Qt/qt_key.h ../win/Qt/qt_icon.h \ - ../win/Qt/qt_map.h ../win/Qt/qt_menu.h ../win/Qt/qt_msg.h \ - ../win/Qt/qt_set.h ../win/Qt/qt_clust.h + ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + ../win/Qt/qt_click.h ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h \ + ../win/Qt/qt_key.h ../win/Qt/qt_icon.h ../win/Qt/qt_map.h \ + ../win/Qt/qt_clust.h ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h \ + ../win/Qt/qt_msg.h ../win/Qt/qt_set.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \ ../win/Qt/qt_xcmd.h qt_xcmd.moc ../win/Qt/qt_bind.h \ - ../win/Qt/qt_set.h ../win/Qt/qt_str.h + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h \ + ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_xcmd.cpp qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_yndlg.h qt_yndlg.moc \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp +qt3_win.o: ../win/Qt3/qt3_win.cpp $(HACK_H) ../include/func_tab.h \ + ../include/dlb.h ../include/patchlevel.h ../include/tile2x11.h \ + ../win/Qt3/qt3_win.h ../win/Qt3/qt3_clust.h \ + ../win/Qt3/qt3_kde0.h ../win/Qt3/qt3_xpms.h qt3_win.moc \ + qt3_kde0.moc qt3tableview.moc + $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3_win.cpp +qt3_clust.o: ../win/Qt3/qt3_clust.cpp ../win/Qt3/qt3_clust.h + $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3_clust.cpp +qt3tableview.o: ../win/Qt3/qt3tableview.cpp ../win/Qt3/qt3tableview.h + $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt3/qt3tableview.cpp wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H) $(CC) $(CFLAGS) -c -o $@ ../win/chain/wc_chainin.c wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H) diff --git a/sys/unix/depend.awk b/sys/unix/depend.awk index c367f97e0..ac4416230 100644 --- a/sys/unix/depend.awk +++ b/sys/unix/depend.awk @@ -1,6 +1,6 @@ # depend.awk -- awk script used to construct makefile dependencies # for nethack's source files (`make depend' support for Makefile.src). -# $NHDT-Date: 1546220373 2018/12/31 01:39:33 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.8 $ +# $NHDT-Date: 1575916941 2019/12/09 18:42:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.10 $ # # usage: # cd src ; nawk -f depend.awk ../include/*.h list-of-.c/.cpp-files @@ -43,20 +43,23 @@ FNR == 1 { output_dep() #finish previous file #[3.6.2: curses headers likewise] #[3.7.0: Qt headers have moved] if (incl ~ /\.h$/) { - if (incl ~ "curses\.h") - incl = "" # skip "curses.h"; it should be - + if (incl ~ "curses\.h") + incl = "" # skip "curses.h"; it should be else if (incl ~ /^..\/lib\/lua-.*\/src\/l/) - incl = "" # skip lua headers + incl = "" # skip lua headers else if (incl ~ /^curs/) # curses special case incl = "../win/curses/" incl - else if (incl ~ /^qtext.h/) # qtext.h special case - incl = "../include/" incl - else if (incl ~ /^qt_xpms.h/) # qt_xpms.h special case - incl = "../include/" incl - else if (incl ~ /^qt/) # Qt v4 special case - incl = "../win/Qt/" incl - else if (incl ~ /^gn/) # gnomehack special case + else if (incl ~ /^qt/) { # Qt special cases + # qtext.h is a core header that accidentally matches... + if (incl ~ /^qtext.h/) # ...the Qt exception + incl = "../include/" incl + # Qt v3 headers are in ../win/Qt3 + # Qt v4/v5 headers are in ../win/Qt + else if (FILENAME ~ /^\.\.\/win\/Qt3\/.*/) + incl = "../win/Qt3/" incl + else # Qt v4 + incl = "../win/Qt/" incl + } else if (incl ~ /^gn/) # gnomehack special case incl = "../win/gnome/" incl else incl = "../include/" incl @@ -108,7 +111,7 @@ function output_specials( i, sp, alt_sp) # write a target and its dependency list in pretty-printed format; # if target's primary source file has a path prefix, also write build command # -function format_dep(target, source, n, i, list) +function format_dep(target, source, col, n, i, list) { split("", done) #``for (x in done) delete done[x]'' printf("%s:", target); col = length(target) + 1 diff --git a/include/qt_xpms.h b/win/Qt/qt_xpms.h similarity index 100% rename from include/qt_xpms.h rename to win/Qt/qt_xpms.h diff --git a/win/Qt3/qt_clust.cpp b/win/Qt3/qt3_clust.cpp similarity index 96% rename from win/Qt3/qt_clust.cpp rename to win/Qt3/qt3_clust.cpp index c5063a6a3..6b1039f9b 100644 --- a/win/Qt3/qt_clust.cpp +++ b/win/Qt3/qt3_clust.cpp @@ -1,7 +1,7 @@ -/* NetHack 3.6 qt_clust.cpp $NHDT-Date: 1524684507 2018/04/25 19:28:27 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ */ +/* NetHack 3.6 qt_clust.cpp $NHDT-Date: 1575917719 2019/12/09 18:55:19 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ */ /* Copyright (c) Warwick Allison, 1999. */ /* NetHack may be freely redistributed. See license for details. */ -#include "qt_clust.h" +#include "qt3_clust.h" static void include(QRect& r, const QRect& rect) diff --git a/include/qt_clust.h b/win/Qt3/qt3_clust.h similarity index 100% rename from include/qt_clust.h rename to win/Qt3/qt3_clust.h diff --git a/include/qt_kde0.h b/win/Qt3/qt3_kde0.h similarity index 100% rename from include/qt_kde0.h rename to win/Qt3/qt3_kde0.h diff --git a/win/Qt3/qt_win.cpp b/win/Qt3/qt3_win.cpp similarity index 99% rename from win/Qt3/qt_win.cpp rename to win/Qt3/qt3_win.cpp index 919018c41..9fe0e81ab 100644 --- a/win/Qt3/qt_win.cpp +++ b/win/Qt3/qt3_win.cpp @@ -1,4 +1,4 @@ -// NetHack 3.6 qt_win.cpp $NHDT-Date: 1524684508 2018/04/25 19:28:28 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.77 $ +// NetHack 3.6 qt_win.cpp $NHDT-Date: 1575917720 2019/12/09 18:55:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ // Copyright (c) Warwick Allison, 1999. // NetHack may be freely redistributed. See license for details. @@ -74,7 +74,7 @@ extern "C" { } -#include "qt_win.h" +#include "qt3_win.h" #include #include #include @@ -98,8 +98,8 @@ extern "C" { #include -#include "qt_clust.h" -#include "qt_xpms.h" +#include "qt3_clust.h" +#include "qt3_xpms.h" #include #ifdef Q_WS_MACX @@ -5303,10 +5303,10 @@ extern "C" void play_usersound(const char* filename, int volume) #endif } -#include "qt_win.moc" +#include "qt3_win.moc" #ifndef KDE -#include "qt_kde0.moc" +#include "qt3_kde0.moc" #endif #if QT_VERSION >= 300 -#include "qttableview.moc" +#include "qt3tableview.moc" #endif diff --git a/include/qt_win.h b/win/Qt3/qt3_win.h similarity index 99% rename from include/qt_win.h rename to win/Qt3/qt3_win.h index 136e8a6ef..8de29d92f 100644 --- a/include/qt_win.h +++ b/win/Qt3/qt3_win.h @@ -1,4 +1,4 @@ -// NetHack 3.6 qt_win.h $NHDT-Date: 1447755972 2015/11/17 10:26:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.17 $ +// NetHack 3.6 qt_win.h $NHDT-Date: 1575917700 2019/12/09 18:55:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ // Copyright (c) Warwick Allison, 1999. // NetHack may be freely redistributed. See license for details. // @@ -52,7 +52,7 @@ #include #endif -#include "qt_clust.h" +#include "qt3_clust.h" class QVBox; class QMenuBar; @@ -737,7 +737,7 @@ class NetHackQtInvUsageWindow : public QWidget // note the actual class of the windows. // #ifndef KDE -#include "qt_kde0.h" +#include "qt3_kde0.h" #endif class NetHackQtMainWindow : public KTopLevelWidget diff --git a/win/Qt3/qt3_xpms.h b/win/Qt3/qt3_xpms.h new file mode 100644 index 000000000..5667c13c0 --- /dev/null +++ b/win/Qt3/qt3_xpms.h @@ -0,0 +1,1422 @@ +/* clang-format off */ +/* XPM */ +static const char *blind_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 5 1", +/* colors */ +" c #000000", +". c None", +"X c #909090", +"o c #606060", +"O c #303030", +/* pixels */ +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"....ooooooooooooooooooooooooooooooooX...", +".... o...", +".... o...", +".... o...", +".... o...", +"......o ..o ......", +"......X O..X O......", +"....... o... o......", +".......o ....o .......", +"........O X.....O X.......", +".........O X.......O X........", +"..........o OX.........o OX.........", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................", +"........................................" +}; +/* XPM */ +static const char *cha_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 14 1", +/* colors */ +" c #F85848", +". c #949E9E", +"X c #F8B090", +"o c #E00028", +"O c #D4D4D4", +"+ c None", +"@ c #B0B0B0", +"# c #F82C24", +"$ c #F89E6C", +"% c #FF0000", +"& c #909090", +"* c #FFFFFF", +"= c #CEAA90", +"- c #DADAB6", +/* pixels */ +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"+++++++++++++++=#%#=+=#%% ++++++++++++++", +"++++++++++++++ %O%%%#%$$%o%=++++++++++++", +"+++++++++++++# +#%%o%%o%%%%% +++++++++++", +"+++++++++++ %%%%%%%%%%%%%%%%o#=+++++++++", +"+++++++++ o%%%%%%%%%%%%%%%%%%%%# +++++++", +"++++++ #%%%%%%o%%%o%%o%%o%o%%%%%o%o +++", +"++=#%%o%%%#= =*+**O*+**O*+- = =%%%%#@+++", +"++++ %=++*+*+**O****O****O*O*O*OO%=+++++", +"+++++.%=OO+*O*OO****+****+*O*+O&%=@+++++", +"++++++=%=*OO+**O**O*O**O*O*OO+$%=+++++++", +"+++++++#% +*OOOO****+****@O+*#%=++++++++", +"++++++++#%#*+**+O+OO+O+OOO*O#o#+++++++++", +"+++++++++o% O**+****O****O*#%%=+++++++++", +"+++++++++ %%#O*O****+****+ %o#++++++++++", +"++++++++++o%% XO*O**O*O**#%%%+++++++++++", +"++++++++++ %%%o%$-**+**$%%%%=+++++++++++", +"+++++++++++o%%$X$%%%%%%#= o#++++++++++++", +"++++++++++@ %%%o#O$$+$$$%%%=++++++++++++", +"++++++++++++#o%%%%%%%%o%%%=@++++++++++++", +"+++++++++++++ %%%%%%%%%%o=++++++++++++++", +"+++++++++++++++= & & @++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++" +}; +/* XPM */ +static const char *chaotic_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 9 1", +/* colors */ +" c #000000", +". c #5C7A7A", +"X c None", +"o c #B0B0B0", +"O c #909090", +"+ c #788C8C", +"@ c #606060", +"# c #FFFFFF", +"$ c #303030", +/* pixels */ +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXXXXXX@$ @XXXXXXXXXXXX", +"XXXXXXXXXXXXXXXXXXX$$+#X$ $XXXXXXXXXX", +"XXXXXXXXXXXXXXXXXX@$#o @XXXXXXXXX", +"XXXXXXXXXXXXXXXXXX$XX OXXXXXXXX", +"XXXXXXXXXXXXXXXXX@ # $@$ $XXXXXXXX", +"XXXXXXXXXXXXXXXXX@.+ $XXXO @XXXXXXX", +"XXXXXXXXXXXXXXXXX O@ XXXXX@ @XXXXXXX", +"XXXXXXXXXXXXXXXXX @O $XXXXX@$ @XXXXXXX", +"XXXXXXXXXXXXXXXXX O+ @XXXXO++ @XXXXXXX", +"XXXXXXXXXXXXXXXXX @+ $@OXO$#$ XXXXXXXX", +"XXXXXXXXXXXXXXXXX O@ $ @$Xo $XXXXXXXX", +"XXXXXXXXXXXXXXXXX +O $X##+ $XXXXXXXXX", +"XXXXXXXXXXXXXXXXX +@ $XXXXXXXXXX", +"XXXXXXXXXXXXXXXXX oO $XXXXXXXXXXX", +"XXXXXXXXO@@@@@ +# $XXXXXXXXXXXX", +"XXXXXXO +o########$ $@XXXXXXXXX", +"XXXXXX +#+.$XXXXXXXX", +"XXXXXX @O @XXXXXXX", +"XXXXXX$ $@ $@@$ @XXXXXXX", +"XXXXXXX@@@@XXXXXX + @XXXX@$ OXXXXXXX", +"XXXXXXXXXXXXXXXX@ # @XXXXXXX@@OXXXXXXXX", +"XXXXXXXXXXXXXXXX@.+ @XXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXX$O@ XXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXX @O XXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXX #$ @XXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXX # @XXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXX # @XXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX@ # @XXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX@ # OXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX@.X XXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX ++ XXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX @+ XXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX O@ @XXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX +O @XXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX @XXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXX$ OXXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXX@@OXXXXXXXXXXXXXXXXXXXXX", +"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" +}; +/* XPM */ +static const char *cns_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 19 1", +/* colors */ +" c #000000", +". c #F85848", +"X c #949E9E", +"o c #F8B090", +"O c #E00028", +"+ c #7C3400", +"@ c None", +"# c #B0B0B0", +"$ c #F82C24", +"% c #F89E6C", +"& c #FF0000", +"* c #B64700", +"= c #909090", +"- c #788C8C", +"; c #606060", +": c #C80050", +"> c #CEAA90", +", c #303030", +"< c #FFB691", +/* pixels */ +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@.oo.o$ ;@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@>.o.%%O,@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@$oo.o. ,@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@.oo$oo+ =@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@..o&oo$ ,@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@#.o.oo. =@.$%@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@.o..oo& O.%ooo@@@@@@@@@@@@@", +"@@@@@@@@@@@@@.o.&%o.$oo%O++;@@@@@@@@@@@@", +"@@@@@@@@@@@@@.o.+$%$o.@@@@@@@@@@@", +"@@@@@@@@@@@@@.oo++o%$$ ,@@$.oo@@@@@@@@@@", +"@@@@@@@@@@@@>.oo+Oo$o%.@@$oo..-@@@@@@@@@", +"@@@@@@@@@@@@..o%;.o&%.$..o%O ++>@@@@@@@@", +"@@@@@@@@@@@@>.$O:%o.O::::O* $oooo@@@@@@@", +"@@@@@@@@@@@@::::::$$:OO&OO::oo%.;=@@@@@@", +"@@@@@@@@@@@.::::::::O&&&&&O::++ ,@@@@@@", +"@@@@@@@@@@>:::O&&OO&&&&&&&&:: ;@@@@@", +"@@@@@@@@@@=::O&&&&&O:O&&&&&O: ,=@@@@@@@", +"@@@@@@@@@@:::&&&&&&&&:&&&&&O: ;@@@@@@@@", +"@@@@@@@@@@::O&&&&&&&&:&O&&&O:, ;@@@@@@@@", +"@@@@@@@@@@::O&&&&O&O&OO&O&&O:+ ;@@@@@@@@", +"@@@@@@@@@@::&&&O&&&&&O:&&&&O:, @@@@@@@@", +"@@@@@@@@@@::O&&&&&O&&&:O&O&::+ @@@@@@@@", +"@@@@@@@@@@::O&&O&&&&O&OO&&&:: @@@@@@@@", +"@@@@@@@@@@=::O&&&&O&&&O:&&&:: @@@@@@@@", +"@@@@@@@@@@.:::O&&O&&&&&:&OO:: @@@@@@@@", +"@@@@@@@@@@@:::::&&&&O&O:&&O:, @@@@@@@@", +"@@@@@@@@@@.>:::::O&&&&&:&&::+ ;@@@@@@@@", +"@@@@@@@@@@>.<::::O&&O&O:&&:: @@@@@@@@@", +"@@@@@@@@@@@.o%,:::O&&&O:&O:, @@@@@@@@@", +"@@@@@@@@@@@$o. :::OO&OO&::, ;@@@@@@@@@", +"@@@@@@@@@@@&o%+ ,::O&OO&O:: =@@@@@@@@@", +"@@@@@@@@@@@.oo+ :::OO::: ,@@@@@@@@@@", +"@@@@@@@@@@@..oO +::::: =@@@@@@@@@@", +"@@@@@@@@@@@@.<.+ ,+, ,@@@@@@@@@@@", +"@@@@@@@@@@@@Oo<+ @X, ,@@@@@@@@@@@@", +"@@@@@@@@@@@@.%o$ @@@@@;, ;@@@@@@@@@@@@@", +"@@@@@@@@@@@@@.o., =@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" +}; +/* XPM */ +static const char *confused_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 13 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #FFFFFF", +"* c #303030", +"= c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOO.=.+OO=.+O.OO+O+OO.+OOOOOO", +"OOOOOOOOOOO++=====O=====+=O+==++=O+OOOOO", +"OOOOOOOOOOO+=.=====.=++++===OO==+O=+OOOO", +"OOOOOOOOOOO=+===.+=o==o===+&OoO======OOO", +"OOOOOOOO+O+====OO+=o&&&&Oo==o&oO+==+=.O.", +"OOOO+.+=+O==+&&o=oooOo&o&ooo=&oooO==O=+=", +"OOOOOOOO++O===oo=oo&=&o&&oo=o==&o+==++==", +"OOOOOOOO=o.=O====o&OO&o&oo&o&&oo=======O", +"OOOOOOOo===+=O=O=ooO=ooooOOo=o&O=====OOO", +"OOOOOOOOO+==+=======O=oo====O=o=O===+OOO", +"OOOOOOOOO.=#=X=+====O========O======OOOO", +"OOOOOOO.#Xo++.=#%====O==========OO==+OOO", +"OOOOOO+Xo#+#+.#=.==X====+====O=+=+==+OOO", +"OOOOO.+.+O===##.#=X.====oX##===o+OO.OOOO", +"OOOOO#+####O#O##o.#+==#X#O#+...=OOo=+OOO", +"OOOO++#o+#+X++++#.#O.#+#X.#+X+==+OO=oOOO", +"OOOO#+.+..X+.##X++#++#..+XX#+##+..OOOOOO", +"OOOO##....O+#++#+.++#+X+#+#X..+#+#OOOOOO", +"OOOO++#+.+.#+#O+X#X#XX#.++##.#++.X$OOOOO", +"OOOOO#+#+.+++#++.+++##+X###+X+X##+**OOOO", +"OOOOO#..#OO#+.##o###.+..++.+#X+#+#* @OOO", +"OOOOO+#.#O+#+#O.+++.###+##++###+.#* $OOO", +"OOOOOOXX+#+#+#o..X##++#+..##.#+### *OOO", +"OOOOOOOX#.#X+#+#+#+.#+..+####%XX%% OOO", +"OOOOOOOO.%%X.#+#+#.++#+#+#+.X++=.% *OOO", +"OOOOOOOOO.* *##+#+.O####.+XX%%%%#% $OOO", +"OOOOOOOOOOO. %X.+.#+++XXX=.+++#X $OOO", +"OOOOOOOOOOOO.* %%X..#X%=.####%X* $OOO", +"OOOOOOOOOOOOOO.$ *XX%%%=.#X%###=* OOOO", +"OOOOOOOOOOOOOOOOOO+%%%=%%#.+.#=* @OOOO", +"OOOOOOOOOOOOOOOOOOo=%%%==X##X%* OOOOO", +"OOOOOOOOOOOOOOOOOOO+X%%%%X=%* @OOOOO", +"OOOOOOOOOOOOOOOOOOOOX%%%%X *@OOOOOO", +"OOOOOOOOOOOOOOOOOOOO=%%%X* *$$OOOOOOOO", +"OOOOOOOOOOOOOOOOOOOO+X%%= .OOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOX%%% OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOO=%%* $OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOO=%%% $OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOO+%%% $OOOOOOOOOOOOO" +}; +/* XPM */ +static const char *dex_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 19 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #F8B090", +"o c #5C7A7A", +"O c #D4D4D4", +"+ c #F87A24", +"@ c #7C3400", +"# c None", +"$ c #B0B0B0", +"% c #F89E6C", +"& c #B64700", +"* c #909090", +"= c #606060", +"- c #CEAA90", +"; c #DADAB6", +": c #303030", +"> c #F86800", +", c #FFB691", +"< c #F88C48", +/* pixels */ +"########################################", +"########################################", +"########################################", +"########################################", +"########################################", +"########################################", +"###############-%-######################", +"##############-%X<-#####################", +"#########-<<-#-%XX+==###################", +"#########%,X< :<,X%@ :##################", +"#########-XX%: @;X%+ *#################", +"##########<,X& :<<%+: :#################", +"######->+#-%%%: <,XX@ #################", +"######%X%@ <,,& @XXX+ :++-#############", +"######-: +XX+ #########", +"#####+%%@@,X%<,XXXXXXX<:@XXX<: =########", +"####$%XX< <,<,XX& ########", +"#####$%<%X@%XXXX<%XX< =#######", +"#######<;X%XXXXX<<,XXXXXX%,XXXXXXXXX%@ #######", +"##########- c #788C8C", +", c #606060", +"< c #406868", +"1 c #C80050", +"2 c #FFFFFF", +"3 c #FFFF00", +"4 c #00B6FF", +"5 c #CEAA90", +"6 c #DADAB6", +"7 c #F86800", +"8 c #FFB691", +"9 c #6C91B6", +"0 c #F88C48", +"q c #0000FF", +/* pixels */ +"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$$$353333335*$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$*33333333#7@3335$$$$$$$$$$$$", +"$$$$$$$$$65333333333@7777#333*$$$$$$$$$$", +"$$$$$$$$$3333333333377777733333===%$$$$$", +"$$$$$$$533333333333#7777777333%=====$$$$", +"$$$$$$ #3333333333o>7777773330======%$$$", +"$$$$5---O#33333o3944077777333*=======$$$", +"$$$$-----O333333>4444.77333330======%$$$", +"$$$ ---O--;3333344444443333333:====5$$$$", +"$$$ O-----733333444444433333333 ==035$$$", +"$$$3--O--O333333>44444>33333333333333$$$", +"$$533---O33333333944493333#333333333356$", +"$$33867733333o33333:o333333o3333333333$$", +"$532+2233333#333333333333oooo3#3333333%$", +"6522222+33333333333333333oooooo33o3333*$", +"$+22+22263333333o3333333ooooooo333333356", +"662222+2533333333333333#ooooooo33333333$", +"$32+22223333o3#33333o333ooooooo3#333333%", +"$33222233333333333#333333ooooo333333333$", +"$33368333333333333330626*oooo#333333o33%", +"%333335== 33oo333333222223#333333333333$", +"$3333=====:ooooo333+22+2263333333.>o333%", +"$5333=====oooooo33322222223333339444935$", +"$*33 ====>ooooooo3362+222633333.44444>3$", +"$%330====:ooooooo333222+23333334444444$$", +"$$333177 =oooXoo#333*626333333;4444444$$", +"$$53##777&3oooo3333333333333#--,444449$$", +"$$$3;77777#3o333333333333333O---94449$$$", +"$$%*@77777#33333333333333337O----O:o3$$$", +"$$$5777777333 333333333333;---O-O73$$$$", +"$$$$#7777730====#:.,33333333------3$$$$$", +"$$$$$577333=====qqqq<0333333#O---35$$$$$", +"$$$$$%53335====qqqqqq.33o333337735$$$$$$", +"$$$$$$$533 ====qqqqqqq3333333333%$$$$$$$", +"$$$$$$$$%33====qqqqqqq333333333%$$$$$$$$", +"$$$$$$$$$$50===qqqqqq,3333333:$$$$$$$$$$", +"$$$$$$$$$%6%5503,qqq<333#335%$$$$$$$$$$$", +"$$$$$$$$$$$$$%$*53,03335o$%%$$$$$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$$%$$+$$$$$$$$$$$$$$$" +}; +/* XPM */ +static const char *hungry_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 15 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #FFFFFF", +"* c #CEAA90", +"= c #DADAB6", +"- c #303030", +"; c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO========OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOO=============OOOOOOOOOOOOO", +"OO;XX;@OOOOO================OOOOOOOO;XOO", +"OO;%-;$OOOO==================OOOOOOO;XOO", +"OO;-%;$OOO========@$#@========OOOOO+;;$O", +"OO;%-;$OO=======- -*======*OOOO.;;$O", +"OO;-%;$O======* @====.$$&=====@OOO.;;$O", +"OO;X%;$O====== -========*@=====*.OO+;;$O", +"OO;;;X$o====* -==========@======$OO;;;$O", +"OO+;;-+o====- =============o====#@O+;;$O", +"OOO;%$O===== @=============&====*$O;;;$O", +"OOO+%OO====@ ==============&=====-OO;;$O", +"OOo;-Oo====$ ==============o&==== OO;;$O", +"OOO+%OO====@ ==============&===== O+;;#O", +"OOO;-Oo====$-==============&&==== O+;;-O", +"OOO;;+O=====$*============&&====* OO;;%+", +"OOO;;$o=====$.============&&====X-OO;;$O", +"OOO;;$O======*.===&======&&=====-$=O;;$O", +"OOO;;$Oo=====.==========&&=====* @O+;;$O", +"OOO;;$OO=======oo=====&&&======$-OOO;;$O", +"OOO;;$OOo=======&o&&&&&&======$ @OOO;;$O", +"OOO;;$OOOO========&=&========* $OOOO;;$O", +"OO+;;$OOOOo=================* -OOOOO#;$O", +"OOO;;$OOOOO=*==============@ -=OOOOO;;$O", +"OOO;;$OOOOOOO+*==========*- $OOOOOOO;;$O", +"OOOX-$OOOOOOOO@X@*====*#- -.OOOOOOOOX-$O", +"OOOOOOOOOOOOOO=*@$- -$.=OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOO=O==O=O=OOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *hvy_enc_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 13 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #FFFFFF", +"* c #303030", +"= c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOoO+OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOoOXX==OOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOoO=OO+==OOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOoXOO.*$=$OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO=+# *.X *OOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO==.OO=+@ $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOXO==.OO $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOO+=@$@* @OOOOOOOOOOOOOO", +"OOOOOOOOOOO&&&&&&&&&&&&&&&.OOOOOOOOOOOOO", +"OOOOOOOOOOOo==============X*OOOOOOOOOOOO", +"OOOOOOOOOOoO===X====X=====X**OOOOOOOOOOO", +"OOOOOOOOOO&============X===% $OOOOOOOOOO", +"OOOOOOOOOoo===*%====***%===%* OOOOOOOOOO", +"OOOOOOOOOoO==% %===* %==X* @OOOOOOOOO", +"OOOOOOOOO&===% *==% X==**===% $OOOOOOOOO", +"OOOOOOOOoo===% %==% ===% ===X OOOOOOOOO", +"OOOOOOOOoO==== *== *==== *==X* @OOOOOOOO", +"OOOOOOOO&===== %== %==== %===% $OOOOOOOO", +"OOOOOOOoo===== *== *==== *===%* OOOOOOOO", +"OOOOOOOoO===== %==% ===* ====X* @OOOOOOO", +"OOOOOOO&===X== *==% X==**=====% $OOOOOOO", +"OOOOOOoo===== *==* %=====X OOOOOOO", +"OOOOOOoO=====*%%X===*%*X======%* @OOOOOO", +"OOOOOOo====================X===* $OOOOOO", +"OOOOOOO=%X%XXXX%XXXXXXXXX%X=%X% OOOOOO", +"OOOOOOO.=********************** OOOOOO", +"OOOOOOOOO OOOOOO", +"OOOOOOOOO. @OOOOOO", +"OOOOOOOOOOOoOOoOoOoOoOoOoOOoOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *int_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 12 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #303030", +"* c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOO+#.X.##@#OOOOOOOOOOOOOOOOOO", +"OOOOOOOO+##@X#O++.#+#.##OOOOOOOOOOOOOOOO", +"OOOOOO+#Xo++#X#%#+##o#O#.#+OOOOOOOOOOOOO", +"OOOOO.Xo#+#++##+.XX#..+.+..XOOOOOOOOOOOO", +"OOOO++.+O.+O##+#.X###..OX#.+X+OOOOOOOOOO", +"OOOO#+####O#O##o##+###X#+#+.#..OOOOOOOOO", +"OOO.+#o+#+X++++#.#O+#+#X.#+X++X+OOOOOOOO", +"OOO.+.+..X+.##X++#++#..+XX#+#X+..OOOOOOO", +"OOO##....O+#++#+.++#+X+#+#X..+#+#OOOOOOO", +"OOO++#+.+.#+#O+X#X#XX#.++##.#++.X$OOOOOO", +"OOOO#+#+.+++#++.+++##+X###+X+X##+&&OOOOO", +"OOOO#..#OO#+.##o###.+..++.+#X+#+#& @OOOO", +"OOOO.#.#O+#+#O.+++.###+##++###+.# $OOOO", +"OOOOOXX+#+#+#o..X##++#+..##.#+### &OOOO", +"OOOOOOX#.#X+#+#+#+.#+..+####XX%X% OOOO", +"OOOOOOO.%%X.#+#+#.++#+#+#+.%++*+% &OOOO", +"OOOOOOOO@& &##+#+.O####.+XXX%%%#% $OOOO", +"OOOOOOOOOO. %X.+.#+++XXX*.+++#% $OOOO", +"OOOOOOOOOOO@& %%X..#XXX.####%%& $OOOO", +"OOOOOOOOOOOOO@$ &XX%%%*.#X%###*& OOOOO", +"OOOOOOOOOOOOOOOOO+%%%*%%#.+.#*& @OOOOO", +"OOOOOOOOOOOOOOOOOO*%%%*.X##XX& OOOOOO", +"OOOOOOOOOOOOOOOOOOOX%%%%X*%& @OOOOOO", +"OOOOOOOOOOOOOOOOOOOX%%%%% &@OOOOOOO", +"OOOOOOOOOOOOOOOOOOO*%%%X& &$$OOOOOOOOO", +"OOOOOOOOOOOOOOOOOOO+%%%* .OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOO+*%%% OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOO*%%& $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOO*%%% $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOO+%%& $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOoOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *lawful_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 10 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #606060", +"$ c #FFFFFF", +"% c #303030", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOo$$$$$$oOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOO$$o$$o$$$$$OOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOo$$$$$$$o$$ooOOOOOOOOO", +"OOOOOOOOOOOOOOOOOO$o$$$o$$$$$$$oOOOOOOOO", +"OOOOOOOOOOOOOOOOOo$$$$+ .o$$$$$oOOOOOOOO", +"OOOOOOOOOOOOOOOOOo$$$+%OOOO$o$$$oOOOOOOO", +"OOOOOOOOOOOOOOOOO$$o$X@OOOOo$$$ooOOOOOOO", +"OOOOOOOOOOOOOOOOO$$$$%OOOOOo$$$..OOOOOOO", +"OOOOOOOOOOOOOOOOO$$$$@OOOOo$$oo##OOOOOOO", +"OOOOOOOOOOOOOOOO+$$o$$ooOoo$$$o OOOOOOOO", +"OOOOOOOOOOOOOOOOO$$$$$$$o$$$$o#%OOOOOOOO", +"OOOOOOOOOOOOOOOO+$$o$$o$$$$$o@%OOOOOOOOO", +"OOOOOOOOOOOOOOOOO$$$$$$$$o$o.%OOOOOOOOOO", +"OOOOOOOOOOOOOOOOOo$$$o$$oo@#%OOOOOOOOOOO", +"OOOOOOOOoooooo$$$$$$$$$$$% %OOOOOOOOOOOO", +"OOOOOOO$$$$$$$$$$$$o$$o$$$$$$$oOOOOOOOOO", +"OOOOOO$$$$$$$$$o$$$$$$$$$$$$o$$oOOOOOOOO", +"OOOOOO$$o$ooooo##+o$$+##@oo$$$$$oOOOOOOO", +"OOOOOOo$$#% %#$$$+%##%%#ooo$O#OOOOOOO", +"OOOOOOOo@##OOOOO+$$$##OOOO#%%##%@OOOOOOO", +"OOOOOOOOOOOOOOOOo$$$##OOOOOOO##@OOOOOOOO", +"OOOOOOOOOOOOOOOOo$$o##OOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO$$oo OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO+$$$o OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO$$$##OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO$o$##OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO$$$##OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo$$$##OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo$$o%@OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo$$o OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO$$oo OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO$$$o OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO$$$##OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo$$##OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO$$o##OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo$# @OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO.#@OOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *mod_enc_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 13 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #FFFFFF", +"* c #303030", +"= c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOoO+OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOoOXX==OOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOoO=OO+==OOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOoXOO.*$=$OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO=+# *.X *OOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO==.OO=+@ $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOXO==.OO $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOO+=@$@* @OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOo&&&&&&&&&oXOOOOOOOOOOOOOOO", +"OOOOOOOOOOOO+&=========X%@OOOOOOOOOOOOOO", +"OOOOOOOOOOOOO&=====X====% @OOOOOOOOOOOOO", +"OOOOOOOOOOOOoO==X=======X* OOOOOOOOOOOOO", +"OOOOOOOOOOOO&====*%*%*===* $OOOOOOOOOOOO", +"OOOOOOOOOOO+&===X ===% *OOOOOOOOOOOO", +"OOOOOOOOOOOoO===**=======X* OOOOOOOOOOOO", +"OOOOOOOOOOO&===% %=======X% $OOOOOOOOOOO", +"OOOOOOOOOOO&===% %*%%=====% *OOOOOOOOOOO", +"OOOOOOOOOOoO===* ====X* OOOOOOOOOOO", +"OOOOOOOOOO&=========* X===X% $OOOOOOOOOO", +"OOOOOOOOO+&=========% *====% *OOOOOOOOOO", +"OOOOOOOOOoO===% %=== %====%* OOOOOOOOOO", +"OOOOOOOOO&====* *==X===% $OOOOOOOOO", +"OOOOOOOOO&======*%*%X=======% *OOOOOOOOO", +"OOOOOOOOOo==X===============% OOOOOOOOO", +"OOOOOOOOO=XXXXXXXXXX%X%X%X%%% $OOOOOOOO", +"OOOOOOOOOO=%**************** $OOOOOOOO", +"OOOOOOOOOOO$ $OOOOOOOO", +"OOOOOOOOOOOO* *OOOOOOOOO", +"OOOOOOOOOOOOOoOOoOoOoOoOoOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *neutral_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 14 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #FFFFFF", +"* c #00B6FF", +"= c #303030", +"- c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOO.------.OOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOO-+O&o.-----OOOOOOOOOO", +"OOOOOOOOOOOOOOOOOO+-&o--------.OOOOOOOOO", +"OOOOOOOOOOOOOOOOOO-oo----------+OOOOOOOO", +"OOOOOOOOOOOOOOOOO+-&--% #-------OOOOOOOO", +"OOOOOOOOOOOOOOOOO-OO-X=OOO.-----+OOOOOOO", +"OOOOOOOOOOOOOOOOO-oO-%#OOOO.-----OOOOOOO", +"OOOOOOOOOOOOOOOOO--O-=OOOOO+---X#OOOOOOO", +"OOOOOOOOOOOOOOOOO-oO-XOOOO+OO--=$OOOOOOO", +"OOOOOOOOOOOOOOOOO-OO--++OO-&--- OOOOOOOO", +"OOOOOOOOOOOOOOOOO-OO-----+oo--%=OOOOOOOO", +"OOOOOOOOOOOOOOOOO--O--+o&&o--%=OOOOOOOOO", +"OOOOOOOOOOOOOOOOO-oo*-------%=OOOOOOOOOO", +"OOOOOOOOOOOOOOOOO-oO------%%=OOOOOOOOOOO", +"OOOOOOOO+.+-+.---O&------= =OOOOOOOOOOOO", +"OOOOOO+-oo&&&&&&&&------------.OOOOOOOOO", +"OOOOOO---------------X-----O&Oo-OOOOOOOO", +"OOOOOO---------%=%---%%=%----OO-.OOOOOOO", +"OOOOOO---== =%---%=%%===----%XOOOOOOO", +"OOOOOOO-#$%OOOOOO-+-%$OOOO%===%=@OOOOOOO", +"OOOOOOOOOOOOOOOO.-&-=%OOOOOOO%%#OOOOOOOO", +"OOOOOOOOOOOOOOOo-O+-%$OOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO-oO- OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO-OO- OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO-&-%%OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO-&-%$OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO-&-=$OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO--o-%$OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO+-&- .OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO-Oo- OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO-OO- OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO-oO- OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO-OO%%OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO-o-%$OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO---%$OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO--% #OOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOX$@OOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *ovr_enc_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 13 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #FFFFFF", +"* c #303030", +"= c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOoO+=+OOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOo=#===+OOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo=.OO@X=OOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo#OO* #X @OOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO+=.XX+=#* @OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO+=O=.=OO $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOO#.=+OO@ $OOOOOOOOOOOOOO", +"OOOOOOOOOooooooooo&O.#+#XooooOOOOOOOOOOO", +"OOOOOOOOO&OOoOoOoOOOOOOOOOoO%@OOOOOOOOOO", +"OOOOOOOOoO==================X*@OOOOOOOOO", +"OOOOOOOO&===================X% @OOOOOOOO", +"OOOOOOOO&==%*%*%*%*%*%*%*%*==% *OOOOOOOO", +"OOOOOOOoO==%*%%*%%*%%*%*%*%==X* OOOOOOOO", +"OOOOOOO&======================* $OOOOOOO", +"OOOOOO+&=== ===% *OOOOOOO", +"OOOOOOoO======================X* OOOOOOO", +"OOOOOO&=======================X% $OOOOOO", +"OOOOOOo========================% *OOOOOO", +"OOOOOoO===*%X=====%%======%%===X* OOOOOO", +"OOOOO&==% %==% *==== %==* $OOOOO", +"OOOOO&== *==**== **% *=X% %%* ==% *OOOOO", +"OOOOoO==%%==* =* ===% == %=== %=X* OOOOO", +"OOOO&=======% =**===% %X %X==* =X% $OOOO", +"OOOO&======% %= %==== %% ====* ==% *OOOO", +"OOOoO=====% *== *==== %* ====% ==X* OOOO", +"OOO&====XX *===**===% X% X=== *===* $OOO", +"OO+&====X *====* ===% == *=== %===% *OOO", +"OOoO===% %*%*== *** %==% %** ====X* OOO", +"OO&====% ==X *====* %====X% $OO", +"OO&================================% *OO", +"OOo===X============================% OO", +"OO=XXXXXXXXXXXX%XXXX%X%X%XXXXX%X%X%% $O", +"OOO=%****************************** $O", +"OOOO$ $O", +"OOOOO* *OO", +"OOOOOOOOOOoOOoOOoOOoOOoOOoOOoOOoOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *pet_mark_xpm[] = { +/* width height ncolors chars_per_pixel */ +"8 7 2 1", +/* colors */ +". c None", +" c #FF0000", +/* pixels */ +"........", +".. . .", +". ", +". ", +".. .", +"... ..", +".... ..." +}; +/* XPM */ +static const char *pet_mark_small_xpm[] = { +/* width height ncolors chars_per_pixel */ +"5 5 2 1", +/* colors */ +". c None", +"X c #FF0000", +/* pixels */ +".X.X.", +"XXXXX", +".XXX.", +"..X.." +}; +/* XPM */ +static const char *pile_mark_xpm[] = { +/* width height ncolors chars_per_pixel */ +"5 5 2 1", +/* colors */ +". c None", +"X c #00FF00", +/* pixels */ +"..X..", +"..X..", +"XXXXX", +"..X..", +"..X.." +}; +/* XPM */ +static const char *satiated_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 23 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #F8B090", +"o c #5C7A7A", +"O c #D4D4D4", +"+ c #F87A24", +"@ c #7C3400", +"# c None", +"$ c #B0B0B0", +"% c #F89E6C", +"& c #914700", +"* c #B64700", +"= c #909090", +"- c #788C8C", +"; c #606060", +": c #406868", +"> c #FFFFFF", +", c #CEAA90", +"< c #DADAB6", +"1 c #303030", +"2 c #FFB691", +"3 c #6C91B6", +"4 c #F88C48", +/* pixels */ +"########################################", +"########################################", +"########################################", +"########################################", +"########################################", +"########################################", +"########################################", +"################<<<<<<<<################", +"##############<<<<<<<<<<$#$$$###########", +"############<<<<<<<<<<$:31:3:###########", +"###########<<<<<<%42<<#:3:133-##########", +"##########<<<<<%<<;;=o$131:33;##########", +"#########<<<<<<,1 ::31:33;,#########", +"########<<<<<<, =<<<<.13:133;<=########", +"########<<<%2, 1<<<<<<#333:33;<,=#######", +"#######<<<3-=<33;<<@o######", +"#######O<<<<<,#<<<<<<<<.3:<3-;<, =######", +"########<<<<2<<<<<<<<<>#31<33o<11#######", +"########O<<<<44<>O>>>>>#3:<3.;- =#######", +"##########<<<4<<<<><><<$3:<331 ;<#######", +"##########<<<<<<<%2<<<<$3:<33 1#########", +"###########O,<<<<<<<<<<#31<331##########", +"#############.<<<<<<<<<$3:133;##########", +"##############=;=,<<<<,o 1;;=##########", +"###############<=;1 1;=##############", +"#################<# c #B64700", +", c #909090", +"< c #788C8C", +"1 c #606060", +"2 c #406868", +"3 c #FFFFFF", +"4 c #CEAA90", +"5 c #DADAB6", +"6 c #303030", +"7 c #F86800", +"8 c #FFB691", +"9 c #6C91B6", +"0 c #F88C48", +"q c #0000FF", +/* pixels */ +"****************************************", +"*************#333333333#****************", +"***********##33333#333333#**************", +"**********#33333#33333#33*==************", +"*********#33##33-;-3#3333399************", +"********#33#33#3-@ 33333#33=.***********", +"********#3*#33-;;;;;-33333#99***********", +"*******#3*3333-;;;;@ 33#333#9=**********", +"*******#333#33#3-;-33#*##33399**********", +"******#3#3333333-@-#333#9933*9=*********", +"******#333#33#3333333#333*9999=*********", +"******#333333333#3#33333333*999*********", +"******#3#33#33333333#33#3333#9=*********", +"******#333334>&&:&&>::44,3#33#9*********", +"******#33*::&41OOO6:4O 0::4433=*********", +"******#3:>,0:O0O1O+O:OXO,O+2+OOo4<+1104:>:#*********", +"******.&:1OOO,14X2O48:O80,440:,*********", +"******4::>OOO%8-X4O4%O,84+O0X&>=********", +"******.::>,O 99*X+<$,+.o*1O4&0:*********", +"******>:0&4O5qq9#10OO3qq9,+X:1:*********", +"****=>,,::,O4qq9X+O>O-qq9O2X0,>*********", +"******4:>OOOO48882OOOO+4OOO07*4*********", +"******4*,4OO+OXX3O5************", +"*********=0%,OO,>:>>O +1OO4*************", +"**********=%+OO:::1:::6+:7**************", +"***********7&OO:O+O,O1OO+1**************", +"***********40OO,O4:OOO11O<5*************", +"**********=4 +O1O2+O2+O0O***************", +"************72O+1+21-OOO%5**************", +"************0%1OOOO+O+174***************", +"*************%%O,OO1407-=***************", +"**************-$>%0%:74*****************", +"****************54044*=*****************", +"*****************=*=********************" +}; +/* XPM */ +static const char *sick_il_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 23 1", +/* colors */ +" c #F85848", +". c #949E9E", +"X c #F8B090", +"o c #E00028", +"O c #D4D4D4", +"+ c #F87A24", +"@ c #7C3400", +"# c None", +"$ c #B0B0B0", +"% c #F89E6C", +"& c #FF0000", +"* c #914700", +"= c #B64700", +"- c #909090", +"; c #606060", +": c #FFFFFF", +"> c #CEAA90", +", c #DADAB6", +"< c #F86800", +"1 c #FFB691", +"2 c #6C91B6", +"3 c #F88C48", +"4 c #0000FF", +/* pixels */ +"########################################", +"#############O:::::::::O################", +"###########OO:::::O::::::O##############", +"##########O:::::O:::::O::#$$############", +"#########O::OO::%&%:O:::::22############", +"########O::O::O:%o :::::O::$.###########", +"########O:#O::%&&&&&%:::::O22###########", +"#######O:#::::%&&&&o ::O:::O2$##########", +"#######O:::O::O:%&%::O#OO:::22##########", +"######O:O:::::::%o%O:::O22::#2$#########", +"######O:::O::O:::::::O:::#2222$#########", +"######O:::::::::O:O::::::::#222#########", +"######O:O::O::::::::O::O::::O2$#########", +"######O:::::>=@@=**=**>>-:O::O2#########", +"######O::#**@3>%* ;=>=3;<@>>::$#########", +"######O:** >=>XXXX1X >>+>%*%*;O#########", +"######O3@*,X%XXXXXXX>X%XX >*=*O#########", +"######.@@3XXXXXXXXXXXXXXX>X>3*-#########", +"######>***>X% >XXXXX3XXXXXX%>*=>########", +"######.***> 22#XXX<%X22#XXX@+;#########", +"######=*3@X>O442OXX==%XX11111O1+%X111XX%<#>#########", +"######.,;XXXXXX1O1X%3XXXXX%+3###########", +"########3=XXXXXX:XXXXXXXXX+<>$##########", +"########>+XXXXXX%-3->XXXX%+<############", +"#########%3XXXXXX>- -%XXX%<%$###########", +"#########$############", +"##########+%XXXXXXXXXXXX%+<#############", +"##########%3XXX>=****3XX%<%#############", +"##########>+XXX**=3-*@3>3+##############", +"###########<%XX >XX%X;%X3+##############", +"###########%3XX>XX++XXXX<%$#############", +"##########$>+XXXXXXXXXXX<###############", +"############<%XXXXXXXXX3+###############", +"###########$%+XXXXXXXX%<>###############", +"#############++XXXXXX%<%$###############", +"#############$%<<3333<%#################", +"#################%3>>$##################", +"#################$#$####################" +}; +/* XPM */ +static const char *slt_enc_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 13 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #FFFFFF", +"* c #303030", +"= c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOoO+OOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOoOXX==OOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOoO=OO+==OOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOoXOO.*$=$OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO=+# *.X *OOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO==.OO=+@ $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOXO==.OO $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOO+=@$@* @OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOO&&&&&&&X @OOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOo======X*OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOoO======X**OOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOO&====X===% $OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOoo==%* %==%* OOOOOOOOOOOOOO", +"OOOOOOOOOOOOOoO=% % =X* @OOOOOOOOOOOOO", +"OOOOOOOOOOOOO&==**==% %=% $OOOOOOOOOOOOO", +"OOOOOOOOOOOOoo==%%==* %=X OOOOOOOOOOOOO", +"OOOOOOOOOOOOoO=====* X==X* @OOOOOOOOOOOO", +"OOOOOOOOOOOO&=====* %====% $OOOOOOOOOOOO", +"OOOOOOOOOOOoo==== X=====%* OOOOOOOOOOOO", +"OOOOOOOOOOOo+===* *%*%%==X* @OOOOOOOOOOO", +"OOOOOOOOOOO&==== %===% $OOOOOOOOOOO", +"OOOOOOOOOOO&==============% OOOOOOOOOOO", +"OOOOOOOOOOO==============X% @OOOOOOOOOO", +"OOOOOOOOOOO+%%%%%%%%%%%%%% $OOOOOOOOOO", +"OOOOOOOOOOOOO% $OOOOOOOOOO", +"OOOOOOOOOOOOO@ @OOOOOOOOOO", +"OOOOOOOOOOOOOO@$$$$$$$$$$$$$@OOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; +/* XPM */ +static const char *str_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 17 1", +/* colors */ +" c #000000", +". c #F8B090", +"X c #5C7A7A", +"o c #F87A24", +"O c #7C3400", +"+ c None", +"@ c #B0B0B0", +"# c #F89E6C", +"$ c #B64700", +"% c #909090", +"& c #606060", +"* c #CEAA90", +"= c #DADAB6", +"- c #303030", +"; c #F86800", +": c #FFB691", +"> c #F88C48", +/* pixels */ +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"++++++++++++++++++++++++++++++++++++++++", +"+++++++++++++++++++*>*>#++++++++++++++++", +"++++++++++++++++*#o>..*#o*++++++++++++++", +"+++++++++++++++o#.#>.....o++++++++++++++", +"+++++++++++++++;>;#.o.>..#$X++++++++++++", +"+++++++++++++++o#>.o.>:...o %++++++++++", +"++++++++++++++o##>>#o##>..#O -++++++++++", +"++++++++++++++>#.oo#>..>...O ++++++++++", +"++++++++++++++*o##.>>;o#...o ++++++++++", +"+++++++++++++++*;o#........>- &+++++++++", +"+++++++++++++++++#>>;o......O -+++++++++", +"+++++++++++++++++@+@+o>.....$ +++++++++", +"+++++++++++++++++++++*;.#...>- %++++++++", +"++++++++++++++++++++++;>o....$ &++++++++", +"++++++++++++++++++++++#>>....>- %+++++++", +"+++++++++++++++++++++++;#>....; -+++++++", +"+++++++++++++++++++++++o#>....>O %++++++", +"+++++++++++++++++++++++*>o.....; -++++++", +"+++++++++++++#>**+++++++;#.....>O %+++++", +"+o#+++++++*o;>>>>o#+++++o##.....; -+++++", +"+:#o*++++oo#..*..*>;*+++#>#.....>O %++++", +"+:=#o#+*;>.:==:....#;*++@o.......; &++++", +"+::..>;o#.=::::......o*++;.......>O ++++", +"+.....#o.:.=:.........o#+;........$ ++++", +"+......#o..:...........#o;>.......o &+++", +"+........#..............*>o......:o- +++", +"+..................#o>#...#o.......O +++", +"+...............>o>#.......#>......O &++", +"+..................................o -++", +"+..................................> ++", +"+..................................> ++", +"+.................................#$ &+", +"+................................>$ &+", +"+..#>$o>#..............#>;>>>oOOO- ++", +"+...#O OOOOO$>>>>>>>$OO %++", +"+...o -&&++++", +"+..#O -&&%++++++++++", +"++++++++++++++++++++++++++++++++++++++++" +}; +/* XPM */ +static const char *stunned_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 12 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c #D4D4D4", +"O c None", +"+ c #B0B0B0", +"@ c #909090", +"# c #788C8C", +"$ c #606060", +"% c #406868", +"& c #303030", +"* c #6C91B6", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOO&$OOOO@OOO@@OO@OOOOOOOOOOOOO", +"OOOOOOOOOOO@& $OO@&&$$@ O@$$OOOOOOOOOOOO", +"OOOOOOOOOOOO$$ @@@$ &&OOO@$OOOOOOOOOOOO", +"OOOOOOOOOOOOO@@&$$$$&O$OO$O &@O@OOOOOOOO", +"OOOOOO@@@@@@OO@$$O$&$@@OO& &&$O&OOOOOOO", +"OOOOOO&&&& & $ &&@$ &O@$& &&&$ & $OOOOOO", +"OOOOOO$&OO &&&$ $$ $& $$&$&&&OOOOOOO", +"OOOOOO@@O@$ &+ # &O$$ $$&O@OOOOO", +"OOOOOOOO@X%$ %& %% & && $$@@@@OOOO", +"OOOOOOO+$$@+ &%%%&%& & &@OOO&&OOO", +"OOOOOO.Xo%+ &&%%%%%&& & OO@$&&OOO", +"OOOOO++ $$&&$ && %&%%& &O@&$&OOOO", +"OOOOO####$ X&&& && &%& & &&OOOO", +"OOOO++#.+## $&# %& & & &$ OOOO", +"OOOO#+++.@&%&& &#&%& & $ @OOOOOO", +"OOOO##....#+$#@%#& $%$&@&$$% & X##$@OOOO", +"OOOO.+#+.+@#+#+$&$X#%&%.+& %&#++.$&OOOOO", +"OOOOO#+#+.+++#$$%&++&X+X#&#+&+&##+ &OOOO", +"OOOOO#..#OO#+@%#o##X.@..++.+$&+#+#& @OOO", +"OOOOO+#.#O+#+#O@++@$$##+##++###+.#& $OOO", +"OOOOOOXX+#+#+#o.@%&$++#+..##.#+### &OOO", +"OOOOOOOX#.#X+#+#+##&#+..+####%XX%% OOO", +"OOOOOOOO+%%X.#+#+#.++#+#+#+.X++*.% &OOO", +"OOOOOOOOO@& &##+#+.O####.+XX%%%%#% $OOO", +"OOOOOOOOOOO. %X.+.#+++XXX*.+++#X $OOO", +"OOOOOOOOOOOO@& %%X..#X%#.####%X& $OOO", +"OOOOOOOOOOOOOO@$ &XX%%%*.#X%###*& OOOO", +"OOOOOOOOOOOOOOOOOO+%%%*%%#.+.#*& @OOOO", +"OOOOOOOOOOOOOOOOOOO*%%%**X##X%& OOOOO", +"OOOOOOOOOOOOOOOOOOOOX%%%%X*X& @OOOOO", +"OOOOOOOOOOOOOOOOOOOOX%%%%X &@OOOOOO", +"OOOOOOOOOOOOOOOOOOOO*%%%X& &$$OOOOOOOO", +"OOOOOOOOOOOOOOOOOOOO+X%%* @OOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOX%%& OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOO*%%% $OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOO*%%% $OOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOO.X%& $OOOOOOOOOOOOO" +}; +/* XPM */ +static const char *wis_xpm[] = { +/* width height ncolors chars_per_pixel */ +"40 40 13 1", +/* colors */ +" c #000000", +". c #949E9E", +"X c #5C7A7A", +"o c None", +"O c #B0B0B0", +"+ c #909090", +"@ c #788C8C", +"# c #606060", +"$ c #406868", +"% c #FFFFFF", +"& c #303030", +"* c #6C91B6", +"= c #0000FF", +/* pixels */ +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooo+#& &#oooooooooooooooooooo", +"oooooooooooo+& #oooooooooooooooooo", +"ooooooooooo+ &====&& &ooooooooooooooooo", +"oooooooooo+ &==& ===%& +ooooooooooooooo", +"ooooooooo+&%=== ===%%o&&oooooooooooooo", +"oooooooo.&%%===& ===%o& #+ooooooooooo", +"oooo&###&&%%*=======$#&ooo#& #+oooooooo", +"ooooo###o+&X$=====& #oo##oooo+######oooo", +"oooooooooooo######@oo##ooooooooooooooooo", +"oooooooooooooOoOoOo##ooooooooooooooooooo", +"ooooooooooooooooo+#+ooo+&#oooooooooooooo", +"ooooooooooooooooooooooo#oooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo", +"oooooooooooooooooooooooooooooooooooooooo" +}; +/* clang-format on */ diff --git a/win/Qt3/qttableview.cpp b/win/Qt3/qt3tableview.cpp similarity index 99% rename from win/Qt3/qttableview.cpp rename to win/Qt3/qt3tableview.cpp index b53e8a415..8bbc78cd6 100644 --- a/win/Qt3/qttableview.cpp +++ b/win/Qt3/qt3tableview.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.4 $ $NHDT-Date: 1524684508 2018/04/25 19:28:28 $ +** $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1575917720 2019/12/09 18:55:20 $ ** $Id: qttableview.cpp,v 1.2 2002/03/09 03:13:15 jwalz Exp $ ** ** Implementation of QtTableView class @@ -13,7 +13,7 @@ ** **********************************************************************/ -#include "qttableview.h" +#include "qt3tableview.h" #if QT_VERSION >= 300 #ifndef QT_NO_QTTABLEVIEW #include diff --git a/include/qttableview.h b/win/Qt3/qt3tableview.h similarity index 100% rename from include/qttableview.h rename to win/Qt3/qt3tableview.h