ref: 480a31094b7621dd7d65ec05a6e36964dca99b66
parent: 37db69b86bc5052901e250578e9c3920886d79ff
parent: e66653a8a67f3613344ae4ea30b37403d6ff17cf
author: Simon Howard <[email protected]>
date: Sun Jul 12 20:52:26 EDT 2009
Merge from trunk. Subversion-branch: /branches/opl-branch Subversion-revision: 1624
--- a/.lvimrc
+++ b/.lvimrc
@@ -4,3 +4,28 @@
set softtabstop=4
set shiftwidth=4
+" Add all tag files to tags path.
+
+let topdir = findfile("configure.in", ".;")+let topdir = substitute(topdir, "configure.in", "", "")
+
+" Check tags file in current dir:
+set tags+=tags
+
+" Add tag files in parent directories:
+let tagfiles = findfile("tags", ".;", -1)+
+" Add tag files for libraries:
+call add(tagfiles, topdir . "textscreen/tags")
+call add(tagfiles, topdir . "pcsound/tags")
+
+for tagfile in tagfiles
+ " Don't go beyond the project top level when adding parent dirs:
+ if stridx(tagfile, topdir) >= 0
+ exec "set tags+=" . tagfile
+ endif
+endfor
+
+unlet topdir
+unlet tagfiles
+
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
docdir=$(prefix)/share/doc/@PACKAGE@
-SUBDIRS=textscreen opl pcsound src man setup
+SUBDIRS=wince textscreen opl pcsound src man setup
if HAVE_PYTHON
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,49 @@
+...
+
+ * Chocolate Doom now runs on Windows Mobile/Windows CE!
+ * It is possible to rebind most/all of the keys that control
+ the menu, shortcuts, automap and weapon switching. The
+ main reason for this is to support the Windows CE port
+ and other platforms where a full keyboard may not be present.
+ * Memory-mapped WAD I/O is disabled by default, as it caused
+ various issues, including a slowdown/crash with Plutonia 2
+ MAP23. It can be explicitly re-enabled using the '-mmap'
+ command line parameter.
+ * The video mode auto-adjust code will automatically choose
+ windowed mode if no fullscreen video modes are available.
+ * The zone memory size is automatically reduced on systems
+ with a small amount of memory.
+ * There is now a second, small textscreen font, so that the
+ ENDOOM screen and setup tool can be used on low resolution
+ devices (eg. PDAs/embedded devices)
+ * The textscreen library now has a scrollable pane widget.
+ * Doxygen documentation was added for the textscreen library.
+ * The "join game" window in the setup tool now has an option
+ to automatically join a game on the local network.
+
+ Compatibility:
+ * The A_BossDeath behavior in v1.9 emulation mode was fixed
+ (thanks entryway)
+
+ Bugs fixed:
+ * Crash when saving games due to the ~/.chocolate-doom/savegames
+ directory not being created (thanks to everyone who reported
+ this).
+ * Chocolate Doom will now under Win95/98, as the
+ SetProcessAffinityMask function is looked up dynamically.
+ * Compilation under Linux with older versions of libc will now
+ work (the semantics for sched_setaffinity were different in
+ older versions)
+ * Sound clipping when using libsamplerate was improved (thanks
+ David Flater)
+ * The audio buffer size is now calculated based on the sample rate,
+ so there is not a noticeable delay when using a lower sample
+ rate.
+ * The manpage documentation for the DOOMWADPATH variable was fixed
+ (thanks MikeRS).
+ * Compilation with FEATURE_MULTIPLAYER and FEATURE_SOUND disabled
+ was fixed.
+
1.2.1 (2008-12-10):
This version just fixes a crash at the intermission screen when
--- a/codeblocks/textscreen.cbp
+++ b/codeblocks/textscreen.cbp
@@ -81,6 +81,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\textscreen\txt_radiobutton.h" />
+ <Unit filename="..\textscreen\txt_scrollpane.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\textscreen\txt_scrollpane.h" />
<Unit filename="..\textscreen\txt_sdl.c">
<Option compilerVar="CC" />
</Unit>
@@ -89,6 +93,7 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\textscreen\txt_separator.h" />
+ <Unit filename="..\textscreen\txt_smallfont.h" />
<Unit filename="..\textscreen\txt_spinctrl.c">
<Option compilerVar="CC" />
</Unit>
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,19 @@
exit -1
])
+# Windows CE build?
+
+WINDOWS_CE=false
+
+case "$host" in
+ *mingw32ce*|*cegcc*|*wince*)
+ CFLAGS="-I../wince $CFLAGS"
+ WINDOWS_CE=true
+ ;;
+ *)
+ ;;
+esac
+
AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
AC_CHECK_FUNCS(mmap sched_setaffinity ioperm)
@@ -61,6 +74,7 @@
AC_CHECK_TOOL(WINDRES, windres, )
+AM_CONDITIONAL(WINDOWS_CE, $WINDOWS_CE)
AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
@@ -86,6 +100,7 @@
AC_OUTPUT([
Makefile
+wince/Makefile
textscreen/Makefile
textscreen/examples/Makefile
setup/Makefile
@@ -94,6 +109,7 @@
opl/examples/Makefile
src/Makefile
pcsound/Makefile
+pkg/wince/Makefile
src/resource.rc
src/doom-screensaver.desktop
setup/setup-res.rc
--- a/man/manpage.template
+++ b/man/manpage.template
@@ -18,9 +18,9 @@
.TP
\fBDOOMWADDIR\fR, \fBDOOMWADPATH\fR
These environment variables provide paths to search for Doom .WAD files when
-looking for a game IWAD file or a PWAD file specified with the '-file' option.
+looking for a game IWAD file or a PWAD file specified with the `-file' option.
\fBDOOMWADDIR\fR specifies a single path in which to look for WAD files,
-while \fBDOOMWWADDIR\fR specifies a colon-separated list of paths to search.
+while \fBDOOMWWADPATH\fR specifies a colon-separated list of paths to search.
.TP
\fBPCSOUND_DRIVER\fR
When running in PC speaker sound effect mode, this environment variable
--- a/pcsound/pcsound.c
+++ b/pcsound/pcsound.c
@@ -27,6 +27,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
#include "config.h"
#include "pcsound.h"
#include "pcsound_internal.h"
--- a/pcsound/pcsound_sdl.c
+++ b/pcsound/pcsound_sdl.c
@@ -32,6 +32,7 @@
#include "pcsound.h"
#include "pcsound_internal.h"
+#define MAX_SOUND_SLICE_TIME 70 /* ms */
#define SQUARE_WAVE_AMP 0x2000
// If true, we initialised SDL and have the responsibility to shut it
@@ -163,8 +164,37 @@
}
}
+// Calculate slice size, based on MAX_SOUND_SLICE_TIME.
+// The result must be a power of two.
+
+static int GetSliceSize(void)
+{+ int limit;
+ int n;
+
+ limit = (pcsound_sample_rate * MAX_SOUND_SLICE_TIME) / 1000;
+
+ // Try all powers of two, not exceeding the limit.
+
+ for (n=0;; ++n)
+ {+ // 2^n <= limit < 2^n+1 ?
+
+ if ((1 << (n + 1)) > limit)
+ {+ return (1 << n);
+ }
+ }
+
+ // Should never happen?
+
+ return 1024;
+}
+
static int PCSound_SDL_Init(pcsound_callback_func callback_func)
{+ int slicesize;
+
// Check if SDL_mixer has been opened already
// If not, we must initialise it now
@@ -176,7 +206,9 @@
return 0;
}
- if (Mix_OpenAudio(pcsound_sample_rate, AUDIO_S16SYS, 2, 1024) < 0)
+ slicesize = GetSliceSize();
+
+ if (Mix_OpenAudio(pcsound_sample_rate, AUDIO_S16SYS, 2, slicesize) < 0)
{fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
--- a/pcsound/pcsound_win32.c
+++ b/pcsound/pcsound_win32.c
@@ -26,6 +26,7 @@
#ifdef _WIN32
#include "SDL.h"
+#include "SDL_thread.h"
#include <windows.h>
#include "pcsound.h"
--- /dev/null
+++ b/pkg/wince/.gitignore
@@ -1,0 +1,3 @@
+Makefile
+Makefile.in
+*.cab
--- /dev/null
+++ b/pkg/wince/Makefile.am
@@ -1,0 +1,10 @@
+
+DEPS=$(shell ./wince-cabgen -d $(CONFIG_FILE))
+CONFIG_FILE=wince-cab.cfg
+OUTPUT_FILE=@PACKAGE_TARNAME@-@[email protected]
+
+noinst_DATA = $(OUTPUT_FILE)
+
+$(OUTPUT_FILE) : $(CONFIG_FILE) $(DEPS)
+ ./wince-cabgen $< $@
+
--- /dev/null
+++ b/pkg/wince/wince-cab.cfg
@@ -1,0 +1,25 @@
+
+app_name = "Chocolate Doom"
+provider = "Simon Howard"
+arch = "strongarm"
+
+# Install files:
+
+d = "$(PROGRAMS_GAMES)/Chocolate Doom/"
+s = "$(START_GAMES)/"
+
+files = {+ d+"chocolate-doom.exe": "../../src/chocolate-doom.exe",
+ d+"chocolate-setup.exe": "../../setup/chocolate-setup.exe",
+ d+"SDL.dll": "SDL.dll",
+ d+"SDL_mixer.dll": "SDL_mixer.dll",
+ d+"libSDL_net-1-2-0.dll": "libSDL_net-1-2-0.dll",
+}
+
+# Start menu links:
+
+links = {+ s+"Chocolate Doom.lnk": d+"chocolate-doom.exe",
+ s+"Chocolate Doom Setup.lnk": d+"chocolate-setup.exe"
+}
+
--- /dev/null
+++ b/pkg/wince/wince-cabgen
@@ -1,0 +1,672 @@
+#!/usr/bin/env python
+
+import os
+import re
+import shutil
+import sys
+import tempfile
+
+CAB_HEADER = "MSCE"
+
+ARCHITECTURES = {+ "shx-sh3": 103,
+ "shx-sh4": 104,
+ "i386": 386,
+ "i486": 486,
+ "i586": 586,
+ "powerpc-601": 601,
+ "powerpc-603": 603,
+ "powerpc-604": 604,
+ "powerpc-620": 620,
+ "powerpc-mpc821": 821,
+ "arm720": 1824,
+ "arm820": 2080,
+ "arm920": 2336,
+ "strongarm": 2577,
+ "mips-r4000": 4000,
+ "sh3": 10003,
+ "sh3e": 10004,
+ "sh4": 10005,
+ "alpha-21064": 21064,
+ "arm7tdmi": 70001,
+}
+
+DIR_VARIABLES = {+ "PROGRAMS": "%CE1%", # \Program Files
+ "WINDOWS": "%CE2%", # \Windows
+ "DESKTOP": "%CE3%", # \Windows\Desktop
+ "STARTUP": "%CE4%", # \Windows\StartUp
+ "DOCUMENTS": "%CE5%", # \My Documents
+ "PROGRAMS_ACCESSORIES": "%CE6%", # \Program Files\Accessories
+ "PROGRAMS_COMMUNICATIONS": "%CE7%", # \Program Files\Communications
+ "PROGRAMS_GAMES": "%CE8%", # \Program Files\Games
+ "PROGRAMS_OUTLOOK": "%CE9%", # \Program Files\Pocket Outlook
+ "PROGRAMS_OFFICE": "%CE10%", # \Program Files\Office
+ "WINDOWS_PROGRAMS": "%CE11%", # \Windows\Programs
+ "WINDOWS_ACCESSORIES": "%CE12%", # \Windows\Programs\Accessories
+ "WINDOWS_COMMUNICATIONS": "%CE13%", # \Windows\Programs\Communications
+ "WINDOWS_GAMES": "%CE14%", # \Windows\Programs\Games
+ "FONTS": "%CE15%", # \Windows\Fonts
+ "RECENT": "%CE16%", # \Windows\Recent
+ "FAVORITES": "%CE17%", # \Windows\Favorites
+
+ "START_PROGRAMS": "%CE11%", # \Windows\Start Menu\Programs
+ "START_ACCESSORIES": "%CE12%", # \Windows\Start Menu\Accessories
+ "START_COMMUNICATIONS": "%CE13%", # \Windows\Start Menu\Communications
+ "START_GAMES": "%CE14%", # \Windows\Start Menu\Games
+ "START": "%CE17%", # \Windows\Start Menu
+}
+
+def write_int16(f, value):
+ b1 = value & 0xff
+ b2 = (value >> 8) & 0xff
+ f.write("%c%c" % (b1, b2))+
+def write_int32(f, value):
+ b1 = value & 0xff
+ b2 = (value >> 8) & 0xff
+ b3 = (value >> 16) & 0xff
+ b4 = (value >> 24) & 0xff
+ f.write("%c%c%c%c" % (b1, b2, b3, b4))+
+# Pad a string with NUL characters so that it has a length that is
+# a multiple of 4. At least one NUL is always added.
+
+def pad_string(s):
+ pad_len = 4 - (len(s) % 4)
+ return s + (pad_len * "\x00")
+
+class HeaderSection:
+
+ def __init__(self, cab_header):
+ self.cab_header = cab_header
+ self.arch = None
+ self.app_name = None
+ self.provider = None
+ self.unsupported = None
+
+ def __len__(self):
+ return 100 # header has fixed size
+
+ def set_meta(self, arch, app_name, provider, unsupported):
+
+ if arch not in ARCHITECTURES:
+ raise Exception("Unknown architecture '%s'" % arch)+
+ self.arch = ARCHITECTURES[arch]
+
+ dictionary = self.cab_header.dictionary
+
+ self.app_name = app_name
+ dictionary.get(self.app_name)
+
+ self.provider = provider
+ dictionary.get(self.provider)
+
+ self.unsupported = unsupported
+ dictionary.get(self.unsupported)
+
+ def write(self, stream):
+
+ # Basic header
+
+ stream.write(CAB_HEADER)
+ write_int32(stream, 0)
+ write_int32(stream, len(self.cab_header))
+ write_int32(stream, 0)
+ write_int32(stream, 1)
+ write_int32(stream, self.arch)
+
+ # minimum Windows CE version:
+ write_int32(stream, 0)
+ write_int32(stream, 0)
+ write_int32(stream, 0)
+ write_int32(stream, 0)
+ write_int32(stream, 0)
+ write_int32(stream, 0)
+
+ dictionary = self.cab_header.dictionary
+
+ # Write number of entries in other sections:
+
+ for section in self.cab_header.sections:
+ if section is not self:
+ write_int16(stream, section.num_entries())
+
+ # Write offsets of other sections:
+
+ for section in self.cab_header.sections:
+ if section is not self:
+ offset = self.cab_header.get_section_offset(section)
+ write_int32(stream, offset)
+
+ # Special strings:
+
+ special_strings = (
+ self.app_name,
+ self.provider,
+ self.unsupported
+ )
+
+ dictionary_offset = self.cab_header.get_section_offset(dictionary)
+
+ for s in special_strings:
+ s_offset = dictionary.get_offset(s)
+ write_int16(stream, dictionary_offset + s_offset)
+ write_int16(stream, len(s) + 1)
+
+ # Two left-over fields of unknown use:
+
+ write_int16(stream, 0)
+ write_int16(stream, 0)
+
+class StringDictionary:
+ def __init__(self, cab_header):
+ self.cab_header = cab_header
+ self.string_list = []
+ self.strings = {}+ self.length = 0
+ self.index = 1
+
+ # Get the length of the dictionary, in bytes.
+
+ def __len__(self):
+ return self.length
+
+ # Get the number of entries in the dictionary.
+
+ def num_entries(self):
+ return len(self.strings)
+
+ # Get the ID for the given string, adding it if necessary.
+
+ def get(self, s):
+ # Is this a new string? Add it to the dictionary.
+
+ if s not in self.strings:
+ offset = self.length
+ padded = pad_string(s)
+
+ self.strings[s] = (self.index, offset)
+ self.string_list.append((self.index, padded))
+ self.length += len(padded) + 4
+ self.index += 1
+
+ return self.strings[s][0]
+
+ # Get the offset of a particular string within the dictionary.
+
+ def get_offset(self, s):
+ return self.strings[s][1] + 4
+
+ # Write the dictionary to the output stream.
+
+ def write(self, stream):
+
+ # Write out all strings:
+
+ for i, s in self.string_list:
+ write_int16(stream, i)
+ write_int16(stream, len(s))
+ stream.write(s)
+
+class DirectoryList:
+ def __init__(self, cab_header):
+ self.cab_header = cab_header
+ self.directories_list = []
+ self.directories = {}+ self.length = 0
+ self.index = 1
+
+ def __len__(self):
+ return self.length
+
+ def num_entries(self):
+ return len(self.directories_list)
+
+ # Find whether the specified directory exists in the list
+
+ def find(self, dir):
+ key = dir.lower()
+
+ if key in self.directories:
+ return self.directories[key]
+ else:
+ return None
+
+ # Get the ID for the given directory, adding it if necessary.
+
+ def get(self, dir):
+
+ key = dir.lower()
+ dictionary = self.cab_header.dictionary
+
+ # Add new directory?
+
+ if key not in self.directories:
+
+ # Separate into individual directories, and map to strings:
+
+ #dir_path = dir.split("\\")+ #if dir_path[0] == "":
+ # dir_path = dir_path[1:]
+ dir_path = [ dir ]
+
+ dir_path = map(lambda x: dictionary.get(x), dir_path)
+
+ self.directories[key] = self.index
+ self.directories_list.append((self.index, dir_path))
+ self.length += 6 + 2 * len(dir_path)
+ self.index += 1
+
+ return self.directories[key]
+
+ # Write the directory list to the specified stream.
+
+ def write(self, stream):
+ for i, dir in self.directories_list:
+ write_int16(stream, i)
+ write_int16(stream, 2 * len(dir) + 2)
+
+ for subdir in dir:
+ write_int16(stream, subdir)
+
+ write_int16(stream, 0)
+
+class FileList:
+ def __init__(self, cab_header):
+ self.cab_header = cab_header
+ self.files = []
+ self.length = 0
+ self.index = 1
+
+ # Get the length of this section, in bytes.
+
+ def __len__(self):
+ return self.length
+
+ # Query whether the file list contains a particular file.
+
+ def find(self, filename):
+ dirname, sep, target_basename = filename.rpartition("\\")+
+ target_basename = pad_string(target_basename)
+
+ target_dir_id = self.cab_header.directory_list.find(dirname)
+
+ if target_dir_id is None:
+ return None
+ else:
+ # Search the list of files:
+
+ for i, dir_id, basename, file_no, flags in self.files:
+ if dir_id == target_dir_id and basename == target_basename:
+ return file_no
+ else:
+ return None
+
+ # Get the number of entries in the file list
+
+ def num_entries(self):
+ return len(self.files)
+
+ # Add a file to the list.
+
+ def add(self, filename, file_no, flags=0):
+
+ dirname, sep, basename = filename.rpartition("\\")+
+ dir_id = self.cab_header.directory_list.get(dirname)
+
+ padded = pad_string(basename)
+
+ self.files.append((self.index, dir_id, padded, file_no, flags))
+ self.length += 12 + len(padded)
+ self.index += 1
+
+ # Write this section to the output stream.
+
+ def write(self, stream):
+
+ for i, dir_id, filename, file_no, flags in self.files:
+ write_int16(stream, i)
+ write_int16(stream, dir_id)
+ write_int16(stream, file_no)
+ write_int32(stream, flags)
+ write_int16(stream, len(filename))
+ stream.write(filename)
+
+# TODO?
+
+class RegHiveList:
+ def __len__(self):
+ return 0
+
+ def num_entries(self):
+ return 0
+
+ def write(self, stream):
+ pass
+
+class RegKeyList():
+ def __len__(self):
+ return 0
+
+ def num_entries(self):
+ return 0
+
+ def write(self, stream):
+ pass
+
+class LinkList:
+ def __init__(self, cab_header):
+ self.cab_header = cab_header
+ self.links = []
+ self.length = 0
+ self.index = 1
+
+ def __len__(self):
+ return self.length
+
+ def num_entries(self):
+ return len(self.links)
+
+ # Determine the target type (dir/file) and ID:
+
+ def __find_target(self, target):
+ file_id = self.cab_header.file_list.find(target)
+
+ if file_id is not None:
+ return 1, file_id
+
+ dir_list = self.cab_header.get_section(DirectoryList)
+ dir_id = dir_list.find(target)
+
+ if dir_id is not None:
+ return 0, dir_id
+
+ raise Exception("Link target '%s' not found" % target)+
+ def add(self, target, destination):
+
+ target_type, target_id = self.__find_target(target)
+
+ dest_path = destination.split("\\")+
+ # Leading \:
+
+ if dest_path[0] == "":
+ dest_path = dest_path[1:]
+
+ # %CEn% to specify the install root is handled differently for
+ # links than it is for files/dirs.
+
+ match = re.match(r"\%CE(\d+)\%", dest_path[0])
+
+ if match:
+ base_dir = int(match.group(1))
+ dest_path = dest_path[1:]
+ else:
+ base_dir = 0
+
+ # Map dirs that make up the path to strings.
+
+ dictionary = self.cab_header.dictionary
+ dest_path = map(lambda x: dictionary.get(x), dest_path)
+
+ self.links.append((self.index, target_type, target_id,
+ base_dir, dest_path))
+ self.index += 1
+ self.length += 14 + 2 * len(dest_path)
+
+ def write(self, stream):
+
+ for i, target_type, target_id, base_dir, dest_path in self.links:
+
+ write_int16(stream, i)
+ write_int16(stream, 0)
+ write_int16(stream, base_dir)
+ write_int16(stream, target_id)
+ write_int16(stream, target_type)
+ write_int16(stream, 2 * len(dest_path) + 2)
+
+ for subdir in dest_path:
+ write_int16(stream, subdir)
+
+ write_int16(stream, 0)
+
+class CabHeaderFile:
+ def __init__(self):
+ self.dictionary = StringDictionary(self)
+ self.directory_list = DirectoryList(self)
+ self.file_list = FileList(self)
+
+ self.sections = [
+ HeaderSection(self),
+ self.dictionary,
+ self.directory_list,
+ self.file_list,
+ RegHiveList(),
+ RegKeyList(),
+ LinkList(self)
+ ]
+
+ def set_meta(self, *args):
+ header_section = self.get_section(HeaderSection)
+ header_section.set_meta(*args)
+
+ def add_file(self, filename, file_no, flags=0):
+ files_section = self.get_section(FileList)
+ files_section.add(filename, file_no, flags)
+
+ def add_link(self, target, destination):
+ links_section = self.get_section(LinkList)
+ links_section.add(target, destination)
+
+ def get_section(self, section_class):
+ for section in self.sections:
+ if isinstance(section, section_class):
+ return section
+ else:
+ raise Exception("Can't find section of class %s" % section_class)+
+ def get_section_offset(self, section):
+ offset = 0
+
+ for s in self.sections:
+ if section is s:
+ return offset
+ offset += len(s)
+ else:
+ raise Exception("Section %s not found in list")+
+ def __len__(self):
+ result = 0
+ for s in self.sections:
+ result += len(s)
+ return result
+
+ def write(self, stream):
+ old_pos = 0
+ for section in self.sections:
+ section.write(stream)
+ pos = stream.tell()
+ if pos != old_pos + len(section):
+ raise Exception("Section is %i bytes long, but %i written" % \+ (len(section), pos - old_pos))
+ old_pos = pos
+
+class CabFile:
+ def __init__(self, config):
+ self.cab_header = CabHeaderFile()
+
+ self.__process_meta(config)
+ self.__process_files(config["files"])
+
+ if "links" in config:
+ self.__process_links(config["links"])
+
+ # Metadata:
+
+ def __process_meta(self, config):
+ arch = config.get("arch") or "strongarm"+ app_name = config.get("app_name")+ provider = config.get("provider")+ unsupported = config.get("unsupported") or ""+
+ if app_name is None or provider is None:
+ raise Exception("Application name and provider must be specified")+
+ self.cab_header.set_meta(arch, app_name, provider, unsupported)
+ self.app_name = app_name
+
+ # Get the shortened 8.3 filename used for the specified file
+ # within the CAB.
+
+ def __shorten_name(self, filename, file_no):
+
+ # Strip down to base filename without extension:
+
+ basename = os.path.basename(filename)
+
+ if "." in basename:
+ basename = basename.rpartition(".")[0]+
+ # Remove non-alphanumeric characters:
+
+ def only_alnum(x):
+ if x.isalnum():
+ return x
+ else:
+ return ""
+
+ cleaned_name = "".join(map(only_alnum, basename))
+ short_name = cleaned_name[0:8]
+
+ if len(short_name) < 8:
+ short_name = "0" * (8 - len(short_name)) + short_name
+
+ return "%s.%03i" % (short_name, file_no)
+
+ # Process the list of files to install:
+
+ def __process_files(self, files):
+ self.files = [ self.app_name ]
+
+ for filename, source_file in files.items():
+ file_no = len(self.files)
+ filename = expand_path(filename)
+ self.cab_header.add_file(filename, file_no)
+ self.files.append(source_file)
+
+ # Process the list of links:
+
+ def __process_links(self, links):
+ for destination, target in links.items():
+ target = expand_path(target)
+ destination = expand_path(destination)
+ self.cab_header.add_link(target, destination)
+
+ # Write the header file:
+
+ def __write_header(self, dir):
+
+ basename = self.__shorten_name(self.files[0], 0)
+ filename = os.path.join(dir, basename)
+
+ stream = file(filename, "w")
+ self.cab_header.write(stream)
+ stream.close()
+
+ return [ filename ]
+
+ # Write the files:
+
+ def __write_files(self, dir):
+
+ result = []
+
+ for file_no in range(1, len(self.files)):
+ source_file = self.files[file_no]
+ basename = self.__shorten_name(source_file, file_no)
+ filename = os.path.join(dir, basename)
+
+ shutil.copy(source_file, filename)
+ result.append(filename)
+
+ return result
+
+ # Output to a file:
+
+ def write(self, filename):
+
+ temp_dir = tempfile.mkdtemp()
+
+ header = self.__write_header(temp_dir)
+ files = self.__write_files(temp_dir)
+ files.reverse()
+
+ args = [ "lcab", "-n" ] + header + files + [ filename ]
+
+ os.spawnlp(os.P_WAIT, "lcab", *args)
+
+ # Clean up:
+
+ for tmpfile in header + files:
+ os.remove(tmpfile)
+ os.rmdir(temp_dir)
+
+def expand_path(filename):
+
+ # Replace Unix-style / path separators with DOS-style \
+
+ filename = filename.replace("/", "\\")+
+ # Expand $(xyz) path variables to their Windows equivalents:
+
+ def replace_var(match):
+ var_name = match.group(1)
+
+ if not var_name in DIR_VARIABLES:
+ raise Exception("Unknown variable '%s'" % var_name)+ else:
+ return DIR_VARIABLES[var_name]
+
+ return re.sub(r"\$\((.*?)\)", replace_var, filename)
+
+def read_config_file(filename):
+ f = file(filename)
+
+ data = f.readlines()
+ data = "".join(data)
+
+ f.close()
+
+ prog = compile(data, filename, "exec")
+ result = {}+ eval(prog, result)
+
+ return result
+
+# List the files that the output CAB depends on.
+
+def print_dependencies(filename):
+ config = read_config_file(filename)
+
+ files_list = config["files"]
+
+ for dest, source_file in files_list.items():
+ print source_file
+
+if len(sys.argv) < 3:
+ print "Usage: %s <config file> <output file>" % sys.argv[0]
+ sys.exit(0)
+
+if sys.argv[1] == "-d":
+ print_dependencies(sys.argv[2])
+else:
+ config = read_config_file(sys.argv[1])
+
+ cab_file = CabFile(config)
+ cab_file.write(sys.argv[2])
+
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -31,7 +31,10 @@
chocolate_setup_SOURCES=$(SOURCE_FILES)
endif
-chocolate_setup_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@
+chocolate_setup_LDADD = \
+ ../wince/libc_wince.a \
+ ../textscreen/libtextscreen.a \
+ @LDFLAGS@
.rc.o:
$(WINDRES) $^ -o $@
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -35,6 +35,8 @@
#ifdef _WIN32
#include <io.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
#else
#include <sys/stat.h>
#include <sys/types.h>
@@ -74,7 +76,7 @@
//
-// SetConfigDir:
+// M_SetConfigDir:
//
// Sets the location of the configuration directory, where configuration
// files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
@@ -82,10 +84,12 @@
void M_SetConfigDir(void)
{-#ifndef _WIN32
- // Ignore the HOME environment variable on Windows - just behave
- // like Vanilla Doom.
+#if !defined(_WIN32) || defined(_WIN32_WCE)
+ // Configuration settings are stored in ~/.chocolate-doom/,
+ // except on Windows, where we behave like Vanilla Doom and
+ // save in the current directory.
+
char *homedir;
homedir = getenv("HOME");@@ -97,7 +101,8 @@
configdir = malloc(strlen(homedir) + strlen(PACKAGE_TARNAME) + 5);
- sprintf(configdir, "%s/.%s/", homedir, PACKAGE_TARNAME);
+ sprintf(configdir, "%s%c.%s%c", homedir, DIR_SEPARATOR,
+ PACKAGE_TARNAME, DIR_SEPARATOR);
// make the directory if it doesnt already exist
@@ -106,7 +111,7 @@
else
#endif /* #ifndef _WIN32 */
{-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
// when given the -cdrom option, save config+savegames in
// c:\doomdata. This only applies under Windows.
@@ -239,6 +244,7 @@
{"chatmacro7", &chat_macros[7], DEFAULT_STRING, 0, 0 }, {"chatmacro8", &chat_macros[8], DEFAULT_STRING, 0, 0 }, {"chatmacro9", &chat_macros[9], DEFAULT_STRING, 0, 0 },+
};
static default_collection_t doom_defaults =
@@ -282,6 +288,52 @@
{"mouseb_use", &mousebuse, DEFAULT_INT, 0, 0}, {"mouseb_backward", &mousebbackward, DEFAULT_INT, 0, 0}, {"use_libsamplerate", &use_libsamplerate, DEFAULT_INT, 0, 0},+
+ {"key_pause", &key_pause, DEFAULT_KEY, 0, 0},+ {"key_menu_activate", &key_menu_activate, DEFAULT_KEY, 0, 0},+ {"key_menu_up", &key_menu_up, DEFAULT_KEY, 0, 0},+ {"key_menu_down", &key_menu_down, DEFAULT_KEY, 0, 0},+ {"key_menu_left", &key_menu_left, DEFAULT_KEY, 0, 0},+ {"key_menu_right", &key_menu_right, DEFAULT_KEY, 0, 0},+ {"key_menu_back", &key_menu_back, DEFAULT_KEY, 0, 0},+ {"key_menu_forward", &key_menu_forward, DEFAULT_KEY, 0, 0},+ {"key_menu_confirm", &key_menu_confirm, DEFAULT_KEY, 0, 0},+ {"key_menu_abort", &key_menu_abort, DEFAULT_KEY, 0, 0},+ {"key_menu_help", &key_menu_help, DEFAULT_KEY, 0, 0},+ {"key_menu_save", &key_menu_save, DEFAULT_KEY, 0, 0},+ {"key_menu_load", &key_menu_load, DEFAULT_KEY, 0, 0},+ {"key_menu_volume", &key_menu_volume, DEFAULT_KEY, 0, 0},+ {"key_menu_detail", &key_menu_detail, DEFAULT_KEY, 0, 0},+ {"key_menu_qsave", &key_menu_qsave, DEFAULT_KEY, 0, 0},+ {"key_menu_endgame", &key_menu_endgame, DEFAULT_KEY, 0, 0},+ {"key_menu_messages", &key_menu_messages, DEFAULT_KEY, 0, 0},+ {"key_menu_qload", &key_menu_qload, DEFAULT_KEY, 0, 0},+ {"key_menu_quit", &key_menu_quit, DEFAULT_KEY, 0, 0},+ {"key_menu_gamma", &key_menu_gamma, DEFAULT_KEY, 0, 0},+ {"key_menu_incscreen", &key_menu_incscreen, DEFAULT_KEY, 0, 0},+ {"key_menu_decscreen", &key_menu_decscreen, DEFAULT_KEY, 0, 0},+
+ {"key_map_toggle", &key_map_toggle, DEFAULT_KEY, 0, 0},+ {"key_map_north", &key_map_north, DEFAULT_KEY, 0, 0},+ {"key_map_south", &key_map_south, DEFAULT_KEY, 0, 0},+ {"key_map_east", &key_map_east, DEFAULT_KEY, 0, 0},+ {"key_map_west", &key_map_west, DEFAULT_KEY, 0, 0},+ {"key_map_zoomin", &key_map_zoomin, DEFAULT_KEY, 0, 0},+ {"key_map_zoomout", &key_map_zoomout, DEFAULT_KEY, 0, 0},+ {"key_map_maxzoom", &key_map_maxzoom, DEFAULT_KEY, 0, 0},+ {"key_map_follow", &key_map_follow, DEFAULT_KEY, 0, 0},+ {"key_map_grid", &key_map_grid, DEFAULT_KEY, 0, 0},+ {"key_map_mark", &key_map_mark, DEFAULT_KEY, 0, 0},+ {"key_map_clearmark", &key_map_clearmark, DEFAULT_KEY, 0, 0},+ {"key_weapon1", &key_weapon1, DEFAULT_KEY, 0, 0},+ {"key_weapon2", &key_weapon2, DEFAULT_KEY, 0, 0},+ {"key_weapon3", &key_weapon3, DEFAULT_KEY, 0, 0},+ {"key_weapon4", &key_weapon4, DEFAULT_KEY, 0, 0},+ {"key_weapon5", &key_weapon5, DEFAULT_KEY, 0, 0},+ {"key_weapon6", &key_weapon6, DEFAULT_KEY, 0, 0},+ {"key_weapon7", &key_weapon7, DEFAULT_KEY, 0, 0},+ {"key_weapon8", &key_weapon8, DEFAULT_KEY, 0, 0},+ {"key_message_refresh", &key_message_refresh, DEFAULT_KEY, 0, 0},};
static default_collection_t extra_defaults =
@@ -595,5 +647,79 @@
// Restore the normal filename
extra_defaults.filename = main_filename;
+}
+
+#ifdef _WIN32_WCE
+
+static int SystemHasKeyboard(void)
+{+ HKEY key;
+ DWORD valtype;
+ DWORD valsize;
+ DWORD result;
+
+ if (RegOpenKeyExW(HKEY_CURRENT_USER,
+ L"\\Software\\Microsoft\\Shell", 0,
+ KEY_READ, &key) != ERROR_SUCCESS)
+ {+ return 0;
+ }
+
+ valtype = REG_SZ;
+ valsize = sizeof(DWORD);
+
+ if (RegQueryValueExW(key, L"HasKeyboard", NULL, &valtype,
+ (LPBYTE) &result, &valsize) != ERROR_SUCCESS)
+ {+ result = 0;
+ }
+
+ // Close the key
+
+ RegCloseKey(key);
+
+ return result;
+}
+
+//
+// Apply custom defaults for Windows CE.
+//
+
+static void M_ApplyWindowsCEDefaults(void)
+{+ // If the system doesn't have a keyboard, patch the default
+ // configuration to use the hardware keys.
+
+ if (!SystemHasKeyboard())
+ {+ key_use = KEY_F1;
+ key_fire = KEY_F2;
+ key_menu_activate = KEY_F3;
+ key_map_toggle = KEY_F4;
+
+ key_menu_help = 0;
+ key_menu_save = 0;
+ key_menu_load = 0;
+ key_menu_volume = 0;
+
+ key_menu_confirm = KEY_ENTER;
+ key_menu_back = KEY_F2;
+ key_menu_abort = KEY_F2;
+ }
+}
+
+
+#endif
+
+//
+// Apply custom patches to the default values depending on the
+// platform we are running on.
+//
+
+void M_ApplyPlatformDefaults(void)
+{+#ifdef _WIN32_WCE
+ M_ApplyWindowsCEDefaults();
+#endif
}
--- a/setup/configfile.h
+++ b/setup/configfile.h
@@ -38,5 +38,7 @@
void M_SaveMainDefaults(char *filename);
void M_SaveExtraDefaults(char *filename);
+void M_ApplyPlatformDefaults(void);
+
#endif
--- a/setup/display.c
+++ b/setup/display.c
@@ -21,6 +21,10 @@
#include <string.h>
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
#include "textscreen.h"
#include "display.h"
@@ -116,7 +120,7 @@
}
else
{-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
// On Windows, use DirectX over windib by default.
putenv("SDL_VIDEODRIVER=directx");@@ -187,7 +191,14 @@
modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
- for (num_modes=0; modes[num_modes] != NULL; ++num_modes);
+ if (modes == NULL || modes == (SDL_Rect **) -1)
+ {+ num_modes = 0;
+ }
+ else
+ {+ for (num_modes=0; modes[num_modes] != NULL; ++num_modes);
+ }
// Build the screen_modes_fullscreen array
@@ -305,7 +316,7 @@
screen_height = modes[vidmode].h;
}
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
static int win32_video_driver = 0;
@@ -384,7 +395,8 @@
window = TXT_NewWindow("Display Configuration");- TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP, 40, 5);
+ TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP,
+ TXT_SCREEN_W / 2, 5);
TXT_AddWidgets(window,
fs_checkbox = TXT_NewCheckBox("Fullscreen", &fullscreen),@@ -397,7 +409,7 @@
// On Windows, there is an extra control to change between
// the Windows GDI and DirectX video drivers.
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
{txt_table_t *driver_table;
txt_dropdown_list_t *driver_list;
--- a/setup/execute.c
+++ b/setup/execute.c
@@ -28,11 +28,21 @@
#include <sys/types.h>
-#ifndef _WIN32
- #include <sys/wait.h>
- #include <unistd.h>
+#if defined(_WIN32_WCE)
+#include "libc_wince.h"
+#endif
+
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <process.h>
+
#else
- #include <process.h>
+
+#include <sys/wait.h>
+#include <unistd.h>
+
#endif
#include "textscreen.h"
@@ -71,7 +81,6 @@
char *tempdir;
#ifdef _WIN32
-
// Check the TEMP environment variable to find the location.
tempdir = getenv("TEMP");@@ -139,19 +148,131 @@
fprintf(context->stream, "\n");
}
-#ifdef _WIN32
+#if defined(_WIN32)
-static int ExecuteCommand(const char **argv)
+// Wait for the specified process to exit. Returns the exit code.
+
+static unsigned int WaitForProcessExit(HANDLE subprocess)
{- return _spawnv(_P_WAIT, argv[0], argv);
+ DWORD exit_code;
+
+ for (;;)
+ {+ WaitForSingleObject(subprocess, INFINITE);
+
+ if (!GetExitCodeProcess(subprocess, &exit_code))
+ {+ return -1;
+ }
+
+ if (exit_code != STILL_ACTIVE)
+ {+ return exit_code;
+ }
+ }
}
+static wchar_t *GetFullExePath(const char *program)
+{+ wchar_t *result;
+ unsigned int path_len;
+ char *sep;
+
+ // Find the full path to the EXE to execute, by taking the path
+ // to this program and concatenating the EXE name:
+
+ sep = strrchr(myargv[0], DIR_SEPARATOR);
+
+ if (sep == NULL)
+ {+ path_len = 0;
+ result = calloc(strlen(program) + 1, sizeof(wchar_t));
+ }
+ else
+ {+ path_len = sep - myargv[0] + 1;
+
+ result = calloc(path_len + strlen(program) + 1,
+ sizeof(wchar_t));
+ MultiByteToWideChar(CP_OEMCP, 0,
+ myargv[0], path_len,
+ result, path_len);
+ }
+
+ MultiByteToWideChar(CP_OEMCP, 0,
+ program, strlen(program) + 1,
+ result + path_len, strlen(program) + 1);
+
+ return result;
+}
+
+// Convert command line argument to wchar_t string and add surrounding
+// "" quotes:
+
+static wchar_t *GetPaddedWideArg(const char *arg)
+{+ wchar_t *result;
+ unsigned int len = strlen(arg);
+
+ // Convert the command line arg to a wide char string:
+
+ result = calloc(len + 3, sizeof(wchar_t));
+ MultiByteToWideChar(CP_OEMCP, 0,
+ arg, len + 1,
+ result + 1, len + 1);
+
+ // Surrounding quotes:
+
+ result[0] = '"';
+ result[len + 1] = '"';
+ result[len + 2] = 0;
+
+ return result;
+}
+
+static int ExecuteCommand(const char *program, const char *arg)
+{+ PROCESS_INFORMATION proc_info;
+ wchar_t *exe_path;
+ wchar_t *warg;
+ int result = 0;
+
+ exe_path = GetFullExePath(program);
+ warg = GetPaddedWideArg(arg);
+
+ // Invoke the program:
+
+ memset(&proc_info, 0, sizeof(proc_info));
+
+ if (!CreateProcessW(exe_path, warg,
+ NULL, NULL, FALSE, 0, NULL, NULL, NULL,
+ &proc_info))
+ {+ result = -1;
+ }
+ else
+ {+ // Wait for the process to finish, and save the exit code.
+
+ result = WaitForProcessExit(proc_info.hProcess);
+
+ CloseHandle(proc_info.hProcess);
+ CloseHandle(proc_info.hThread);
+ }
+
+ free(exe_path);
+ free(warg);
+
+ return result;
+}
+
#else
-static int ExecuteCommand(const char **argv)
+static int ExecuteCommand(const char *program, const char *arg)
{pid_t childpid;
int result;
+ const char *argv[] = { program, arg, NULL };childpid = fork();
@@ -185,7 +306,6 @@
int ExecuteDoom(execute_context_t *context)
{- const char *argv[3];
char *response_file_arg;
int result;
@@ -196,17 +316,13 @@
response_file_arg = malloc(strlen(context->response_file) + 2);
sprintf(response_file_arg, "@%s", context->response_file);
- argv[0] = DOOM_BINARY;
- argv[1] = response_file_arg;
- argv[2] = NULL;
-
// Run Doom
- result = ExecuteCommand(argv);
+ result = ExecuteCommand(DOOM_BINARY, response_file_arg);
free(response_file_arg);
-
- // Destroy context
+
+ // Destroy context
remove(context->response_file);
free(context->response_file);
free(context);
@@ -242,8 +358,8 @@
exec = NewExecuteContext();
AddCmdLineParameter(exec, "-testcontrols");
- AddCmdLineParameter(exec, "-config %s", main_cfg);
- AddCmdLineParameter(exec, "-extraconfig %s", extra_cfg);
+ AddCmdLineParameter(exec, "-config \"%s\"", main_cfg);
+ AddCmdLineParameter(exec, "-extraconfig \"%s\"", extra_cfg);
ExecuteDoom(exec);
TXT_CloseWindow(testwindow);
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
+
#include "textscreen.h"
#include "doomtype.h"
@@ -38,14 +39,90 @@
int key_strafe = KEY_RALT;
int key_speed = KEY_RSHIFT;
+int key_pause = KEY_PAUSE;
+
+// Menu keys:
+
+int key_menu_activate = KEY_ESCAPE;
+int key_menu_up = KEY_UPARROW;
+int key_menu_down = KEY_DOWNARROW;
+int key_menu_left = KEY_LEFTARROW;
+int key_menu_right = KEY_RIGHTARROW;
+int key_menu_back = KEY_BACKSPACE;
+int key_menu_forward = KEY_ENTER;
+int key_menu_confirm = 'y';
+int key_menu_abort = 'n';
+
+int key_menu_help = KEY_F1;
+int key_menu_save = KEY_F2;
+int key_menu_load = KEY_F3;
+int key_menu_volume = KEY_F4;
+int key_menu_detail = KEY_F5;
+int key_menu_qsave = KEY_F6;
+int key_menu_endgame = KEY_F7;
+int key_menu_messages = KEY_F8;
+int key_menu_qload = KEY_F9;
+int key_menu_quit = KEY_F10;
+int key_menu_gamma = KEY_F11;
+
+int key_menu_incscreen = KEY_EQUALS;
+int key_menu_decscreen = KEY_MINUS;
+
+int key_map_north = KEY_UPARROW;
+int key_map_south = KEY_DOWNARROW;
+int key_map_east = KEY_RIGHTARROW;
+int key_map_west = KEY_LEFTARROW;
+int key_map_zoomin = '=';
+int key_map_zoomout = '-';
+int key_map_toggle = KEY_TAB;
+int key_map_maxzoom = '0';
+int key_map_follow = 'f';
+int key_map_grid = 'g';
+int key_map_mark = 'm';
+int key_map_clearmark = 'c';
+
+int key_weapon1 = '1';
+int key_weapon2 = '2';
+int key_weapon3 = '3';
+int key_weapon4 = '4';
+int key_weapon5 = '5';
+int key_weapon6 = '6';
+int key_weapon7 = '7';
+int key_weapon8 = '8';
+
+int key_message_refresh = KEY_ENTER;
+
int vanilla_keyboard_mapping = 1;
static int always_run = 0;
-static int *allkeys[] = {&key_left, &key_right, &key_up, &key_down, - &key_strafeleft, &key_straferight, &key_fire,
- &key_use, &key_strafe, &key_speed};
+// Keys within these groups cannot have the same value.
+static int *controls[] = { &key_left, &key_right, &key_up, &key_down,+ &key_strafeleft, &key_straferight, &key_fire,
+ &key_use, &key_strafe, &key_speed,
+ &key_pause,
+ &key_weapon1, &key_weapon2, &key_weapon3,
+ &key_weapon4, &key_weapon5, &key_weapon6,
+ &key_weapon7, &key_weapon8, NULL };
+
+static int *menu_nav[] = { &key_menu_activate, &key_menu_up, &key_menu_down,+ &key_menu_left, &key_menu_right, &key_menu_back,
+ &key_menu_forward, NULL };
+
+static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,+ &key_menu_volume, &key_menu_detail, &key_menu_qsave,
+ &key_menu_endgame, &key_menu_messages,
+ &key_menu_qload, &key_menu_quit, &key_menu_gamma,
+ &key_menu_incscreen, &key_menu_decscreen,
+ &key_message_refresh, NULL };
+
+static int *map_keys[] = { &key_map_north, &key_map_south, &key_map_east,+ &key_map_west, &key_map_zoomin, &key_map_zoomout,
+ &key_map_toggle, &key_map_maxzoom, &key_map_follow,
+ &key_map_grid, &key_map_mark, &key_map_clearmark,
+ NULL };
+
static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
{if (always_run)
@@ -66,26 +143,61 @@
}
}
-// Callback invoked when a key control is set
+static int VarInGroup(int *variable, int **group)
+{+ unsigned int i;
-static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+ for (i=0; group[i] != NULL; ++i)
+ {+ if (group[i] == variable)
+ {+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+static void CheckKeyGroup(int *variable, int **group)
{- TXT_CAST_ARG(int, variable);
unsigned int i;
- for (i=0; i<arrlen(allkeys); ++i)
+ // Don't check unless the variable is in this group.
+
+ if (!VarInGroup(variable, group))
{- if (*variable == *allkeys[i] && allkeys[i] != variable)
+ return;
+ }
+
+ // If another variable has the same value as the new value, reset it.
+
+ for (i=0; group[i] != NULL; ++i)
+ {+ if (*variable == *group[i] && group[i] != variable)
{// A different key has the same value. Clear the existing
// value. This ensures that no two keys can have the same
// value.
- *allkeys[i] = 0;
+ *group[i] = 0;
}
}
}
+// Callback invoked when a key control is set
+
+static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+{+ TXT_CAST_ARG(int, variable);
+
+ CheckKeyGroup(variable, controls);
+ CheckKeyGroup(variable, menu_nav);
+ CheckKeyGroup(variable, shortcuts);
+ CheckKeyGroup(variable, map_keys);
+}
+
+// Add a label and keyboard input to the specified table.
+
static void AddKeyControl(txt_table_t *table, char *name, int *var)
{txt_key_input_t *key_input;
@@ -93,9 +205,99 @@
TXT_AddWidget(table, TXT_NewLabel(name));
key_input = TXT_NewKeyInput(var);
TXT_AddWidget(table, key_input);
+
TXT_SignalConnect(key_input, "set", KeySetCallback, var);
}
+static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{+ txt_window_t *window;
+ txt_table_t *table;
+ txt_scrollpane_t *scrollpane;
+
+ window = TXT_NewWindow("Other keys");+
+ table = TXT_NewTable(2);
+
+ TXT_SetColumnWidths(table, 25, 10);
+
+ TXT_AddWidgets(table, TXT_NewLabel(" - Weapons - "),+ TXT_NewStrut(0, 0),
+ NULL);
+
+ AddKeyControl(table, "Weapon 1", &key_weapon1);
+ AddKeyControl(table, "Weapon 2", &key_weapon2);
+ AddKeyControl(table, "Weapon 3", &key_weapon3);
+ AddKeyControl(table, "Weapon 4", &key_weapon4);
+ AddKeyControl(table, "Weapon 5", &key_weapon5);
+ AddKeyControl(table, "Weapon 6", &key_weapon6);
+ AddKeyControl(table, "Weapon 7", &key_weapon7);
+ AddKeyControl(table, "Weapon 8", &key_weapon8);
+
+ TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+ TXT_NewStrut(0, 1),
+ TXT_NewLabel(" - Menu navigation - "),+ TXT_NewStrut(0, 0),
+ NULL);
+
+ AddKeyControl(table, "Activate menu", &key_menu_activate);
+ AddKeyControl(table, "Move cursor up", &key_menu_up);
+ AddKeyControl(table, "Move cursor down", &key_menu_down);
+ AddKeyControl(table, "Move slider left", &key_menu_left);
+ AddKeyControl(table, "Move slider right", &key_menu_right);
+ AddKeyControl(table, "Go to previous menu", &key_menu_back);
+ AddKeyControl(table, "Activate menu item", &key_menu_forward);
+ AddKeyControl(table, "Confirm action", &key_menu_confirm);
+ AddKeyControl(table, "Cancel action", &key_menu_abort);
+
+ TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+ TXT_NewStrut(0, 1),
+ TXT_NewLabel(" - Shortcut keys - "),+ TXT_NewStrut(0, 0),
+ NULL);
+
+ AddKeyControl(table, "Pause game", &key_pause);
+ AddKeyControl(table, "Help screen", &key_menu_help);
+ AddKeyControl(table, "Save game", &key_menu_save);
+ AddKeyControl(table, "Load game", &key_menu_load);
+ AddKeyControl(table, "Sound volume", &key_menu_volume);
+ AddKeyControl(table, "Toggle detail", &key_menu_detail);
+ AddKeyControl(table, "Quick save", &key_menu_qsave);
+ AddKeyControl(table, "End game", &key_menu_endgame);
+ AddKeyControl(table, "Toggle messages", &key_menu_messages);
+ AddKeyControl(table, "Quick load", &key_menu_qload);
+ AddKeyControl(table, "Quit game", &key_menu_quit);
+ AddKeyControl(table, "Toggle gamma", &key_menu_gamma);
+
+ AddKeyControl(table, "Increase screen size", &key_menu_incscreen);
+ AddKeyControl(table, "Decrease screen size", &key_menu_decscreen);
+
+ AddKeyControl(table, "Display last message", &key_message_refresh);
+
+ TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+ TXT_NewStrut(0, 1),
+ TXT_NewLabel(" - Map - "),+ TXT_NewStrut(0, 0),
+ NULL);
+
+ AddKeyControl(table, "Toggle map", &key_map_toggle);
+ AddKeyControl(table, "Zoom in", &key_map_zoomin);
+ AddKeyControl(table, "Zoom out", &key_map_zoomout);
+ AddKeyControl(table, "Maximum zoom out", &key_map_maxzoom);
+ AddKeyControl(table, "Follow mode", &key_map_follow);
+ AddKeyControl(table, "Pan north", &key_map_north);
+ AddKeyControl(table, "Pan south", &key_map_south);
+ AddKeyControl(table, "Pan east", &key_map_east);
+ AddKeyControl(table, "Pan west", &key_map_west);
+ AddKeyControl(table, "Toggle grid", &key_map_grid);
+ AddKeyControl(table, "Mark location", &key_map_mark);
+ AddKeyControl(table, "Clear all marks", &key_map_clearmark);
+
+ scrollpane = TXT_NewScrollPane(0, 12, table);
+
+ TXT_AddWidget(window, scrollpane);
+}
+
void ConfigKeyboard(void)
{txt_window_t *window;
@@ -107,13 +309,16 @@
window = TXT_NewWindow("Keyboard configuration");- TXT_AddWidgets(window,
+ TXT_AddWidgets(window,
TXT_NewSeparator("Movement"),- movement_table = TXT_NewTable(2),
+ movement_table = TXT_NewTable(4),
TXT_NewSeparator("Action"),- action_table = TXT_NewTable(2),
+ action_table = TXT_NewTable(4),
+ TXT_NewButton2("Other keys...", OtherKeysDialog, NULL),+ NULL);
+ TXT_AddWidgets(window,
TXT_NewSeparator("Misc."), run_control = TXT_NewCheckBox("Always run", &always_run), TXT_NewInvertedCheckBox("Use native keyboard mapping", @@ -120,23 +325,23 @@
&vanilla_keyboard_mapping),
NULL);
- TXT_SetColumnWidths(movement_table, 20, 8);
+ TXT_SetColumnWidths(movement_table, 15, 4, 15, 4);
TXT_SignalConnect(run_control, "changed", UpdateJoybSpeed, NULL);
AddKeyControl(movement_table, "Move Forward", &key_up);
+ AddKeyControl(movement_table, " Strafe Left", &key_strafeleft);
AddKeyControl(movement_table, "Move Backward", &key_down);
+ AddKeyControl(movement_table, " Strafe Right", &key_straferight);
AddKeyControl(movement_table, "Turn Left", &key_left);
+ AddKeyControl(movement_table, " Speed On", &key_speed);
AddKeyControl(movement_table, "Turn Right", &key_right);
- AddKeyControl(movement_table, "Strafe Left", &key_strafeleft);
- AddKeyControl(movement_table, "Strafe Right", &key_straferight);
- AddKeyControl(movement_table, "Speed On", &key_speed);
- AddKeyControl(movement_table, "Strafe On", &key_strafe);
+ AddKeyControl(movement_table, " Strafe On", &key_strafe);
- TXT_SetColumnWidths(action_table, 20, 8);
+ TXT_SetColumnWidths(action_table, 15, 4, 15, 4);
- AddKeyControl(action_table, "Use", &key_use);
- AddKeyControl(action_table, "Fire", &key_fire);
+ AddKeyControl(action_table, "Fire/Attack", &key_fire);
+ AddKeyControl(action_table, " Use", &key_use);
TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
}
--- a/setup/keyboard.h
+++ b/setup/keyboard.h
@@ -35,6 +35,63 @@
extern int joybspeed;
extern int vanilla_keyboard_mapping;
+extern int key_pause;
+
+// Menu keys:
+
+extern int key_menu_activate;
+extern int key_menu_up;
+extern int key_menu_down;
+extern int key_menu_left;
+extern int key_menu_right;
+extern int key_menu_back;
+extern int key_menu_forward;
+extern int key_menu_confirm;
+extern int key_menu_abort;
+
+extern int key_menu_help;
+extern int key_menu_save;
+extern int key_menu_load;
+extern int key_menu_volume;
+extern int key_menu_detail;
+extern int key_menu_qsave;
+extern int key_menu_endgame;
+extern int key_menu_messages;
+extern int key_menu_qload;
+extern int key_menu_quit;
+extern int key_menu_gamma;
+
+extern int key_menu_incscreen;
+extern int key_menu_decscreen;
+
+// Automap keys:
+
+extern int key_map_north;
+extern int key_map_south;
+extern int key_map_east;
+extern int key_map_west;
+extern int key_map_zoomin;
+extern int key_map_zoomout;
+extern int key_map_toggle;
+extern int key_map_maxzoom;
+extern int key_map_follow;
+extern int key_map_grid;
+extern int key_map_mark;
+extern int key_map_clearmark;
+
+// Weapon keys:
+
+extern int key_weapon1;
+extern int key_weapon2;
+extern int key_weapon3;
+extern int key_weapon4;
+extern int key_weapon5;
+extern int key_weapon6;
+extern int key_weapon7;
+extern int key_weapon8;
+
+extern int key_message_refresh;
+
void ConfigKeyboard(void);
#endif /* #ifndef SETUP_KEYBOARD_H */
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -18,8 +18,14 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
+
#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
#include "config.h"
#include "textscreen.h"
@@ -137,6 +143,8 @@
static void InitConfig(void)
{+ M_ApplyPlatformDefaults();
+
SetChatMacroDefaults();
SetPlayerNameDefault();
@@ -211,6 +219,15 @@
{myargc = argc;
myargv = argv;
+
+#ifdef _WIN32_WCE
+
+ // Windows CE has no environment, but SDL provides an implementation.
+ // Populate the environment with the values we normally find.
+
+ PopulateEnvironment();
+
+#endif
InitConfig();
RunGUI();
--- a/setup/multiplayer.c
+++ b/setup/multiplayer.c
@@ -48,6 +48,12 @@
WARP_DOOM2,
} warptype_t;
+typedef enum
+{+ JOIN_AUTO_LAN,
+ JOIN_ADDRESS,
+} jointype_t;
+
static iwad_t iwads[] =
{ { "doom.wad", "Doom", IWAD_DOOM },@@ -98,6 +104,8 @@
char *net_player_name;
char *chat_macros[10];
+static int jointype = JOIN_ADDRESS;
+
static char *wads[NUM_WADS];
static char *extra_params[NUM_EXTRA_PARAMS];
static int skill = 2;
@@ -608,7 +616,14 @@
exec = NewExecuteContext();
- AddCmdLineParameter(exec, "-connect %s", connect_address);
+ if (jointype == JOIN_ADDRESS)
+ {+ AddCmdLineParameter(exec, "-connect %s", connect_address);
+ }
+ else if (jointype == JOIN_AUTO_LAN)
+ {+ AddCmdLineParameter(exec, "-autojoin");
+ }
// Extra parameters come first, so that they can be used to override
// the other parameters.
@@ -638,18 +653,28 @@
return action;
}
+// When an address is entered, select "address" mode.
+
+static void SelectAddressJoin(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{+ jointype = JOIN_ADDRESS;
+}
+
void JoinMultiGame(void)
{txt_window_t *window;
txt_table_t *gameopt_table;
+ txt_table_t *serveropt_table;
+ txt_inputbox_t *address_box;
window = TXT_NewWindow("Join multiplayer game");TXT_AddWidgets(window,
gameopt_table = TXT_NewTable(2),
+ TXT_NewSeparator("Server"),+ serveropt_table = TXT_NewTable(2),
TXT_NewStrut(0, 1),
TXT_NewButton2("Add extra parameters...", OpenExtraParamsWindow, NULL),- // TXT_NewButton2("Add WADs...", OpenWadsWindow, NULL),NULL);
TXT_SetColumnWidths(gameopt_table, 12, 12);
@@ -657,9 +682,18 @@
TXT_AddWidgets(gameopt_table,
TXT_NewLabel("Game"),IWADSelector(),
- TXT_NewLabel("Server address "),- TXT_NewInputBox(&connect_address, 40),
NULL);
+
+ TXT_AddWidgets(serveropt_table,
+ TXT_NewRadioButton("Connect to address:",+ &jointype, JOIN_ADDRESS),
+ address_box = TXT_NewInputBox(&connect_address, 30),
+ TXT_NewRadioButton("Auto-join LAN game",+ &jointype, JOIN_AUTO_LAN),
+ NULL);
+
+ TXT_SignalConnect(address_box, "changed", SelectAddressJoin, NULL);
+ TXT_SelectWidget(window, address_box);
TXT_SetWindowAction(window, TXT_HORIZ_CENTER, WadWindowAction());
TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, JoinGameAction());
--- a/setup/txt_keyinput.c
+++ b/setup/txt_keyinput.c
@@ -57,6 +57,11 @@
}
}
+static void ReleaseGrab(TXT_UNCAST_ARG(window), TXT_UNCAST_ARG(unused))
+{+ SDL_WM_GrabInput(SDL_GRAB_OFF);
+}
+
static void OpenPromptWindow(txt_key_input_t *key_input)
{txt_window_t *window;
@@ -78,6 +83,13 @@
// Disable key mappings while we prompt for the key press
TXT_EnableKeyMapping(0);
+
+ // Grab input while reading the key. On Windows Mobile
+ // handheld devices, the hardware keypresses are only
+ // detected when input is grabbed.
+
+ SDL_WM_GrabInput(SDL_GRAB_ON);
+ TXT_SignalConnect(window, "closed", ReleaseGrab, NULL);
}
static void TXT_KeyInputSizeCalc(TXT_UNCAST_ARG(key_input))
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
z_native.c z_zone.h
chocolate_server_SOURCES=$(DEDSERV_FILES)
-chocolate_server_LDADD = @LDFLAGS@ @SDLNET_LIBS@
+chocolate_server_LDADD = ../wince/libc_wince.a @LDFLAGS@ @SDLNET_LIBS@
MAIN_SOURCE_FILES=\
am_map.c am_map.h \
@@ -172,6 +172,7 @@
endif
chocolate_doom_LDADD = \
+ ../wince/libc_wince.a \
../textscreen/libtextscreen.a \
../pcsound/libpcsound.a \
../opl/libopl.a \
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -90,19 +90,18 @@
// drawing stuff
#define FB 0
-#define AM_PANDOWNKEY KEY_DOWNARROW
-#define AM_PANUPKEY KEY_UPARROW
-#define AM_PANRIGHTKEY KEY_RIGHTARROW
-#define AM_PANLEFTKEY KEY_LEFTARROW
-#define AM_ZOOMINKEY '='
-#define AM_ZOOMOUTKEY '-'
-#define AM_STARTKEY KEY_TAB
-#define AM_ENDKEY KEY_TAB
-#define AM_GOBIGKEY '0'
-#define AM_FOLLOWKEY 'f'
-#define AM_GRIDKEY 'g'
-#define AM_MARKKEY 'm'
-#define AM_CLEARMARKKEY 'c'
+int key_map_north = KEY_UPARROW;
+int key_map_south = KEY_DOWNARROW;
+int key_map_east = KEY_RIGHTARROW;
+int key_map_west = KEY_LEFTARROW;
+int key_map_zoomin = '=';
+int key_map_zoomout = '-';
+int key_map_toggle = KEY_TAB;
+int key_map_maxzoom = '0';
+int key_map_follow = 'f';
+int key_map_grid = 'g';
+int key_map_mark = 'm';
+int key_map_clearmark = 'c';
#define AM_NUMMARKPOINTS 10
@@ -632,12 +631,13 @@
static int cheatstate=0;
static int bigstate=0;
static char buffer[20];
+ int key;
rc = false;
if (!automapactive)
{- if (ev->type == ev_keydown && ev->data1 == AM_STARTKEY)
+ if (ev->type == ev_keydown && ev->data1 == key_map_toggle)
{AM_Start ();
viewactive = false;
@@ -644,79 +644,91 @@
rc = true;
}
}
-
else if (ev->type == ev_keydown)
{-
rc = true;
- switch(ev->data1)
- {- case AM_PANRIGHTKEY: // pan right
- if (!followplayer) m_paninc.x = FTOM(F_PANINC);
- else rc = false;
- break;
- case AM_PANLEFTKEY: // pan left
- if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
- else rc = false;
- break;
- case AM_PANUPKEY: // pan up
- if (!followplayer) m_paninc.y = FTOM(F_PANINC);
- else rc = false;
- break;
- case AM_PANDOWNKEY: // pan down
- if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
- else rc = false;
- break;
- case AM_ZOOMOUTKEY: // zoom out
- mtof_zoommul = M_ZOOMOUT;
- ftom_zoommul = M_ZOOMIN;
- break;
- case AM_ZOOMINKEY: // zoom in
- mtof_zoommul = M_ZOOMIN;
- ftom_zoommul = M_ZOOMOUT;
- break;
- case AM_ENDKEY:
- bigstate = 0;
- viewactive = true;
- AM_Stop ();
- break;
- case AM_GOBIGKEY:
- bigstate = !bigstate;
- if (bigstate)
- {- AM_saveScaleAndLoc();
- AM_minOutWindowScale();
- }
- else AM_restoreScaleAndLoc();
- break;
- case AM_FOLLOWKEY:
- followplayer = !followplayer;
- f_oldloc.x = INT_MAX;
+ key = ev->data1;
+
+ if (key == key_map_east) // pan right
+ {+ if (!followplayer) m_paninc.x = FTOM(F_PANINC);
+ else rc = false;
+ }
+ else if (key == key_map_west) // pan left
+ {+ if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
+ else rc = false;
+ }
+ else if (key == key_map_north) // pan up
+ {+ if (!followplayer) m_paninc.y = FTOM(F_PANINC);
+ else rc = false;
+ }
+ else if (key == key_map_south) // pan down
+ {+ if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
+ else rc = false;
+ }
+ else if (key == key_map_zoomout) // zoom out
+ {+ mtof_zoommul = M_ZOOMOUT;
+ ftom_zoommul = M_ZOOMIN;
+ }
+ else if (key == key_map_zoomin) // zoom in
+ {+ mtof_zoommul = M_ZOOMIN;
+ ftom_zoommul = M_ZOOMOUT;
+ }
+ else if (key == key_map_toggle)
+ {+ bigstate = 0;
+ viewactive = true;
+ AM_Stop ();
+ }
+ else if (key == key_map_maxzoom)
+ {+ bigstate = !bigstate;
+ if (bigstate)
+ {+ AM_saveScaleAndLoc();
+ AM_minOutWindowScale();
+ }
+ else AM_restoreScaleAndLoc();
+ }
+ else if (key == key_map_follow)
+ {+ followplayer = !followplayer;
+ f_oldloc.x = INT_MAX;
if (followplayer)
plr->message = DEH_String(AMSTR_FOLLOWON);
else
plr->message = DEH_String(AMSTR_FOLLOWOFF);
- break;
- case AM_GRIDKEY:
- grid = !grid;
+ }
+ else if (key == key_map_grid)
+ {+ grid = !grid;
if (grid)
plr->message = DEH_String(AMSTR_GRIDON);
else
plr->message = DEH_String(AMSTR_GRIDOFF);
- break;
- case AM_MARKKEY:
- sprintf(buffer, "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum);
- plr->message = buffer;
- AM_addMark();
- break;
- case AM_CLEARMARKKEY:
- AM_clearMarks();
- plr->message = DEH_String(AMSTR_MARKSCLEARED);
- break;
- default:
- cheatstate=0;
- rc = false;
- }
+ }
+ else if (key == key_map_mark)
+ {+ sprintf(buffer, "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum);
+ plr->message = buffer;
+ AM_addMark();
+ }
+ else if (key == key_map_clearmark)
+ {+ AM_clearMarks();
+ plr->message = DEH_String(AMSTR_MARKSCLEARED);
+ }
+ else
+ {+ cheatstate=0;
+ rc = false;
+ }
+
if (!deathmatch && cht_CheckCheat(&cheat_amap, ev->data2))
{rc = false;
@@ -723,30 +735,32 @@
cheating = (cheating+1) % 3;
}
}
-
else if (ev->type == ev_keyup)
{- rc = false;
- switch (ev->data1)
- {- case AM_PANRIGHTKEY:
- if (!followplayer) m_paninc.x = 0;
- break;
- case AM_PANLEFTKEY:
- if (!followplayer) m_paninc.x = 0;
- break;
- case AM_PANUPKEY:
- if (!followplayer) m_paninc.y = 0;
- break;
- case AM_PANDOWNKEY:
- if (!followplayer) m_paninc.y = 0;
- break;
- case AM_ZOOMOUTKEY:
- case AM_ZOOMINKEY:
- mtof_zoommul = FRACUNIT;
- ftom_zoommul = FRACUNIT;
- break;
- }
+ rc = false;
+ key = ev->data1;
+
+ if (key == key_map_east)
+ {+ if (!followplayer) m_paninc.x = 0;
+ }
+ else if (key == key_map_west)
+ {+ if (!followplayer) m_paninc.x = 0;
+ }
+ else if (key == key_map_north)
+ {+ if (!followplayer) m_paninc.y = 0;
+ }
+ else if (key == key_map_south)
+ {+ if (!followplayer) m_paninc.y = 0;
+ }
+ else if (key == key_map_zoomout || key == key_map_zoomin)
+ {+ mtof_zoommul = FRACUNIT;
+ ftom_zoommul = FRACUNIT;
+ }
}
return rc;
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -63,7 +63,7 @@
// keys installed by the Windows installers for various CD versions
// of Doom. From these keys we can deduce where to find an IWAD.
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -487,7 +487,14 @@
AddDoomWadPath();
-#ifdef _WIN32
+#if defined(_WIN32_WCE)
+
+ // Windows CE locations:
+
+ AddIWADDir("\\Storage Card");+ AddIWADDir(getenv("HOME"));+
+#elif defined(_WIN32)
// Search the registry and find where IWADs have been installed.
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -878,8 +878,7 @@
I_Error("Game mode indeterminate. No IWAD file was found. Try\n""specifying one with the '-iwad' command line parameter.\n");
}
-
- setbuf (stdout, NULL);
+
modifiedgame = false;
//!
@@ -975,6 +974,7 @@
V_Init ();
printf (DEH_String("M_LoadDefaults: Load system defaults.\n"));+ M_ApplyPlatformDefaults();
M_LoadDefaults (); // load before initing other systems
printf (DEH_String("W_Init: Init WADfiles.\n"));--- a/src/d_net.c
+++ b/src/d_net.c
@@ -429,6 +429,7 @@
int i;
int lowtic;
+#ifdef FEATURE_MULTIPLAYER
if (net_client_connected)
{lowtic = INT_MAX;
@@ -443,6 +444,7 @@
}
}
else
+#endif
{lowtic = maketic;
}
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -29,6 +29,13 @@
#ifndef __DOOMTYPE__
#define __DOOMTYPE__
+// Windows CE is missing some vital ANSI C functions. We have to
+// use our own replacements.
+
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
// C99 integer types; with gcc we just use this. Other compilers
// should add conditional statements that define the C99 types.
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -173,6 +173,17 @@
int key_use = ' ';
int key_strafe = KEY_RALT;
int key_speed = KEY_RSHIFT;
+
+int key_weapon1 = '1';
+int key_weapon2 = '2';
+int key_weapon3 = '3';
+int key_weapon4 = '4';
+int key_weapon5 = '5';
+int key_weapon6 = '6';
+int key_weapon7 = '7';
+int key_weapon8 = '8';
+
+int key_pause = KEY_PAUSE;
int mousebfire = 0;
int mousebstrafe = 1;
@@ -211,6 +222,17 @@
fixed_t sidemove[2] = {0x18, 0x28}; fixed_t angleturn[3] = {640, 1280, 320}; // + slow turn +static int *weapon_keys[] = {+ &key_weapon1,
+ &key_weapon2,
+ &key_weapon3,
+ &key_weapon4,
+ &key_weapon5,
+ &key_weapon6,
+ &key_weapon7,
+ &key_weapon8
+};
+
#define SLOWTURNTICS 6
#define NUMKEYS 256
@@ -501,13 +523,18 @@
}
// chainsaw overrides
- for (i=0 ; i<NUMWEAPONS-1 ; i++)
- if (gamekeydown['1'+i])
- { +
+ for (i=0; i<arrlen(weapon_keys); ++i)
+ {+ int key = *weapon_keys[i];
+
+ if (gamekeydown[key])
+ {cmd->buttons |= BT_CHANGE;
cmd->buttons |= i<<BT_WEAPONSHIFT;
break;
- }
+ }
+ }
// mouse
if (mousebuttons[mousebforward])
@@ -765,13 +792,15 @@
switch (ev->type)
{ case ev_keydown:
- if (ev->data1 == KEY_PAUSE)
+ if (ev->data1 == key_pause)
{ sendpause = true;
- return true;
- }
- if (ev->data1 <NUMKEYS)
+ }
+ else if (ev->data1 <NUMKEYS)
+ {gamekeydown[ev->data1] = true;
+ }
+
return true; // eat key down events
case ev_keyup:
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -88,6 +88,7 @@
HUSTR_PLRRED
};
+int key_message_refresh = KEY_ENTER;
char chat_char; // remove later.
static player_t* plr;
@@ -597,7 +598,7 @@
if (!chat_on)
{- if (ev->data1 == HU_MSGREFRESH)
+ if (ev->data1 == key_message_refresh)
{message_on = true;
message_counter = HU_MSGTIMEOUT;
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -40,7 +40,6 @@
#define HU_BROADCAST 5
-#define HU_MSGREFRESH KEY_ENTER
#define HU_MSGX 0
#define HU_MSGY 0
#define HU_MSGWIDTH 64 // in characters
--- a/src/i_main.c
+++ b/src/i_main.c
@@ -29,25 +29,24 @@
#include "SDL.h"
-#include <signal.h>
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#ifdef HAVE_SCHED_SETAFFINITY
-#include <unistd.h>
-#include <sched.h>
-#endif
-
#include "doomdef.h"
#include "i_system.h"
#include "m_argv.h"
#include "d_main.h"
-#if defined(_WIN32)
+#if defined(_WIN32_WCE)
+// Windows CE? I doubt it even supports SMP..
+
+static void LockCPUAffinity(void)
+{+}
+
+#elif defined(_WIN32)
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
typedef BOOL WINAPI (*SetAffinityFunc)(HANDLE hProcess, DWORD_PTR mask);
// This is a bit more complicated than it really needs to be. We really
@@ -93,10 +92,14 @@
#elif defined(HAVE_SCHED_SETAFFINITY)
+#include <unistd.h>
+#include <sched.h>
+
// Unix (Linux) version:
static void LockCPUAffinity(void)
{+#ifdef CPU_SET
cpu_set_t set;
CPU_ZERO(&set);
@@ -103,6 +106,10 @@
CPU_SET(0, &set);
sched_setaffinity(getpid(), sizeof(set), &set);
+#else
+ unsigned long mask = 1;
+ sched_setaffinity(getpid(), sizeof(mask), &mask);
+#endif
}
#else
@@ -125,6 +132,15 @@
myargc = argc;
myargv = argv;
+
+#ifdef _WIN32_WCE
+
+ // Windows CE has no environment, but SDL provides an implementation.
+ // Populate the environment with the values we normally find.
+
+ PopulateEnvironment();
+
+#endif
// Only schedule on a single core, if we have multiple
// cores. This is to work around a bug in SDL_mixer.
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
+#include <math.h>
#include "SDL.h"
#include "SDL_mixer.h"
@@ -48,6 +49,7 @@
#include "doomdef.h"
#define LOW_PASS_FILTER
+#define MAX_SOUND_SLICE_TIME 70 /* ms */
#define NUM_CHANNELS 16
static boolean sound_initialised = false;
@@ -58,8 +60,6 @@
static int mixer_freq;
static Uint16 mixer_format;
static int mixer_channels;
-static uint32_t (*ExpandSoundData)(byte *data, int samplerate, int length,
- Mix_Chunk *destination) = NULL;
int use_libsamplerate = 0;
@@ -79,6 +79,12 @@
channels_playing[channel] = sfx_None;
+#ifdef HAVE_LIBSAMPLERATE
+ // Don't allow precached sounds to be swapped out.
+ if (use_libsamplerate)
+ return;
+#endif
+
for (i=0; i<NUM_CHANNELS; ++i)
{// Playing on this channel? if so, don't release.
@@ -92,6 +98,7 @@
Z_ChangeTag(sound_chunks[id].abuf, PU_CACHE);
}
+
#ifdef HAVE_LIBSAMPLERATE
// Returns the conversion mode for libsamplerate to use.
@@ -121,101 +128,6 @@
}
}
-// libsamplerate-based generic sound expansion function for any sample rate
-// unsigned 8 bits --> signed 16 bits
-// mono --> stereo
-// samplerate --> mixer_freq
-// Returns number of clipped samples.
-// DWF 2008-02-10 with cleanups by Simon Howard.
-
-static uint32_t ExpandSoundData_SRC(byte *data,
- int samplerate,
- int length,
- Mix_Chunk *destination)
-{- SRC_DATA src_data;
- uint32_t i, abuf_index=0, clipped=0;
- int retn;
- int16_t *expanded;
-
- src_data.input_frames = length;
- src_data.data_in = malloc(length * sizeof(float));
- src_data.src_ratio = (double)mixer_freq / samplerate;
-
- // We include some extra space here in case of rounding-up.
- src_data.output_frames = src_data.src_ratio * length + (mixer_freq / 4);
- src_data.data_out = malloc(src_data.output_frames * sizeof(float));
-
- assert(src_data.data_in != NULL && src_data.data_out != NULL);
-
- // Convert input data to floats
-
- for (i=0; i<length; ++i)
- {- // Unclear whether 128 should be interpreted as "zero" or whether a
- // symmetrical range should be assumed. The following assumes a
- // symmetrical range.
- src_data.data_in[i] = data[i] / 127.5 - 1;
- }
-
- // Do the sound conversion
-
- retn = src_simple(&src_data, SRC_ConversionMode(), 1);
- assert(retn == 0);
-
- // Convert the result back into 16-bit integers.
-
- destination->alen = src_data.output_frames_gen * 4;
- destination->abuf = Z_Malloc(destination->alen, PU_STATIC,
- &destination->abuf);
- expanded = (int16_t *) destination->abuf;
-
- for (i=0; i<src_data.output_frames_gen; ++i)
- {- // libsamplerate does not limit itself to the -1.0 .. 1.0 range on
- // output, so a multiplier less than INT16_MAX (32767) is required
- // to avoid overflows or clipping. However, the smaller the
- // multiplier, the quieter the sound effects get, and the more you
- // have to turn down the music to keep it in balance.
-
- // 22265 is the largest multiplier that can be used to resample all
- // of the Vanilla DOOM sound effects to 48 kHz without clipping
- // using SRC_SINC_BEST_QUALITY. It is close enough (only slightly
- // too conservative) for SRC_SINC_MEDIUM_QUALITY and
- // SRC_SINC_FASTEST. PWADs with interestingly different sound
- // effects or target rates other than 48 kHz might still result in
- // clipping--I don't know if there's a limit to it.
-
- // As the number of clipped samples increases, the signal is
- // gradually overtaken by noise, with the loudest parts going first.
- // However, a moderate amount of clipping is often tolerated in the
- // quest for the loudest possible sound overall. The results of
- // using INT16_MAX as the multiplier are not all that bad, but
- // artifacts are noticeable during the loudest parts.
-
- float cvtval_f = src_data.data_out[i] * 22265;
- int32_t cvtval_i = cvtval_f + (cvtval_f < 0 ? -0.5 : 0.5);
-
- // Asymmetrical sound worries me, so we won't use -32768.
- if (cvtval_i < -INT16_MAX) {- cvtval_i = -INT16_MAX;
- ++clipped;
- } else if (cvtval_i > INT16_MAX) {- cvtval_i = INT16_MAX;
- ++clipped;
- }
-
- // Left and right channels
-
- expanded[abuf_index++] = cvtval_i;
- expanded[abuf_index++] = cvtval_i;
- }
-
- free(src_data.data_in);
- free(src_data.data_out);
- return clipped;
-}
-
#endif
static boolean ConvertibleRatio(int freq1, int freq2)
@@ -248,12 +160,11 @@
}
// Generic sound expansion function for any sample rate.
-// Returns number of clipped samples (always 0).
-static uint32_t ExpandSoundData_SDL(byte *data,
- int samplerate,
- int length,
- Mix_Chunk *destination)
+static void ExpandSoundData_SDL(byte *data,
+ int samplerate,
+ uint32_t length,
+ Mix_Chunk *destination)
{SDL_AudioCVT convertor;
uint32_t expanded_length;
@@ -265,7 +176,6 @@
// Double up twice: 8 -> 16 bit and mono -> stereo
expanded_length *= 4;
-
destination->alen = expanded_length;
destination->abuf
= Z_Malloc(expanded_length, PU_STATIC, &destination->abuf);
@@ -344,70 +254,93 @@
}
#endif /* #ifdef LOW_PASS_FILTER */
}
-
- return 0;
}
-// Load and convert a sound effect
-// Returns true if successful
-static boolean CacheSFX(int sound)
+// Load and validate a sound effect lump.
+// Preconditions:
+// S_sfx[sound].lumpnum has been set
+// Postconditions if sound is valid:
+// returns true
+// starred parameters are set, with data_ref pointing to start of sound
+// caller is responsible for releasing the identified lump
+// Postconditions if sound is invalid:
+// returns false
+// starred parameters are garbage
+// lump already released
+
+static boolean LoadSoundLump(int sound,
+ int *lumpnum,
+ int *samplerate,
+ uint32_t *length,
+ byte **data_ref)
{- int lumpnum;
- unsigned int lumplen;
- int samplerate;
- int clipped;
- unsigned int length;
- byte *data;
+ // Load the sound
- // need to load the sound
+ *lumpnum = S_sfx[sound].lumpnum;
+ *data_ref = W_CacheLumpNum(*lumpnum, PU_STATIC);
+ int lumplen = W_LumpLength(*lumpnum);
+ byte *data = *data_ref;
- lumpnum = S_sfx[sound].lumpnum;
- data = W_CacheLumpNum(lumpnum, PU_STATIC);
- lumplen = W_LumpLength(lumpnum);
+ // Ensure this is a valid sound
- // Check the header, and ensure this is a valid sound
-
- if (lumplen < 8
- || data[0] != 0x03 || data[1] != 0x00)
+ if (lumplen < 8 || data[0] != 0x03 || data[1] != 0x00)
{- // Invalid sound
-
- return false;
+ // Invalid sound
+ W_ReleaseLumpNum(*lumpnum);
+ return false;
}
// 16 bit sample rate field, 32 bit length field
- samplerate = (data[3] << 8) | data[2];
- length = (data[7] << 24) | (data[6] << 16) | (data[5] << 8) | data[4];
+ *samplerate = (data[3] << 8) | data[2];
+ *length = (data[7] << 24) | (data[6] << 16) | (data[5] << 8) | data[4];
- // If the header specifies that the length of the sound is greater than
- // the length of the lump itself, this is an invalid sound lump
+ // If the header specifies that the length of the sound is
+ // greater than the length of the lump itself, this is an invalid
+ // sound lump.
- if (length > lumplen - 8)
+ if (*length > lumplen - 8)
{- return false;
+ W_ReleaseLumpNum(*lumpnum);
+ return false;
}
+ // Prune header
+ *data_ref += 8;
+
+ return true;
+}
+
+
+// Load and convert a sound effect
+// Returns true if successful
+
+static boolean CacheSFX_SDL(int sound)
+{+ int lumpnum;
+ int samplerate;
+ uint32_t length;
+ byte *data;
+
+#ifdef HAVE_LIBSAMPLERATE
+ assert(!use_libsamplerate); // Should be using I_PrecacheSounds_SRC instead
+#endif
+
+ if (!LoadSoundLump(sound, &lumpnum, &samplerate, &length, &data))
+ return false;
+
// Sample rate conversion
- // DWF 2008-02-10: sound_chunks[sound].alen and abuf are determined
- // by ExpandSoundData.
+ // sound_chunks[sound].alen and abuf are determined by ExpandSoundData.
sound_chunks[sound].allocated = 1;
sound_chunks[sound].volume = MIX_MAX_VOLUME;
- clipped = ExpandSoundData(data + 8,
- samplerate,
- length,
- &sound_chunks[sound]);
+ ExpandSoundData_SDL(data,
+ samplerate,
+ length,
+ &sound_chunks[sound]);
- if (clipped)
- {- fprintf(stderr, "Sound %d: clipped %u samples (%0.2f %%)\n",
- sound, clipped,
- 400.0 * clipped / sound_chunks[sound].alen);
- }
-
// don't need the original lump any more
W_ReleaseLumpNum(lumpnum);
@@ -415,50 +348,172 @@
return true;
}
+
#ifdef HAVE_LIBSAMPLERATE
-// Preload all the sound effects - stops nasty ingame freezes
+// Preload and resample all sound effects with libsamplerate.
-static void I_PrecacheSounds(void)
+static void I_PrecacheSounds_SRC(void)
{char namebuf[9];
- int i;
+ uint32_t sound_i, sample_i;
+ boolean good_sound[NUMSFX];
+ float *resampled_sound[NUMSFX];
+ uint32_t resampled_sound_length[NUMSFX];
+ float norm_factor;
+ float max_amp = 0;
+ unsigned int zone_size;
- printf("I_PrecacheSounds: Precaching all sound effects..");+ assert(use_libsamplerate);
- for (i=sfx_pistol; i<NUMSFX; ++i)
+ zone_size = Z_ZoneSize();
+
+ if (zone_size < 32 * 1024 * 1024)
{- if ((i % 6) == 0)
+ fprintf(stderr,
+ "WARNING: low memory. Heap size is only %d MiB.\n"
+ "WARNING: use_libsamplerate needs more heap!\n"
+ "WARNING: put -mb 64 on the command line to avoid "
+ "\"Error: Z_Malloc: failed on allocation of X bytes\" !\n",
+ zone_size / (1024 * 1024));
+ }
+
+ printf("I_PrecacheSounds_SRC: Precaching all sound effects..");+
+ // Pass 1: resample all sounds and determine maximum amplitude.
+
+ for (sound_i=sfx_pistol; sound_i<NUMSFX; ++sound_i)
+ {+ good_sound[sound_i] = false;
+
+ if ((sound_i % 6) == 0)
{ printf(".");fflush(stdout);
}
- sprintf(namebuf, "ds%s", DEH_String(S_sfx[i].name));
+ sprintf(namebuf, "ds%s", DEH_String(S_sfx[sound_i].name));
+ S_sfx[sound_i].lumpnum = W_CheckNumForName(namebuf);
+ if (S_sfx[sound_i].lumpnum != -1)
+ {+ int lumpnum;
+ int samplerate;
+ uint32_t length;
+ byte *data;
+ double of_temp;
+ int retn;
+ float *rsound;
+ uint32_t rlen;
+ SRC_DATA src_data;
- S_sfx[i].lumpnum = W_CheckNumForName(namebuf);
+ if (!LoadSoundLump(sound_i, &lumpnum, &samplerate, &length, &data))
+ continue;
- if (S_sfx[i].lumpnum != -1)
+ assert(length <= LONG_MAX);
+ src_data.input_frames = length;
+ src_data.data_in = malloc(length * sizeof(float));
+ src_data.src_ratio = (double)mixer_freq / samplerate;
+
+ // mixer_freq / 4 adds a quarter-second safety margin.
+
+ of_temp = src_data.src_ratio * length + (mixer_freq / 4);
+ assert(of_temp <= LONG_MAX);
+ src_data.output_frames = of_temp;
+ src_data.data_out = malloc(src_data.output_frames * sizeof(float));
+ assert(src_data.data_in != NULL && src_data.data_out != NULL);
+
+ // Convert input data to floats
+
+ for (sample_i=0; sample_i<length; ++sample_i)
+ {+ // Unclear whether 128 should be interpreted as "zero" or
+ // whether a symmetrical range should be assumed. The
+ // following assumes a symmetrical range.
+
+ src_data.data_in[sample_i] = data[sample_i] / 127.5 - 1;
+ }
+
+ // don't need the original lump any more
+
+ W_ReleaseLumpNum(lumpnum);
+
+ // Resample
+
+ retn = src_simple(&src_data, SRC_ConversionMode(), 1);
+ assert(retn == 0);
+ assert(src_data.output_frames_gen > 0);
+ resampled_sound[sound_i] = src_data.data_out;
+ resampled_sound_length[sound_i] = src_data.output_frames_gen;
+ free(src_data.data_in);
+ good_sound[sound_i] = true;
+
+ // Track maximum amplitude for later normalization
+
+ rsound = resampled_sound[sound_i];
+ rlen = resampled_sound_length[sound_i];
+ for (sample_i=0; sample_i<rlen; ++sample_i)
+ {+ float fabs_amp = fabsf(rsound[sample_i]);
+ if (fabs_amp > max_amp)
+ max_amp = fabs_amp;
+ }
+ }
+ }
+
+ // Pass 2: normalize and convert to signed 16-bit stereo.
+
+ if (max_amp <= 0)
+ max_amp = 1;
+ norm_factor = INT16_MAX / max_amp;
+
+ for (sound_i=sfx_pistol; sound_i<NUMSFX; ++sound_i)
+ {+ if (good_sound[sound_i])
{- CacheSFX(i);
+ uint32_t rlen = resampled_sound_length[sound_i];
+ int16_t *expanded;
+ uint32_t abuf_index;
+ float *rsound;
- if (sound_chunks[i].abuf != NULL)
+ sound_chunks[sound_i].allocated = 1;
+ sound_chunks[sound_i].volume = MIX_MAX_VOLUME;
+ sound_chunks[sound_i].alen = rlen * 4;
+ sound_chunks[sound_i].abuf = Z_Malloc(sound_chunks[sound_i].alen,
+ PU_STATIC,
+ &sound_chunks[sound_i].abuf);
+ expanded = (int16_t *) sound_chunks[sound_i].abuf;
+ abuf_index=0;
+
+ rsound = resampled_sound[sound_i];
+ for (sample_i=0; sample_i<rlen; ++sample_i)
{- Z_ChangeTag(sound_chunks[i].abuf, PU_CACHE);
+ float cvtval_f = norm_factor * rsound[sample_i];
+ int16_t cvtval_i = cvtval_f + (cvtval_f < 0 ? -0.5 : 0.5);
+
+ // Left and right channels
+
+ expanded[abuf_index++] = cvtval_i;
+ expanded[abuf_index++] = cvtval_i;
}
+ free(rsound);
}
}
- printf("\n");+ printf(" norm factor = %f\n", norm_factor);}
#endif
+
static Mix_Chunk *GetSFXChunk(int sound_id)
{if (sound_chunks[sound_id].abuf == NULL)
{- if (!CacheSFX(sound_id))
+#ifdef HAVE_LIBSAMPLERATE
+ if (use_libsamplerate != 0)
+ return NULL; /* If valid, it should have been precached */
+#endif
+ if (!CacheSFX_SDL(sound_id))
return NULL;
}
else
@@ -612,7 +667,33 @@
sound_initialised = false;
}
+// Calculate slice size, based on MAX_SOUND_SLICE_TIME.
+// The result must be a power of two.
+static int GetSliceSize(void)
+{+ int limit;
+ int n;
+
+ limit = (snd_samplerate * MAX_SOUND_SLICE_TIME) / 1000;
+
+ // Try all powers of two, not exceeding the limit.
+
+ for (n=0;; ++n)
+ {+ // 2^n <= limit < 2^n+1 ?
+
+ if ((1 << (n + 1)) > limit)
+ {+ return (1 << n);
+ }
+ }
+
+ // Should never happen?
+
+ return 1024;
+}
+
static boolean I_SDL_InitSound(void)
{ int i;
@@ -635,14 +716,12 @@
return false;
}
- if (Mix_OpenAudio(snd_samplerate, AUDIO_S16SYS, 2, 1024) < 0)
+ if (Mix_OpenAudio(snd_samplerate, AUDIO_S16SYS, 2, GetSliceSize()) < 0)
{fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
return false;
}
- ExpandSoundData = ExpandSoundData_SDL;
-
Mix_QuerySpec(&mixer_freq, &mixer_format, &mixer_channels);
#ifdef HAVE_LIBSAMPLERATE
@@ -654,9 +733,7 @@
use_libsamplerate);
}
- ExpandSoundData = ExpandSoundData_SRC;
-
- I_PrecacheSounds();
+ I_PrecacheSounds_SRC();
}
#else
if (use_libsamplerate != 0)
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -59,7 +59,9 @@
#include "w_wad.h"
#include "z_zone.h"
-int mb_used = 16;
+#define DEFAULT_RAM 16 /* MiB */
+#define MIN_RAM 4 /* MiB */
+
int show_endoom = 1;
// Tactile feedback function, probably used for the Logitech Cyberman
@@ -68,8 +70,99 @@
{}
-int I_GetHeapSize (void)
+#ifdef _WIN32_WCE
+
+// Windows CE-specific auto-allocation function that allocates the zone
+// size based on the amount of memory reported free by the OS.
+
+static byte *AutoAllocMemory(int *size, int default_ram, int min_ram)
{+ MEMORYSTATUS memory_status;
+ byte *zonemem;
+ size_t available;
+
+ // Get available physical RAM. We leave one megabyte extra free
+ // for the OS to keep running (my PDA becomes unstable if too
+ // much RAM is allocated)
+
+ GlobalMemoryStatus(&memory_status);
+ available = memory_status.dwAvailPhys - 2 * 1024 * 1024;
+
+ // Limit to default_ram if we have more than that available:
+
+ if (available > default_ram * 1024 * 1024)
+ {+ available = default_ram * 1024 * 1024;
+ }
+
+ if (available < min_ram * 1024 * 1024)
+ {+ I_Error("Unable to allocate %i MiB of RAM for zone", min_ram);+ }
+
+ // Allocate zone:
+
+ *size = available;
+ zonemem = malloc(*size);
+
+ if (zonemem == NULL)
+ {+ I_Error("Failed when allocating %i bytes", *size);+ }
+
+ return zonemem;
+}
+
+#else
+
+// Zone memory auto-allocation function that allocates the zone size
+// by trying progressively smaller zone sizes until one is found that
+// works.
+
+static byte *AutoAllocMemory(int *size, int default_ram, int min_ram)
+{+ byte *zonemem;
+
+ // Allocate the zone memory. This loop tries progressively smaller
+ // zone sizes until a size is found that can be allocated.
+ // If we used the -mb command line parameter, only the parameter
+ // provided is accepted.
+
+ zonemem = NULL;
+
+ while (zonemem == NULL)
+ {+ // We need a reasonable minimum amount of RAM to start.
+
+ if (default_ram < min_ram)
+ {+ I_Error("Unable to allocate %i MiB of RAM for zone", default_ram);+ }
+
+ // Try to allocate the zone memory.
+
+ *size = default_ram * 1024 * 1024;
+
+ zonemem = malloc(*size);
+
+ // Failed to allocate? Reduce zone size until we reach a size
+ // that is acceptable.
+
+ if (zonemem == NULL)
+ {+ default_ram -= 1;
+ }
+ }
+
+ return zonemem;
+}
+
+#endif
+
+byte *I_ZoneBase (int *size)
+{+ byte *zonemem;
+ int min_ram, default_ram;
int p;
//!
@@ -79,23 +172,20 @@
//
p = M_CheckParm("-mb");-
+
if (p > 0)
{- mb_used = atoi(myargv[p+1]);
+ default_ram = atoi(myargv[p+1]);
+ min_ram = default_ram;
}
-
- return mb_used*1024*1024;
-}
+ else
+ {+ default_ram = DEFAULT_RAM;
+ min_ram = MIN_RAM;
+ }
-byte *I_ZoneBase (int *size)
-{- byte *zonemem;
+ zonemem = AutoAllocMemory(size, default_ram, min_ram);
- *size = I_GetHeapSize();
-
- zonemem = malloc(*size);
-
printf("zone memory: %p, %x allocated for zone\n", zonemem, *size);
@@ -102,7 +192,7 @@
return zonemem;
}
-//
+//
// I_ConsoleStdout
//
// Returns true if stdout is a real console, false if it is a file
@@ -128,6 +218,9 @@
I_InitJoystick();
}
+#define ENDOOM_W 80
+#define ENDOOM_H 25
+
//
// Displays the text mode ending screen after the game quits
//
@@ -136,6 +229,8 @@
{unsigned char *endoom_data;
unsigned char *screendata;
+ int y;
+ int indent;
endoom_data = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC);@@ -151,8 +246,16 @@
// Write the data to the screen memory
screendata = TXT_GetScreenData();
- memcpy(screendata, endoom_data, 4000);
+ indent = (ENDOOM_W - TXT_SCREEN_W) / 2;
+
+ for (y=0; y<TXT_SCREEN_H; ++y)
+ {+ memcpy(screendata + (y * TXT_SCREEN_W * 2),
+ endoom_data + (y * ENDOOM_W + indent) * 2,
+ TXT_SCREEN_W * 2);
+ }
+
// Wait for a keypress
while (true)
@@ -246,6 +349,7 @@
// On Windows, pop up a dialog box with the error message.
{char msgbuf[512];
+ wchar_t wmsgbuf[512];
va_start(argptr, error);
memset(msgbuf, 0, sizeof(msgbuf));
@@ -252,7 +356,11 @@
vsnprintf(msgbuf, sizeof(msgbuf) - 1, error, argptr);
va_end(argptr);
- MessageBox(NULL, msgbuf, "Error", MB_OK);
+ MultiByteToWideChar(CP_ACP, 0,
+ msgbuf, strlen(msgbuf) + 1,
+ wmsgbuf, sizeof(wmsgbuf));
+
+ MessageBoxW(NULL, wmsgbuf, L"Error", MB_OK);
}
#endif
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -182,7 +182,7 @@
if (screensaver_mode)
return false;
- // if the window doesnt have focus, never grab it
+ // if the window doesn't have focus, never grab it
if (!window_focused)
return false;
@@ -193,6 +193,17 @@
if (fullscreen)
return true;
+#ifdef _WIN32_WCE
+
+ // On Windows CE, always grab input. This is because hardware
+ // button events are only acquired by SDL when the input is grabbed.
+ // Almost all Windows CE devices should have touch screens anyway,
+ // so this shouldn't affect mouse grabbing behavior.
+
+ return true;
+
+#else
+
// Don't grab the mouse if mouse input is disabled
if (!usemouse || nomouse)
@@ -204,12 +215,12 @@
return false;
// if we specify not to grab the mouse, never grab
-
+
if (!grabmouse)
return false;
// when menu is active or game is paused, release the mouse
-
+
if (menuactive || paused)
return false;
@@ -216,6 +227,8 @@
// only grab mouse when playing levels (but not demos)
return (gamestate == GS_LEVEL) && !demoplayback;
+
+#endif /* #ifndef _WIN32_WCE */
}
// Update the value of window_focused when we get a focus event
@@ -362,6 +375,15 @@
case SDLK_PAGEUP: return KEY_PGUP;
case SDLK_PAGEDOWN: return KEY_PGDN;
+#ifdef SDL_HAVE_APP_KEYS
+ case SDLK_APP1: return KEY_F1;
+ case SDLK_APP2: return KEY_F2;
+ case SDLK_APP3: return KEY_F3;
+ case SDLK_APP4: return KEY_F4;
+ case SDLK_APP5: return KEY_F5;
+ case SDLK_APP6: return KEY_F6;
+#endif
+
default:
return tolower(sym->sym);
}
@@ -480,13 +502,20 @@
event.data2 = sdlevent.key.keysym.unicode;
}
- D_PostEvent(&event);
+ if (event.data1 != 0)
+ {+ D_PostEvent(&event);
+ }
break;
case SDL_KEYUP:
event.type = ev_keyup;
event.data1 = TranslateKey(&sdlevent.key.keysym);
- D_PostEvent(&event);
+
+ if (event.data1 != 0)
+ {+ D_PostEvent(&event);
+ }
break;
/*
@@ -964,111 +993,110 @@
return best_mode;
}
-// If the video mode set in the configuration file is not available,
-// try to choose a different mode.
+// Adjust to an appropriate fullscreen mode.
+// Returns true if successful.
-static void I_AutoAdjustSettings(void)
+static boolean AutoAdjustFullscreen(void)
{- if (fullscreen)
- {- SDL_Rect **modes;
- SDL_Rect *best_mode;
- screen_mode_t *screen_mode;
- int target_pixels, diff, best_diff;
- int i;
+ SDL_Rect **modes;
+ SDL_Rect *best_mode;
+ screen_mode_t *screen_mode;
+ int target_pixels, diff, best_diff;
+ int i;
- modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
+ modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
- // Find the best mode that matches the mode specified in the
- // configuration file
+ // No fullscreen modes available at all?
- best_mode = NULL;
- best_diff = INT_MAX;
- target_pixels = screen_width * screen_height;
+ if (modes == NULL || modes == (SDL_Rect **) -1 || *modes == NULL)
+ {+ return false;
+ }
- for (i=0; modes[i] != NULL; ++i)
- {- //printf("%ix%i?\n", modes[i]->w, modes[i]->h);+ // Find the best mode that matches the mode specified in the
+ // configuration file
- // What screen_mode_t would be used for this video mode?
+ best_mode = NULL;
+ best_diff = INT_MAX;
+ target_pixels = screen_width * screen_height;
- screen_mode = I_FindScreenMode(modes[i]->w, modes[i]->h);
+ for (i=0; modes[i] != NULL; ++i)
+ {+ //printf("%ix%i?\n", modes[i]->w, modes[i]->h);- // Never choose a screen mode that we cannot run in, or
- // is poor quality for fullscreen
+ // What screen_mode_t would be used for this video mode?
- if (screen_mode == NULL || screen_mode->poor_quality)
- {- // printf("\tUnsupported / poor quality\n");- continue;
- }
+ screen_mode = I_FindScreenMode(modes[i]->w, modes[i]->h);
- // Do we have the exact mode?
- // If so, no autoadjust needed
+ // Never choose a screen mode that we cannot run in, or
+ // is poor quality for fullscreen
- if (screen_width == modes[i]->w && screen_height == modes[i]->h)
- {- // printf("\tExact mode!\n");- return;
- }
-
- // Is this mode better than the current mode?
-
- diff = (screen_width - modes[i]->w)
- * (screen_width - modes[i]->w)
- + (screen_height - modes[i]->h)
- * (screen_height - modes[i]->h);
-
- if (diff < best_diff)
- {- // printf("\tA valid mode\n");- best_mode = modes[i];
- best_diff = diff;
- }
+ if (screen_mode == NULL || screen_mode->poor_quality)
+ {+ // printf("\tUnsupported / poor quality\n");+ continue;
}
- if (best_mode == NULL)
- {- // Unable to find a valid mode!
+ // Do we have the exact mode?
+ // If so, no autoadjust needed
- I_Error("Unable to find any valid video mode at all!");+ if (screen_width == modes[i]->w && screen_height == modes[i]->h)
+ {+ // printf("\tExact mode!\n");+ return true;
}
- printf("I_InitGraphics: %ix%i mode not supported on this machine.\n",- screen_width, screen_height);
+ // Is this mode better than the current mode?
- screen_width = best_mode->w;
- screen_height = best_mode->h;
+ diff = (screen_width - modes[i]->w) * (screen_width - modes[i]->w)
+ + (screen_height - modes[i]->h) * (screen_height - modes[i]->h);
+ if (diff < best_diff)
+ {+ // printf("\tA valid mode\n");+ best_mode = modes[i];
+ best_diff = diff;
+ }
}
- else
+
+ if (best_mode == NULL)
{- screen_mode_t *best_mode;
+ // Unable to find a valid mode!
- //
- // Windowed mode.
- //
- // Find a screen_mode_t to fit within the current settings
- //
+ return false;
+ }
- best_mode = I_FindScreenMode(screen_width, screen_height);
+ printf("I_InitGraphics: %ix%i mode not supported on this machine.\n",+ screen_width, screen_height);
- if (best_mode == NULL)
- {- // Nothing fits within the current settings.
- // Pick the closest to 320x200 possible.
+ screen_width = best_mode->w;
+ screen_height = best_mode->h;
- best_mode = I_FindScreenMode(SCREENWIDTH, SCREENHEIGHT_4_3);
- }
+ return true;
+}
- // Do we have the exact mode already?
+// Auto-adjust to a valid windowed mode.
- if (best_mode->width == screen_width
- && best_mode->height == screen_height)
- {- return;
- }
+static void AutoAdjustWindowed(void)
+{+ screen_mode_t *best_mode;
+ // Find a screen_mode_t to fit within the current settings
+
+ best_mode = I_FindScreenMode(screen_width, screen_height);
+
+ if (best_mode == NULL)
+ {+ // Nothing fits within the current settings.
+ // Pick the closest to 320x200 possible.
+
+ best_mode = I_FindScreenMode(SCREENWIDTH, SCREENHEIGHT_4_3);
+ }
+
+ // Switch to the best mode if necessary.
+
+ if (best_mode->width != screen_width || best_mode->height != screen_height)
+ { printf("I_InitGraphics: Cannot run at specified mode: %ix%i\n",screen_width, screen_height);
@@ -1075,14 +1103,45 @@
screen_width = best_mode->width;
screen_height = best_mode->height;
}
+}
- printf("I_InitGraphics: Auto-adjusted to %ix%i.\n",- screen_width, screen_height);
+// If the video mode set in the configuration file is not available,
+// try to choose a different mode.
- printf("NOTE: Your video settings have been adjusted. "- "To disable this behavior,\n"
- "set autoadjust_video_settings to 0 in your "
- "configuration file.\n");
+static void I_AutoAdjustSettings(void)
+{+ int old_screen_w, old_screen_h;
+
+ old_screen_w = screen_width;
+ old_screen_h = screen_height;
+
+ // If we are running fullscreen, try to autoadjust to a valid fullscreen
+ // mode. If this is impossible, switch to windowed.
+
+ if (fullscreen && !AutoAdjustFullscreen())
+ {+ fullscreen = 0;
+ }
+
+ // If we are running windowed, pick a valid window size.
+
+ if (!fullscreen)
+ {+ AutoAdjustWindowed();
+ }
+
+ // Have the settings changed? Show a message.
+
+ if (screen_width != old_screen_w || screen_height != old_screen_h)
+ {+ printf("I_InitGraphics: Auto-adjusted to %ix%i.\n",+ screen_width, screen_height);
+
+ printf("NOTE: Your video settings have been adjusted. "+ "To disable this behavior,\n"
+ "set autoadjust_video_settings to 0 in your "
+ "configuration file.\n");
+ }
}
// Set video size to a particular scale factor (1x, 2x, 3x, etc.)
@@ -1353,7 +1412,7 @@
free(env_string);
}
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
// Allow -gdi as a shortcut for using the windib driver.
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -31,6 +31,11 @@
#include <ctype.h>
#include <errno.h>
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
#include "config.h"
#include "deh_main.h"
#include "doomdef.h"
@@ -87,6 +92,61 @@
extern int key_strafe;
extern int key_speed;
+extern int key_pause;
+
+// Menu control keys:
+
+extern int key_menu_activate;
+extern int key_menu_up;
+extern int key_menu_down;
+extern int key_menu_left;
+extern int key_menu_right;
+extern int key_menu_back;
+extern int key_menu_forward;
+extern int key_menu_confirm;
+extern int key_menu_abort;
+
+// Keyboard shortcuts:
+
+extern int key_menu_help;
+extern int key_menu_save;
+extern int key_menu_load;
+extern int key_menu_volume;
+extern int key_menu_detail;
+extern int key_menu_qsave;
+extern int key_menu_endgame;
+extern int key_menu_messages;
+extern int key_menu_qload;
+extern int key_menu_quit;
+extern int key_menu_gamma;
+
+extern int key_menu_incscreen;
+extern int key_menu_decscreen;
+
+extern int key_map_north;
+extern int key_map_south;
+extern int key_map_east;
+extern int key_map_west;
+extern int key_map_zoomin;
+extern int key_map_zoomout;
+extern int key_map_toggle;
+extern int key_map_maxzoom;
+extern int key_map_follow;
+extern int key_map_grid;
+extern int key_map_mark;
+extern int key_map_clearmark;
+
+extern int key_weapon1;
+extern int key_weapon2;
+extern int key_weapon3;
+extern int key_weapon4;
+extern int key_weapon5;
+extern int key_weapon6;
+extern int key_weapon7;
+extern int key_weapon8;
+
+extern int key_message_refresh;
+
extern int mousebfire;
extern int mousebstrafe;
extern int mousebforward;
@@ -696,6 +756,8 @@
CONFIG_VARIABLE_INT(dclick_use, dclick_use),
+#ifdef FEATURE_SOUND
+
//!
// Controls whether libsamplerate support is used for performing
// sample rate conversions of sound effects. Support for this
@@ -710,6 +772,272 @@
//
CONFIG_VARIABLE_INT(use_libsamplerate, use_libsamplerate),
+
+#endif
+
+ //!
+ // Key to pause or unpause the game.
+ //
+
+ CONFIG_VARIABLE_KEY(key_pause, key_pause),
+
+ //!
+ // Key that activates the menu when pressed.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_activate, key_menu_activate),
+
+ //!
+ // Key that moves the cursor up on the menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_up, key_menu_up),
+
+ //!
+ // Key that moves the cursor down on the menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_down, key_menu_down),
+
+ //!
+ // Key that moves the currently selected slider on the menu left.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_left, key_menu_left),
+
+ //!
+ // Key that moves the currently selected slider on the menu right.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_right, key_menu_right),
+
+ //!
+ // Key to go back to the previous menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_back, key_menu_back),
+
+ //!
+ // Key to activate the currently selected menu item.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_forward, key_menu_forward),
+
+ //!
+ // Key to answer 'yes' to a question in the menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_confirm, key_menu_confirm),
+
+ //!
+ // Key to answer 'no' to a question in the menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_abort, key_menu_abort),
+
+ //!
+ // Keyboard shortcut to bring up the help screen.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_help, key_menu_help),
+
+ //!
+ // Keyboard shortcut to bring up the save game menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_save, key_menu_save),
+
+ //!
+ // Keyboard shortcut to bring up the load game menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_load, key_menu_load),
+
+ //!
+ // Keyboard shortcut to bring up the sound volume menu.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_volume, key_menu_volume),
+
+ //!
+ // Keyboard shortcut to toggle the detail level.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_detail, key_menu_detail),
+
+ //!
+ // Keyboard shortcut to quicksave the current game.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_qsave, key_menu_qsave),
+
+ //!
+ // Keyboard shortcut to end the game.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_endgame, key_menu_endgame),
+
+ //!
+ // Keyboard shortcut to toggle heads-up messages.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_messages, key_menu_messages),
+
+ //!
+ // Keyboard shortcut to load the last quicksave.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_qload, key_menu_qload),
+
+ //!
+ // Keyboard shortcut to quit the game.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_quit, key_menu_quit),
+
+ //!
+ // Keyboard shortcut to toggle the gamma correction level.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_gamma, key_menu_gamma),
+
+ //!
+ // Keyboard shortcut to increase the screen size.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_incscreen, key_menu_incscreen),
+
+ //!
+ // Keyboard shortcut to decrease the screen size.
+ //
+
+ CONFIG_VARIABLE_KEY(key_menu_decscreen, key_menu_decscreen),
+
+ //!
+ // Key to toggle the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_toggle, key_map_toggle),
+
+ //!
+ // Key to pan north when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_north, key_map_north),
+
+ //!
+ // Key to pan south when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_south, key_map_south),
+
+ //!
+ // Key to pan east when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_east, key_map_east),
+
+ //!
+ // Key to pan west when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_west, key_map_west),
+
+ //!
+ // Key to zoom in when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_zoomin, key_map_zoomin),
+
+ //!
+ // Key to zoom out when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_zoomout, key_map_zoomout),
+
+ //!
+ // Key to zoom out the maximum amount when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_maxzoom, key_map_maxzoom),
+
+ //!
+ // Key to toggle follow mode when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_follow, key_map_follow),
+
+ //!
+ // Key to toggle the grid display when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_grid, key_map_grid),
+
+ //!
+ // Key to set a mark when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_mark, key_map_mark),
+
+ //!
+ // Key to clear all marks when in the map view.
+ //
+
+ CONFIG_VARIABLE_KEY(key_map_clearmark, key_map_clearmark),
+
+ //!
+ // Key to select weapon 1.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon1, key_weapon1),
+
+ //!
+ // Key to select weapon 2.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon2, key_weapon2),
+
+ //!
+ // Key to select weapon 3.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon3, key_weapon3),
+
+ //!
+ // Key to select weapon 4.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon4, key_weapon4),
+
+ //!
+ // Key to select weapon 5.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon5, key_weapon5),
+
+ //!
+ // Key to select weapon 6.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon6, key_weapon6),
+
+ //!
+ // Key to select weapon 7.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon7, key_weapon7),
+
+ //!
+ // Key to select weapon 8.
+ //
+
+ CONFIG_VARIABLE_KEY(key_weapon8, key_weapon8),
+
+ //!
+ // Key to re-display last message.
+ //
+
+ CONFIG_VARIABLE_KEY(key_message_refresh, key_message_refresh),
};
static default_collection_t extra_defaults =
@@ -1006,10 +1334,12 @@
void M_SetConfigDir(void)
{-#ifndef _WIN32
- // Ignore the HOME environment variable on Windows - just behave
- // like Vanilla Doom.
+#if !defined(_WIN32) || defined(_WIN32_WCE)
+ // Configuration settings are stored in ~/.chocolate-doom/,
+ // except on Windows, where we behave like Vanilla Doom and
+ // save in the current directory.
+
char *homedir;
homedir = getenv("HOME");@@ -1031,7 +1361,7 @@
else
#endif /* #ifndef _WIN32 */
{-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
//!
// @platform windows
// @vanilla
@@ -1053,5 +1383,78 @@
configdir = strdup("");}
}
+}
+
+#ifdef _WIN32_WCE
+
+static int SystemHasKeyboard(void)
+{+ HKEY key;
+ DWORD valtype;
+ DWORD valsize;
+ DWORD result;
+
+ if (RegOpenKeyExW(HKEY_CURRENT_USER,
+ L"\\Software\\Microsoft\\Shell", 0,
+ KEY_READ, &key) != ERROR_SUCCESS)
+ {+ return 0;
+ }
+
+ valtype = REG_SZ;
+ valsize = sizeof(DWORD);
+
+ if (RegQueryValueExW(key, L"HasKeyboard", NULL, &valtype,
+ (LPBYTE) &result, &valsize) != ERROR_SUCCESS)
+ {+ result = 0;
+ }
+
+ // Close the key
+
+ RegCloseKey(key);
+
+ return result;
+}
+
+//
+// Apply custom defaults for Windows CE.
+//
+
+static void M_ApplyWindowsCEDefaults(void)
+{+ // If the system doesn't have a keyboard, patch the default
+ // configuration to use the hardware keys.
+
+ if (!SystemHasKeyboard())
+ {+ key_use = KEY_F1;
+ key_fire = KEY_F2;
+ key_menu_activate = KEY_F3;
+ key_map_toggle = KEY_F4;
+
+ key_menu_help = 0;
+ key_menu_save = 0;
+ key_menu_load = 0;
+ key_menu_volume = 0;
+
+ key_menu_confirm = KEY_ENTER;
+ key_menu_back = KEY_F2;
+ key_menu_abort = KEY_F2;
+ }
+}
+
+#endif
+
+//
+// Apply custom patches to the default values depending on the
+// platform we are running on.
+//
+
+void M_ApplyPlatformDefaults(void)
+{+#ifdef _WIN32_WCE
+ M_ApplyWindowsCEDefaults();
+#endif
}
--- a/src/m_config.h
+++ b/src/m_config.h
@@ -31,6 +31,7 @@
void M_LoadDefaults(void);
void M_SaveDefaults(void);
void M_SetConfigDir(void);
+void M_ApplyPlatformDefaults(void);
extern char *configdir;
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -72,6 +72,35 @@
extern boolean chat_on; // in heads-up code
//
+// menu keys:
+//
+
+int key_menu_activate = KEY_ESCAPE;
+int key_menu_up = KEY_UPARROW;
+int key_menu_down = KEY_DOWNARROW;
+int key_menu_left = KEY_LEFTARROW;
+int key_menu_right = KEY_RIGHTARROW;
+int key_menu_back = KEY_BACKSPACE;
+int key_menu_forward = KEY_ENTER;
+int key_menu_confirm = 'y';
+int key_menu_abort = 'n';
+
+int key_menu_help = KEY_F1;
+int key_menu_save = KEY_F2;
+int key_menu_load = KEY_F3;
+int key_menu_volume = KEY_F4;
+int key_menu_detail = KEY_F5;
+int key_menu_qsave = KEY_F6;
+int key_menu_endgame = KEY_F7;
+int key_menu_messages = KEY_F8;
+int key_menu_qload = KEY_F9;
+int key_menu_quit = KEY_F10;
+int key_menu_gamma = KEY_F11;
+
+int key_menu_incscreen = KEY_EQUALS;
+int key_menu_decscreen = KEY_MINUS;
+
+//
// defaulted values
//
int mouseSensitivity = 5;
@@ -672,9 +701,9 @@
//
char tempstring[80];
-void M_QuickSaveResponse(int ch)
+void M_QuickSaveResponse(int key)
{- if (ch == 'y')
+ if (key == key_menu_confirm)
{M_DoSave(quickSaveSlot);
S_StartSound(NULL,sfx_swtchx);
@@ -709,9 +738,9 @@
//
// M_QuickLoad
//
-void M_QuickLoadResponse(int ch)
+void M_QuickLoadResponse(int key)
{- if (ch == 'y')
+ if (key == key_menu_confirm)
{M_LoadSelect(quickSaveSlot);
S_StartSound(NULL,sfx_swtchx);
@@ -924,9 +953,9 @@
V_DrawPatchDirect (54,38,0,W_CacheLumpName(DEH_String("M_EPISOD"),PU_CACHE));}
-void M_VerifyNightmare(int ch)
+void M_VerifyNightmare(int key)
{- if (ch != 'y')
+ if (key != key_menu_confirm)
return;
G_DeferedInitNew(nightmare,epi+1,1);
@@ -1024,9 +1053,9 @@
//
// M_EndGame
//
-void M_EndGameResponse(int ch)
+void M_EndGameResponse(int key)
{- if (ch != 'y')
+ if (key != key_menu_confirm)
return;
currentMenu->lastOn = itemOn;
@@ -1120,9 +1149,9 @@
-void M_QuitResponse(int ch)
+void M_QuitResponse(int key)
{- if (ch != 'y')
+ if (key != key_menu_confirm)
return;
if (!netgame)
{@@ -1421,34 +1450,34 @@
{if (ev->data3 == -1)
{- key = KEY_UPARROW;
+ key = key_menu_up;
joywait = I_GetTime() + 5;
}
else if (ev->data3 == 1)
{- key = KEY_DOWNARROW;
+ key = key_menu_down;
joywait = I_GetTime() + 5;
}
if (ev->data2 == -1)
{- key = KEY_LEFTARROW;
+ key = key_menu_left;
joywait = I_GetTime() + 2;
}
else if (ev->data2 == 1)
{- key = KEY_RIGHTARROW;
+ key = key_menu_right;
joywait = I_GetTime() + 2;
}
if (ev->data1&1)
{- key = KEY_ENTER;
+ key = key_menu_forward;
joywait = I_GetTime() + 5;
}
if (ev->data1&2)
{- key = KEY_BACKSPACE;
+ key = key_menu_back;
joywait = I_GetTime() + 5;
}
}
@@ -1459,13 +1488,13 @@
mousey += ev->data3;
if (mousey < lasty-30)
{- key = KEY_DOWNARROW;
+ key = key_menu_down;
mousewait = I_GetTime() + 5;
mousey = lasty -= 30;
}
else if (mousey > lasty+30)
{- key = KEY_UPARROW;
+ key = key_menu_up;
mousewait = I_GetTime() + 5;
mousey = lasty += 30;
}
@@ -1473,13 +1502,13 @@
mousex += ev->data2;
if (mousex < lastx-30)
{- key = KEY_LEFTARROW;
+ key = key_menu_left;
mousewait = I_GetTime() + 5;
mousex = lastx -= 30;
}
else if (mousex > lastx+30)
{- key = KEY_RIGHTARROW;
+ key = key_menu_right;
mousewait = I_GetTime() + 5;
mousex = lastx += 30;
}
@@ -1486,13 +1515,13 @@
if (ev->data1&1)
{- key = KEY_ENTER;
+ key = key_menu_forward;
mousewait = I_GetTime() + 15;
}
if (ev->data1&2)
{- key = KEY_BACKSPACE;
+ key = key_menu_back;
mousewait = I_GetTime() + 15;
}
}
@@ -1514,7 +1543,7 @@
if (testcontrols)
{- if (key == KEY_ESCAPE || key == KEY_F10)
+ if (key == key_menu_activate || key == key_menu_quit)
{I_Quit();
return true;
@@ -1574,46 +1603,52 @@
// Take care of any messages that need input
if (messageToPrint)
{- if (messageNeedsInput == true &&
- !(ch == ' ' || ch == 'n' || ch == 'y' || key == KEY_ESCAPE))
- return false;
-
+ if (messageNeedsInput)
+ {+ if (key != ' ' && key != KEY_ESCAPE
+ && key != key_menu_confirm && key != key_menu_abort)
+ {+ return false;
+ }
+ }
+
menuactive = messageLastMenuActive;
messageToPrint = 0;
if (messageRoutine)
- messageRoutine(ch);
-
+ messageRoutine(key);
+
menuactive = false;
S_StartSound(NULL,sfx_swtchx);
return true;
}
-
- if (devparm && key == KEY_F1)
+
+ if (devparm && key == key_menu_help)
{G_ScreenShot ();
return true;
}
-
-
+
// F-Keys
if (!menuactive)
- switch(key)
- {- case KEY_MINUS: // Screen size down
+ {+ if (key == key_menu_decscreen) // Screen size down
+ {if (automapactive || chat_on)
return false;
M_SizeDisplay(0);
S_StartSound(NULL,sfx_stnmov);
return true;
-
- case KEY_EQUALS: // Screen size up
+ }
+ else if (key == key_menu_incscreen) // Screen size up
+ {if (automapactive || chat_on)
return false;
M_SizeDisplay(1);
S_StartSound(NULL,sfx_stnmov);
return true;
-
- case KEY_F1: // Help key
+ }
+ else if (key == key_menu_help) // Help key
+ {M_StartControlPanel ();
if ( gamemode == retail )
@@ -1620,61 +1655,71 @@
currentMenu = &ReadDef2;
else
currentMenu = &ReadDef1;
-
+
itemOn = 0;
S_StartSound(NULL,sfx_swtchn);
return true;
-
- case KEY_F2: // Save
+ }
+ else if (key == key_menu_save) // Save
+ {M_StartControlPanel();
S_StartSound(NULL,sfx_swtchn);
M_SaveGame(0);
return true;
-
- case KEY_F3: // Load
+ }
+ else if (key == key_menu_load) // Load
+ {M_StartControlPanel();
S_StartSound(NULL,sfx_swtchn);
M_LoadGame(0);
return true;
-
- case KEY_F4: // Sound Volume
+ }
+ else if (key == key_menu_volume) // Sound Volume
+ {M_StartControlPanel ();
currentMenu = &SoundDef;
itemOn = sfx_vol;
S_StartSound(NULL,sfx_swtchn);
return true;
-
- case KEY_F5: // Detail toggle
+ }
+ else if (key == key_menu_detail) // Detail toggle
+ {M_ChangeDetail(0);
S_StartSound(NULL,sfx_swtchn);
return true;
-
- case KEY_F6: // Quicksave
+ }
+ else if (key == key_menu_qsave) // Quicksave
+ {S_StartSound(NULL,sfx_swtchn);
M_QuickSave();
return true;
-
- case KEY_F7: // End game
+ }
+ else if (key == key_menu_endgame) // End game
+ {S_StartSound(NULL,sfx_swtchn);
M_EndGame(0);
return true;
-
- case KEY_F8: // Toggle messages
+ }
+ else if (key == key_menu_messages) // Toggle messages
+ {M_ChangeMessages(0);
S_StartSound(NULL,sfx_swtchn);
return true;
-
- case KEY_F9: // Quickload
+ }
+ else if (key == key_menu_qload) // Quickload
+ {S_StartSound(NULL,sfx_swtchn);
M_QuickLoad();
return true;
-
- case KEY_F10: // Quit DOOM
+ }
+ else if (key == key_menu_quit) // Quit DOOM
+ {S_StartSound(NULL,sfx_swtchn);
M_QuitDOOM(0);
return true;
-
- case KEY_F11: // gamma toggle
+ }
+ else if (key == key_menu_gamma) // gamma toggle
+ {usegamma++;
if (usegamma > 4)
usegamma = 0;
@@ -1681,14 +1726,13 @@
players[consoleplayer].message = DEH_String(gammamsg[usegamma]);
I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));return true;
-
}
+ }
-
// Pop-up menu?
if (!menuactive)
{- if (key == KEY_ESCAPE)
+ if (key == key_menu_activate)
{M_StartControlPanel ();
S_StartSound(NULL,sfx_swtchn);
@@ -1699,10 +1743,12 @@
// Keys usable within menu
- switch (key)
+
+ if (key == key_menu_down)
{- case KEY_DOWNARROW:
- do
+ // Move down to next item
+
+ do
{if (itemOn+1 > currentMenu->numitems-1)
itemOn = 0;
@@ -1709,9 +1755,13 @@
else itemOn++;
S_StartSound(NULL,sfx_pstop);
} while(currentMenu->menuitems[itemOn].status==-1);
+
return true;
-
- case KEY_UPARROW:
+ }
+ else if (key == key_menu_up)
+ {+ // Move back up to previous item
+
do
{if (!itemOn)
@@ -1719,9 +1769,13 @@
else itemOn--;
S_StartSound(NULL,sfx_pstop);
} while(currentMenu->menuitems[itemOn].status==-1);
+
return true;
+ }
+ else if (key == key_menu_left)
+ {+ // Slide slider left
- case KEY_LEFTARROW:
if (currentMenu->menuitems[itemOn].routine &&
currentMenu->menuitems[itemOn].status == 2)
{@@ -1729,8 +1783,11 @@
currentMenu->menuitems[itemOn].routine(0);
}
return true;
-
- case KEY_RIGHTARROW:
+ }
+ else if (key == key_menu_right)
+ {+ // Slide slider right
+
if (currentMenu->menuitems[itemOn].routine &&
currentMenu->menuitems[itemOn].status == 2)
{@@ -1738,8 +1795,11 @@
currentMenu->menuitems[itemOn].routine(1);
}
return true;
+ }
+ else if (key == key_menu_forward)
+ {+ // Activate menu item
- case KEY_ENTER:
if (currentMenu->menuitems[itemOn].routine &&
currentMenu->menuitems[itemOn].status)
{@@ -1756,14 +1816,20 @@
}
}
return true;
-
- case KEY_ESCAPE:
+ }
+ else if (key == key_menu_activate)
+ {+ // Deactivate menu
+
currentMenu->lastOn = itemOn;
M_ClearMenus ();
S_StartSound(NULL,sfx_swtchx);
return true;
-
- case KEY_BACKSPACE:
+ }
+ else if (key == key_menu_back)
+ {+ // Go back to previous menu
+
currentMenu->lastOn = itemOn;
if (currentMenu->prevMenu)
{@@ -1772,9 +1838,13 @@
S_StartSound(NULL,sfx_swtchn);
}
return true;
-
- default:
+ }
+ else if (ch != 0)
+ {+ // Keyboard shortcut?
+
for (i = itemOn+1;i < currentMenu->numitems;i++)
+ {if (currentMenu->menuitems[i].alphaKey == ch)
{itemOn = i;
@@ -1781,7 +1851,10 @@
S_StartSound(NULL,sfx_pstop);
return true;
}
+ }
+
for (i = 0;i <= itemOn;i++)
+ {if (currentMenu->menuitems[i].alphaKey == ch)
{itemOn = i;
@@ -1788,8 +1861,7 @@
S_StartSound(NULL,sfx_pstop);
return true;
}
- break;
-
+ }
}
return false;
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -1612,7 +1612,58 @@
P_RadiusAttack(thingy, thingy->target, 128);
}
+// Check whether the death of the specified monster type is allowed
+// to trigger the end of episode special action.
+//
+// This behavior changed in v1.9, the most notable effect of which
+// was to break uac_dead.wad
+static boolean CheckBossEnd(mobjtype_t motype)
+{+ if (gameversion < exe_ultimate)
+ {+ if (gamemap != 8)
+ {+ return false;
+ }
+
+ // Baron death on later episodes is nothing special.
+
+ if (motype == MT_BRUISER && gameepisode != 1)
+ {+ return false;
+ }
+
+ return true;
+ }
+ else
+ {+ // New logic that appeared in Ultimate Doom.
+ // Looks like the logic was overhauled while adding in the
+ // episode 4 support. Now bosses only trigger on their
+ // specific episode.
+
+ switch(gameepisode)
+ {+ case 1:
+ return gamemap == 8 && motype == MT_BRUISER;
+
+ case 2:
+ return gamemap == 8 && motype == MT_CYBORG;
+
+ case 3:
+ return gamemap == 8 && motype == MT_SPIDER;
+
+ case 4:
+ return (gamemap == 6 && motype == MT_CYBORG)
+ || (gamemap == 8 && motype == MT_SPIDER);
+
+ default:
+ return gamemap == 8;
+ }
+ }
+}
+
//
// A_BossDeath
// Possibly trigger special effects
@@ -1636,75 +1687,12 @@
}
else
{- switch(gameepisode)
- {- case 1:
- if (gamemap != 8)
- return;
-
- // fraggle: disable this as it breaks uac_dead.wad.
- // There is at least one version of Doom 1.9 which it is
- // possible to play uac_dead through on. I think this was
- // added here for Ultimate Doom.
- //
- // See lmps/doom/ultimate/uac_dead.zip in idgames for
- // an example of a demo which goes out of sync if this
- // is left in here.
- //
- // For the time being, I'm making the assumption that
- // doing this is not going to break anything else.
- //
- // 2005/10/24: Modify this to test the gameversion setting
-
- if (gameversion >= exe_ultimate && mo->type != MT_BRUISER)
- return;
- break;
-
- case 2:
- if (gamemap != 8)
- return;
-
- if (mo->type != MT_CYBORG)
- return;
- break;
-
- case 3:
- if (gamemap != 8)
- return;
-
- if (mo->type != MT_SPIDER)
- return;
-
- break;
-
- case 4:
- switch(gamemap)
- {- case 6:
- if (mo->type != MT_CYBORG)
- return;
- break;
-
- case 8:
- if (mo->type != MT_SPIDER)
- return;
- break;
-
- default:
- return;
- break;
- }
- break;
-
- default:
- if (gamemap != 8)
- return;
- break;
- }
-
+ if (!CheckBossEnd(mo->type))
+ {+ return;
+ }
}
-
// make sure there is a player alive for victory
for (i=0 ; i<MAXPLAYERS ; i++)
if (playeringame[i] && players[i].health > 0)
--- a/src/w_file_win32.c
+++ b/src/w_file_win32.c
@@ -35,6 +35,12 @@
#include "w_file.h"
#include "z_zone.h"
+// This constant doesn't exist in VC6:
+
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER 0xffffffff
+#endif
+
typedef struct
{wad_file_t wad;
@@ -88,12 +94,24 @@
static wad_file_t *W_Win32_OpenFile(char *path)
{win32_wad_file_t *result;
+ wchar_t wpath[MAX_PATH + 1];
HANDLE handle;
- OFSTRUCT fileinfo;
- handle = (HANDLE) OpenFile(path, &fileinfo, OF_READ);
+ // Open the file:
- if (handle == (HANDLE) HFILE_ERROR)
+ MultiByteToWideChar(CP_OEMCP, 0,
+ path, strlen(path) + 1,
+ wpath, sizeof(wpath));
+
+ handle = CreateFileW(wpath,
+ GENERIC_READ,
+ FILE_SHARE_READ,
+ NULL,
+ OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL);
+
+ if (handle == INVALID_HANDLE_VALUE)
{return NULL;
}
--- a/src/z_native.c
+++ b/src/z_native.c
@@ -483,3 +483,8 @@
return -1;
}
+unsigned int Z_ZoneSize(void)
+{+ return 0;
+}
+
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -473,3 +473,8 @@
return free;
}
+unsigned int Z_ZoneSize(void)
+{+ return mainzone->size;
+}
+
--- a/src/z_zone.h
+++ b/src/z_zone.h
@@ -67,7 +67,7 @@
void Z_CheckHeap (void);
void Z_ChangeTag2 (void *ptr, int tag, char *file, int line);
int Z_FreeMemory (void);
-
+unsigned int Z_ZoneSize(void);
//
// This is used to get the local FILE:LINE info from CPP
--- /dev/null
+++ b/textscreen/Doxyfile
@@ -1,0 +1,1366 @@
+# Doxyfile 1.5.5
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = "libtextscreen"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = .
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# and Ukrainian.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH = src/
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member
+# documentation.
+
+DETAILS_AT_TOP = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = .
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS = *.h
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code. Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader. This is useful
+# if you want to understand what is going on. On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED = DOXYGEN
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is enabled by default, which results in a transparent
+# background. Warning: Depending on the platform used, enabling this option
+# may lead to badly anti-aliased labels on the edges of a graph (i.e. they
+# become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE = NO
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -1,6 +1,8 @@
AM_CFLAGS = -I../src
+CTAGS_ARGS=-I TXT_UNCAST_ARG+
+
# build this directory before the examples directory.
SUBDIRS= . examples
@@ -23,10 +25,14 @@
txt_separator.c txt_separator.h \
txt_spinctrl.c txt_spinctrl.h \
txt_sdl.c txt_sdl.h \
+ txt_smallfont.h \
txt_strut.c txt_strut.h \
txt_table.c txt_table.h \
txt_widget.c txt_widget.h \
txt_window.c txt_window.h \
txt_window_action.c txt_window_action.h \
- txt_font.h
+ txt_font.h
+
+doc:
+ doxygen
--- a/textscreen/examples/calculator.c
+++ b/textscreen/examples/calculator.c
@@ -1,3 +1,28 @@
+// Emacs style mode select -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 2006-2009 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+//-----------------------------------------------------------------------------
+//
+// Example program: desktop calculator
+//
+//-----------------------------------------------------------------------------
#include <stdio.h>
#include <stdlib.h>
--- a/textscreen/examples/guitest.c
+++ b/textscreen/examples/guitest.c
@@ -1,3 +1,32 @@
+// Emacs style mode select -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 2006-2009 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+//-----------------------------------------------------------------------------
+//
+// Example program: GUI test program
+//
+// Demonstrates all the main textscreen widgets in use and shows how
+// a simple textscreen program can be written.
+//
+//-----------------------------------------------------------------------------
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
--- a/textscreen/txt_button.h
+++ b/textscreen/txt_button.h
@@ -22,6 +22,19 @@
#ifndef TXT_BUTTON_H
#define TXT_BUTTON_H
+/**
+ * @file txt_button.h
+ *
+ * Button widget.
+ */
+
+/**
+ * Button widget.
+ *
+ * A button is a widget that can be selected to perform some action.
+ * When a button is pressed, it emits the "pressed" signal.
+ */
+
typedef struct txt_button_s txt_button_t;
#include "txt_widget.h"
@@ -32,9 +45,35 @@
char *label;
};
+/**
+ * Create a new button widget.
+ *
+ * @param label The label to use on the new button.
+ * @return Pointer to the new button widget.
+ */
+
txt_button_t *TXT_NewButton(char *label);
-txt_button_t *TXT_NewButton2(char *label, TxtWidgetSignalFunc func,
+
+/**
+ * Create a new button widget, binding the "pressed" signal to a
+ * specified callback function.
+ *
+ * @param label The label to use on the new button.
+ * @param func The callback function to invoke.
+ * @param user_data User-specified pointer to pass to the callback.
+ * @return Pointer to the new button widget.
+ */
+
+txt_button_t *TXT_NewButton2(char *label, TxtWidgetSignalFunc func,
void *user_data);
+
+/**
+ * Change the label used on a button.
+ *
+ * @param button The button.
+ * @param label The new label.
+ */
+
void TXT_SetButtonLabel(txt_button_t *button, char *label);
#endif /* #ifndef TXT_BUTTON_H */
--- a/textscreen/txt_checkbox.h
+++ b/textscreen/txt_checkbox.h
@@ -22,6 +22,25 @@
#ifndef TXT_CHECKBOX_H
#define TXT_CHECKBOX_H
+/**
+ * @file txt_checkbox.h
+ *
+ * Checkbox widget.
+ */
+
+/**
+ * Checkbox widget.
+ *
+ * A checkbox is used to control boolean values that may be either on
+ * or off. The widget has a label that is displayed to the right of
+ * the checkbox indicator. The widget tracks an integer variable;
+ * if the variable is non-zero, the checkbox is checked, while if it
+ * is zero, the checkbox is unchecked. It is also possible to
+ * create "inverted" checkboxes where this logic is reversed.
+ *
+ * When a checkbox is changed, it emits the "changed" signal.
+ */
+
typedef struct txt_checkbox_s txt_checkbox_t;
#include "txt_widget.h"
@@ -34,7 +53,29 @@
int inverted;
};
+/**
+ * Create a new checkbox.
+ *
+ * @param label The label for the new checkbox.
+ * @param variable Pointer to the variable containing this checkbox's
+ * value.
+ * @return Pointer to the new checkbox.
+ */
+
txt_checkbox_t *TXT_NewCheckBox(char *label, int *variable);
+
+/**
+ * Create a new inverted checkbox.
+ *
+ * An inverted checkbox displays the opposite of a normal checkbox;
+ * where it would be checked, it appears unchecked, and vice-versa.
+ *
+ * @param label The label for the new checkbox.
+ * @param variable Pointer to the variable containing this checkbox's
+ * value.
+ * @return Pointer to the new checkbox.
+ */
+
txt_checkbox_t *TXT_NewInvertedCheckBox(char *label, int *variable);
#endif /* #ifndef TXT_CHECKBOX_H */
--- a/textscreen/txt_desktop.c
+++ b/textscreen/txt_desktop.c
@@ -158,10 +158,13 @@
void TXT_DrawASCIITable(void)
{+ unsigned char *screendata;
char buf[10];
int x, y;
int n;
+ screendata = TXT_GetScreenData();
+
TXT_FGColor(TXT_COLOR_BRIGHT_WHITE);
TXT_BGColor(TXT_COLOR_BLACK, 0);
@@ -172,11 +175,15 @@
n = y * 16 + x;
TXT_GotoXY(x * 5, y);
- sprintf(buf, "%02x %c ", n, n);
+ sprintf(buf, "%02x ", n);
TXT_Puts(buf);
+
+ // Write the character directly to the screen memory buffer:
+
+ screendata[(y * TXT_SCREEN_W + x * 5 + 3) * 2] = n;
}
}
-
+
TXT_UpdateScreen();
}
--- a/textscreen/txt_desktop.h
+++ b/textscreen/txt_desktop.h
@@ -22,18 +22,47 @@
#ifndef TXT_DESKTOP_H
#define TXT_DESKTOP_H
+/**
+ * @file txt_desktop.h
+ *
+ * Textscreen desktop.
+ */
+
#include "txt_window.h"
void TXT_AddDesktopWindow(txt_window_t *win);
void TXT_RemoveDesktopWindow(txt_window_t *win);
-void TXT_SetDesktopTitle(char *title);
void TXT_DrawDesktop(void);
-void TXT_GUIMainLoop(void);
void TXT_DispatchEvents(void);
-void TXT_ExitMainLoop(void);
void TXT_DrawWindow(txt_window_t *window, int selected);
void TXT_WindowKeyPress(txt_window_t *window, int c);
-#endif /* #ifndef TXT_DESKTOP_T */
+/**
+ * Set the title displayed at the top of the screen.
+ *
+ * @param title The title to display.
+ */
+
+void TXT_SetDesktopTitle(char *title);
+
+/**
+ * Exit the currently-running main loop and return from the
+ * @ref TXT_GUIMainLoop function.
+ */
+
+void TXT_ExitMainLoop(void);
+
+/**
+ * Start the main event loop. At least one window must have been
+ * opened prior to running this function. When no windows are left
+ * open, the event loop exits.
+ *
+ * It is possible to trigger an exit from this function using the
+ * @ref TXT_ExitMainLoop function.
+ */
+
+void TXT_GUIMainLoop(void);
+
+#endif /* #ifndef TXT_DESKTOP_H */
--- a/textscreen/txt_dropdown.h
+++ b/textscreen/txt_dropdown.h
@@ -22,6 +22,22 @@
#ifndef TXT_DROPDOWN_H
#define TXT_DROPDOWN_H
+/**
+ * @file txt_dropdown.h
+ *
+ * Dropdown list widget.
+ */
+
+/**
+ * Dropdown list widget.
+ *
+ * A dropdown list allows the user to select from a list of values,
+ * which appears when the list is selected.
+ *
+ * When the value of a dropdown list is changed, the "changed" signal
+ * is emitted.
+ */
+
typedef struct txt_dropdown_list_s txt_dropdown_list_t;
#include "txt_widget.h"
@@ -37,6 +53,20 @@
char **values;
int num_values;
};
+
+/**
+ * Create a new dropdown list widget.
+ *
+ * The parameters specify a list of string labels, and a pointer to an
+ * integer variable. The variable contains the current "value" of the
+ * list, as an index within the list of labels.
+ *
+ * @param variable Pointer to the variable containing the
+ * list's value.
+ * @param values Pointer to an array of strings containing
+ * the labels to use for the list.
+ * @param num_values The number of variables in the list.
+ */
txt_dropdown_list_t *TXT_NewDropdownList(int *variable,
char **values, int num_values);
--- a/textscreen/txt_font.h
+++ b/textscreen/txt_font.h
@@ -28,7 +28,7 @@
#ifndef __FONT_H__
#define __FONT_H__
-static unsigned char int10_font_16[256 * 16] =
+static unsigned char main_font_data[] =
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -542,6 +542,13 @@
0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static txt_font_t main_font =
+{+ main_font_data,
+ 8, // width
+ 16 // height
};
#endif /* __FONT_H__ */
--- a/textscreen/txt_inputbox.c
+++ b/textscreen/txt_inputbox.c
@@ -144,6 +144,8 @@
free(*((char **)inputbox->value));
*((char **) inputbox->value) = strdup(inputbox->buffer);
+ TXT_EmitSignal(&inputbox->widget, "changed");
+
inputbox->editing = 0;
}
--- a/textscreen/txt_inputbox.h
+++ b/textscreen/txt_inputbox.h
@@ -22,6 +22,21 @@
#ifndef TXT_INPUTBOX_H
#define TXT_INPUTBOX_H
+/**
+ * @file txt_inputbox.h
+ *
+ * Input box widget.
+ */
+
+/**
+ * Input box widget.
+ *
+ * An input box is a widget that displays a value, which can be
+ * selected to enter a new value.
+ *
+ * Input box widgets can be of an integer or string type.
+ */
+
typedef struct txt_inputbox_s txt_inputbox_t;
#include "txt_widget.h"
@@ -35,7 +50,30 @@
void *value;
};
+/**
+ * Create a new input box widget for controlling a string value.
+ *
+ * @param value Pointer to a string variable that contains
+ * a pointer to the current value of the
+ * input box. The value should be allocated
+ * dynamically; when the string is changed it
+ * will be freed and the variable set to point
+ * to the new string value.
+ * @param size Width of the input box, in characters.
+ * @return Pointer to the new input box widget.
+ */
+
txt_inputbox_t *TXT_NewInputBox(char **value, int size);
+
+/**
+ * Create a new input box widget for controlling an integer value.
+ *
+ * @param value Pointer to an integer variable containing
+ * the value of the input box.
+ * @param size Width of the input box, in characters.
+ * @return Pointer to the new input box widget.
+ */
+
txt_inputbox_t *TXT_NewIntInputBox(int *value, int size);
#endif /* #ifndef TXT_INPUTBOX_H */
--- a/textscreen/txt_label.h
+++ b/textscreen/txt_label.h
@@ -22,6 +22,18 @@
#ifndef TXT_LABEL_H
#define TXT_LABEL_H
+/**
+ * @file txt_label.h
+ *
+ * Text label widget.
+ */
+
+/**
+ * Label widget.
+ *
+ * A label widget does nothing except show a text label.
+ */
+
typedef struct txt_label_s txt_label_t;
#include "txt_main.h"
@@ -37,9 +49,40 @@
txt_color_t bgcolor;
};
+/**
+ * Create a new label widget.
+ *
+ * @param label String to display in the widget.
+ * @return Pointer to the new label widget.
+ */
+
txt_label_t *TXT_NewLabel(char *label);
+
+/**
+ * Set the string displayed in a label widget.
+ *
+ * @param label The widget.
+ * @param value The string to display.
+ */
+
void TXT_SetLabel(txt_label_t *label, char *value);
+
+/**
+ * Set the background color of a label widget.
+ *
+ * @param label The widget.
+ * @param color The background color to use.
+ */
+
void TXT_SetBGColor(txt_label_t *label, txt_color_t color);
+
+/**
+ * Set the foreground color of a label widget.
+ *
+ * @param label The widget.
+ * @param color The foreground color to use.
+ */
+
void TXT_SetFGColor(txt_label_t *label, txt_color_t color);
#endif /* #ifndef TXT_LABEL_H */
--- a/textscreen/txt_radiobutton.h
+++ b/textscreen/txt_radiobutton.h
@@ -22,6 +22,30 @@
#ifndef TXT_RADIOBUTTON_H
#define TXT_RADIOBUTTON_H
+/**
+ * @file txt_radiobutton.h
+ *
+ * Radio button widget.
+ */
+
+/**
+ * A radio button widget.
+ *
+ * Radio buttons are typically used in groups, to allow a value to be
+ * selected from a range of options. Each radio button corresponds
+ * to a particular option that may be selected. A radio button
+ * has an indicator to indicate whether it is the currently-selected
+ * value, and a text label.
+ *
+ * Internally, a radio button tracks an integer variable that may take
+ * a range of different values. Each radio button has a particular
+ * value associated with it; if the variable is equal to that value,
+ * the radio button appears selected. If a radio button is pressed
+ * by the user through the GUI, the variable is set to its value.
+ *
+ * When a radio button is selected, the "selected" signal is emitted.
+ */
+
typedef struct txt_radiobutton_s txt_radiobutton_t;
#include "txt_widget.h"
@@ -34,7 +58,26 @@
int value;
};
+/**
+ * Create a new radio button widget.
+ *
+ * @param label The label to display next to the radio button.
+ * @param variable Pointer to the variable tracking whether this
+ * radio button is selected.
+ * @param value If the variable is equal to this value, the
+ * radio button appears selected.
+ * @return Pointer to the new radio button widget.
+ */
+
txt_radiobutton_t *TXT_NewRadioButton(char *label, int *variable, int value);
+
+/**
+ * Set the label on a radio button.
+ *
+ * @param radiobutton The radio button.
+ * @param value The new label.
+ */
+
void TXT_SetRadioButtonLabel(txt_radiobutton_t *radiobutton, char *value);
#endif /* #ifndef TXT_RADIOBUTTON_H */
--- a/textscreen/txt_scrollpane.c
+++ b/textscreen/txt_scrollpane.c
@@ -233,8 +233,8 @@
{scrollpane->y -= scrollpane->widget.y - selected->y;
}
- else if (selected->y + selected->h >
- scrollpane->widget.y + scrollpane->h)
+ else if ((signed) (selected->y + selected->h) >
+ (signed) (scrollpane->widget.y + scrollpane->h))
{scrollpane->y += (selected->y + selected->h)
- (scrollpane->widget.y + scrollpane->h);
@@ -246,8 +246,8 @@
{scrollpane->x -= scrollpane->widget.x - selected->x;
}
- else if (selected->x + selected->w >
- scrollpane->widget.x + scrollpane->w)
+ else if ((signed) (selected->x + selected->w) >
+ (signed) (scrollpane->widget.x + scrollpane->w))
{scrollpane->x += (selected->x + selected->w)
- (scrollpane->widget.x + scrollpane->w);
--- a/textscreen/txt_scrollpane.h
+++ b/textscreen/txt_scrollpane.h
@@ -22,6 +22,20 @@
#ifndef TXT_SCROLLPANE_H
#define TXT_SCROLLPANE_H
+/**
+ * @file txt_scrollpane.h
+ *
+ * Scrollable pane widget.
+ */
+
+/**
+ * Scrollable pane widget.
+ *
+ * A scrollable pane widget is a widget that contains another widget
+ * that is larger than it. Scroll bars appear on the side to allow
+ * different areas of the contained widget to be seen.
+ */
+
typedef struct txt_scrollpane_s txt_scrollpane_t;
#include "txt_widget.h"
@@ -34,6 +48,16 @@
int expand_w, expand_h;
txt_widget_t *child;
};
+
+/**
+ * Create a new scroll pane widget.
+ *
+ * @param w Width of the scroll pane, in characters.
+ * @param h Height of the scroll pane, in lines.
+ * @param target The target widget that the scroll pane will
+ * contain.
+ * @return Pointer to the new scroll pane widget.
+ */
txt_scrollpane_t *TXT_NewScrollPane(int w, int h, TXT_UNCAST_ARG(target));
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -35,15 +35,23 @@
#include "txt_main.h"
#include "txt_sdl.h"
-#include "txt_font.h"
-#define CHAR_W 8
-#define CHAR_H 16
-
#if defined(_MSC_VER) && !defined(__cplusplus)
#define inline __inline
#endif
+typedef struct
+{+ unsigned char *data;
+ unsigned int w;
+ unsigned int h;
+} txt_font_t;
+
+// Fonts:
+
+#include "txt_font.h"
+#include "txt_smallfont.h"
+
// Time between character blinks in ms
#define BLINK_PERIOD 250
@@ -55,6 +63,10 @@
static TxtSDLEventCallbackFunc event_callback;
static void *event_callback_data;
+// Font we are using:
+
+static txt_font_t *font;
+
//#define TANGO
#ifndef TANGO
@@ -108,6 +120,48 @@
#endif
//
+// Select the font to use, based on screen resolution
+//
+// If the highest screen resolution available is less than
+// 640x480, use the small font.
+//
+
+static void ChooseFont(void)
+{+ SDL_Rect **modes;
+ int i;
+
+ font = &main_font;
+
+ // Check all modes
+
+ modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
+
+ // If in doubt and we can't get a list, always prefer to
+ // fall back to the normal font:
+
+ if (modes == NULL || modes == (SDL_Rect **) -1 || *modes == NULL)
+ {+#ifdef _WIN32_WCE
+ font = &small_font;
+#endif
+ return;
+ }
+
+ for (i=0; modes[i] != NULL; ++i)
+ {+ if (modes[i]->w >= 640 && modes[i]->h >= 480)
+ {+ return;
+ }
+ }
+
+ // No large mode found.
+
+ font = &small_font;
+}
+
+//
// Initialise text mode screen
//
// Returns 1 if successful, 0 if an error occurred
@@ -115,10 +169,16 @@
int TXT_Init(void)
{- SDL_InitSubSystem(SDL_INIT_VIDEO);
-
- screen = SDL_SetVideoMode(TXT_SCREEN_W * CHAR_W, TXT_SCREEN_H * CHAR_H, 8, 0);
+ if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+ {+ return 0;
+ }
+ ChooseFont();
+
+ screen = SDL_SetVideoMode(TXT_SCREEN_W * font->w,
+ TXT_SCREEN_H * font->h, 8, 0);
+
if (screen == NULL)
return 0;
@@ -177,16 +237,16 @@
}
}
- p = &int10_font_16[character * CHAR_H];
+ p = &font->data[character * font->h];
s = ((unsigned char *) screen->pixels)
- + (y * CHAR_H * screen->pitch) + (x * CHAR_W);
+ + (y * font->h * screen->pitch) + (x * font->w);
- for (y1=0; y1<CHAR_H; ++y1)
+ for (y1=0; y1<font->h; ++y1)
{s1 = s;
- for (x1=0; x1<CHAR_W; ++x1)
+ for (x1=0; x1<font->w; ++x1)
{if (*p & (1 << (7-x1)))
{@@ -215,7 +275,7 @@
}
}
- SDL_UpdateRect(screen, x * CHAR_W, y * CHAR_H, w * CHAR_W, h * CHAR_H);
+ SDL_UpdateRect(screen, x * font->w, y * font->h, w * font->w, h * font->h);
}
void TXT_UpdateScreen(void)
@@ -227,8 +287,8 @@
{SDL_GetMouseState(x, y);
- *x /= CHAR_W;
- *y /= CHAR_H;
+ *x /= font->w;
+ *y /= font->h;
}
//
@@ -308,6 +368,15 @@
case SDLK_PAGEUP: return KEY_PGUP;
case SDLK_PAGEDOWN: return KEY_PGDN;
+#ifdef SDL_HAVE_APP_KEYS
+ case SDLK_APP1: return KEY_F1;
+ case SDLK_APP2: return KEY_F2;
+ case SDLK_APP3: return KEY_F3;
+ case SDLK_APP4: return KEY_F4;
+ case SDLK_APP5: return KEY_F5;
+ case SDLK_APP6: return KEY_F6;
+#endif
+
default: break;
}
@@ -448,6 +517,7 @@
case KEYP_MINUS: return "PAD-";
case KEYP_DIVIDE: return "PAD/";
*/
+
default: return NULL;
}
}
--- a/textscreen/txt_separator.h
+++ b/textscreen/txt_separator.h
@@ -22,6 +22,21 @@
#ifndef TXT_SEPARATOR_H
#define TXT_SEPARATOR_H
+/**
+ * @file txt_separator.h
+ *
+ * Horizontal separator widget.
+ */
+
+/**
+ * Horizontal separator.
+ *
+ * A horizontal separator appears as a horizontal line divider across
+ * the length of the window in which it is added. An optional label
+ * allows the separator to be used as a section divider for grouping
+ * related controls.
+ */
+
typedef struct txt_separator_s txt_separator_t;
#include "txt_widget.h"
@@ -33,6 +48,14 @@
};
extern txt_widget_class_t txt_separator_class;
+
+/**
+ * Create a new horizontal separator widget.
+ *
+ * @param label Label to display on the separator. If this is
+ * set to NULL, no label is displayed.
+ * @return The new separator widget.
+ */
txt_separator_t *TXT_NewSeparator(char *label);
--- /dev/null
+++ b/textscreen/txt_smallfont.h
@@ -1,0 +1,2884 @@
+// Emacs style mode select -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// Copyright (c) 1999, Thomas A. Fine
+//
+// License to copy, modify, and distribute for both commercial and
+// non-commercial use is herby granted, provided this notice
+// is preserved.
+//
+// Email to my last name at head.cfa.harvard.edu
+// http://hea-www.harvard.edu/~fine/
+//
+// ----
+//
+// Copyright (C) 2009 Simon Howard
+// Copyright (C) 2002-2004 The DOSBox Team
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//-----------------------------------------------------------------------------
+//
+// Small (4x8) bitmap font for low resolution displays.
+//
+// Based on the Atari-Small font by Tom Fine. The original font was standard
+// ASCII only; this has been extended to the full Extended ASCII range with
+// scaled-down versions of the full-size DOS font (txt_font.h)
+//
+//-----------------------------------------------------------------------------
+
+static unsigned char small_font_data[] = {+
+ // ------ Characters 0-31 have been remade to match the ------
+ // DOS control code ASCII characters.
+
+ // Character 0:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 1:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x50, // | # #|
+ 0x00, // | |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 2:
+
+ 0x60, // | ## |
+ 0xf0, // |####|
+ 0xa0, // |# # |
+ 0xf0, // |####|
+ 0x80, // |# |
+ 0xd0, // |## #|
+ 0xf0, // |####|
+ 0x60, // | ## |
+
+ // Character 3:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x50, // | # #|
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 4:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 5:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 6:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 7:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x60, // | ## |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 8:
+
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0x90, // |# #|
+ 0x90, // |# #|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+
+ // Character 9:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x90, // |# #|
+ 0x90, // |# #|
+ 0x60, // | ## |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 10:
+
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0x90, // |# #|
+ 0x60, // | ## |
+ 0x60, // | ## |
+ 0x90, // |# #|
+ 0xf0, // |####|
+ 0xf0, // |####|
+
+ // Character 11:
+
+ 0x00, // | |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 12:
+
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x90, // |# #|
+ 0x60, // | ## |
+ 0xf0, // |####|
+ 0x60, // | ## |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 13:
+
+ 0x00, // | |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 14:
+
+ 0x00, // | |
+ 0x70, // | ###|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xd0, // |## #|
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 15:
+
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+
+ // Character 16:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0xc0, // |## |
+ 0xe0, // |### |
+ 0xc0, // |## |
+ 0x80, // |# |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 17:
+
+ 0x00, // | |
+ 0x10, // | #|
+ 0x30, // | ##|
+ 0x70, // | ###|
+ 0x30, // | ##|
+ 0x10, // | #|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 18:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 19:
+
+ 0x00, // | |
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x00, // | |
+ 0x50, // | # #|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 20:
+
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x90, // |# #|
+ 0xd0, // |## #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 21:
+
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x90, // |# #|
+ 0x60, // | ## |
+ 0x10, // | #|
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 22:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 23:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0xf0, // |####|
+
+ // Character 24:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 25:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 26:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0xf0, // |####|
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 27:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0xf0, // |####|
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 28:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 29:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xf0, // |####|
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 30:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 31:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // ------ Characters 32-127 are from Atari-Small ------
+
+ // Character 32:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 33:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 34:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 35:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 36:
+
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x40, // | # |
+
+ // Character 37:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 38:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 39:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 40:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 41:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 42:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 43:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 44:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+
+ // Character 45:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 46:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 47:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 48:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 49:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xc0, // |## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 50:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 51:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 52:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 53:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0xc0, // |## |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 54:
+
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 55:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 56:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 57:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x20, // | # |
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 58:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 59:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 60:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 61:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 62:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 63:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 64:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 65:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 66:
+
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 67:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 68:
+
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 69:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 70:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 71:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 72:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 73:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 74:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 75:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 76:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 77:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 78:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 79:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 80:
+
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 81:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 82:
+
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 83:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 84:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 85:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 86:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 87:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 88:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 89:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 90:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 91:
+
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 92:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 93:
+
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 94:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 95:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+
+ // Character 96:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 97:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 98:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 99:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 100:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 101:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 102:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 103:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x20, // | # |
+ 0xc0, // |## |
+
+ // Character 104:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 105:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 106:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xc0, // |## |
+
+ // Character 107:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 108:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 109:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 110:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 111:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 112:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0x80, // |# |
+ 0x80, // |# |
+
+ // Character 113:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 114:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 115:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0xc0, // |## |
+ 0x00, // | |
+
+ // Character 116:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 117:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 118:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 119:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 120:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 121:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x20, // | # |
+ 0xc0, // |## |
+
+ // Character 122:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 123:
+
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 124:
+
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 125:
+
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 126:
+
+ 0x00, // | |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 127:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+
+ // ------ Characters 128-255 are scaled-down from the full size ------
+ // DOS font. Some of these have been fixed up, the rest
+ // need to be fixed up :-)
+
+ // Character 128:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xc0, // |## |
+
+
+ // Character 129:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 130:
+
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+
+ // Character 131:
+
+ 0x20, // | # |
+ 0x50, // | # #|
+ 0xc0, // |## |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 132:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 133:
+
+ 0x40, // | # |
+ 0x20, // | # |
+ 0xc0, // |## |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 134:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 135:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0xc0, // |## |
+
+ // Character 136:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 137:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 138:
+
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+
+ // Character 139:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 140:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 141:
+
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 142:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 143:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 144:
+
+ 0x20, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0xc0, // |## |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 145:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xb0, // |# ##|
+ 0x50, // | # #|
+ 0x70, // | ###|
+ 0xa0, // |# # |
+ 0x70, // | ###|
+ 0x00, // | |
+
+ // Character 146:
+
+ 0x00, // | |
+ 0x70, // | ###|
+ 0xa0, // |# # |
+ 0xf0, // |####|
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xb0, // |# ##|
+ 0x00, // | |
+
+ // Character 147:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 148:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 149:
+
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 150:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 151:
+
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 152:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x20, // | # |
+ 0xc0, // |## |
+
+ // Character 153:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 154:
+
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+
+ // Character 155:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 156:
+
+ 0x30, // | ##|
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xf0, // |####|
+ 0x00, // | |
+
+ // Character 157:
+
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 158:
+
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xb0, // |# ##|
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 159:
+
+ 0x10, // | #|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x70, // | ###|
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 160:
+
+ 0x20, // | # |
+ 0x40, // | # |
+ 0xc0, // |## |
+ 0x20, // | # |
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 161:
+
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 162:
+
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 163:
+
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+
+ // Character 164:
+
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 165:
+
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x90, // |# #|
+ 0xd0, // |## #|
+ 0xb0, // |# ##|
+ 0x90, // |# #|
+ 0x00, // | |
+
+
+ // Character 166:
+
+ 0x60, // | ## |
+ 0xa0, // |# # |
+ 0x70, // | ###|
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 167:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 168:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 169:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 170:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x70, // | ###|
+ 0x10, // | #|
+ 0x10, // | #|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 171:
+
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xb0, // |# ##|
+ 0x10, // | #|
+ 0x20, // | # |
+ 0x30, // | ##|
+
+ // Character 172:
+
+ 0x80, // |# |
+ 0x80, // |# |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x50, // | # #|
+ 0x70, // | ###|
+ 0x10, // | #|
+
+ // Character 173:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 174:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x50, // | # #|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 175:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xa0, // |# # |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 176:
+
+ 0x10, // | #|
+ 0x40, // | # |
+ 0x10, // | #|
+ 0x40, // | # |
+ 0x10, // | #|
+ 0x40, // | # |
+ 0x10, // | #|
+ 0x40, // | # |
+
+ // Character 177:
+
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+
+ // Character 178:
+
+ 0xd0, // |## #|
+ 0x70, // | ###|
+ 0xd0, // |## #|
+ 0x70, // | ###|
+ 0xd0, // |## #|
+ 0x70, // | ###|
+ 0xd0, // |## #|
+ 0x70, // | ###|
+
+ // Character 179:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 180:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 181:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 182:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xd0, // |## #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 183:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 184:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 185:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xd0, // |## #|
+ 0x10, // | #|
+ 0xd0, // |## #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 186:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 187:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x10, // | #|
+ 0xd0, // |## #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 188:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xd0, // |## #|
+ 0x10, // | #|
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 189:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 190:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 191:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 192:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x30, // | ##|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 193:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 194:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 195:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 196:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 197:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xf0, // |####|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 198:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 199:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 200:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x40, // | # |
+ 0x70, // | ###|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 201:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x70, // | ###|
+ 0x40, // | # |
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 202:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xd0, // |## #|
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 203:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0xd0, // |## #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 204:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 205:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 206:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xd0, // |## #|
+ 0x00, // | |
+ 0xd0, // |## #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 207:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 208:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 209:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 210:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 211:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x70, // | ###|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 212:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x30, // | ##|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 213:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 214:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x70, // | ###|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 215:
+
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0xf0, // |####|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x50, // | # #|
+
+ // Character 216:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xf0, // |####|
+ 0x20, // | # |
+ 0xf0, // |####|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 217:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 218:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 219:
+
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+
+ // Character 220:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+
+ // Character 221:
+
+ 0xc0, // |## |
+ 0xc0, // |## |
+ 0xc0, // |## |
+ 0xc0, // |## |
+ 0xc0, // |## |
+ 0xc0, // |## |
+ 0xc0, // |## |
+ 0xc0, // |## |
+
+ // Character 222:
+
+ 0x30, // | ##|
+ 0x30, // | ##|
+ 0x30, // | ##|
+ 0x30, // | ##|
+ 0x30, // | ##|
+ 0x30, // | ##|
+ 0x30, // | ##|
+ 0x30, // | ##|
+
+ // Character 223:
+
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 224:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x50, // | # #|
+ 0x00, // | |
+
+ // Character 225:
+
+ 0x00, // | |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0xc0, // |## |
+ 0xa0, // |# # |
+ 0x90, // |# #|
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 226:
+
+ 0x00, // | |
+ 0xf0, // |####|
+ 0x90, // |# #|
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 227:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 228:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 229:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x70, // | ###|
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 230:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x50, // | # #|
+ 0x50, // | # #|
+ 0x70, // | ###|
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 231:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x00, // | |
+
+ // Character 232:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 233:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 234:
+
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x90, // |# #|
+ 0x90, // |# #|
+ 0x60, // | ## |
+ 0x60, // | ## |
+ 0xf0, // |####|
+ 0x00, // | |
+
+ // Character 235:
+
+
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 236:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0xb0, // |# ##|
+ 0xd0, // |## #|
+ 0x60, // | ## |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 237:
+
+ 0x00, // | |
+ 0x10, // | #|
+ 0xf0, // |####|
+ 0x90, // |# #|
+ 0x90, // |# #|
+ 0xf0, // |####|
+ 0x80, // |# |
+ 0x00, // | |
+
+ // Character 238:
+
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x80, // |# |
+ 0x80, // |# |
+ 0x60, // | ## |
+ 0x00, // | |
+
+ // Character 239:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+
+ // Character 240:
+
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 241:
+
+ 0x00, // | |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x40, // | # |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 242:
+
+ 0x00, // | |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 243:
+
+ 0x00, // | |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0x80, // |# |
+ 0x40, // | # |
+ 0x20, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+
+ // Character 244:
+
+ 0x00, // | |
+ 0x10, // | #|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+
+ // Character 245:
+
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 246:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+
+ // Character 247:
+
+ 0x00, // | |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x50, // | # #|
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 248:
+
+ 0x40, // | # |
+ 0xa0, // |# # |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 249:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x60, // | ## |
+ 0x60, // | ## |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 250:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x40, // | # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 251:
+
+ 0x30, // | ##|
+ 0x20, // | # |
+ 0x20, // | # |
+ 0xa0, // |# # |
+ 0x60, // | ## |
+ 0x20, // | # |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 252:
+
+ 0xe0, // |### |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0xa0, // |# # |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 253:
+
+ 0xc0, // |## |
+ 0x20, // | # |
+ 0x40, // | # |
+ 0xe0, // |### |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 254:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0xf0, // |####|
+ 0x00, // | |
+ 0x00, // | |
+
+ // Character 255:
+
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+ 0x00, // | |
+};
+
+static txt_font_t small_font =
+{+ small_font_data,
+ 4, // width
+ 8 // height
+};
+
+
--- a/textscreen/txt_spinctrl.h
+++ b/textscreen/txt_spinctrl.h
@@ -22,7 +22,22 @@
#ifndef TXT_SPINCONTROL_H
#define TXT_SPINCONTROL_H
+/**
+ * @file txt_spinctrl.h
+ *
+ * Spin control widget.
+ */
+
+/**
+ * Spin control widget.
+ *
+ * A spin control widget works as an input box that can be used to
+ * set numeric values, but also has buttons that allow its value
+ * to be increased or decreased.
+ */
+
typedef struct txt_spincontrol_s txt_spincontrol_t;
+
typedef enum
{TXT_SPINCONTROL_INT,
@@ -40,7 +55,28 @@
char *buffer;
};
+/**
+ * Create a new spin control widget tracking an integer value.
+ *
+ * @param value Pointer to the variable containing the value
+ * displayed in the widget.
+ * @param min Minimum value that may be set.
+ * @param max Maximum value that may be set.
+ * @return Pointer to the new spin control widget.
+ */
+
txt_spincontrol_t *TXT_NewSpinControl(int *value, int min, int max);
+
+/**
+ * Create a new spin control widget tracking a float value.
+ *
+ * @param value Pointer to the variable containing the value
+ * displayed in the widget.
+ * @param min Minimum value that may be set.
+ * @param max Maximum value that may be set.
+ * @return Pointer to the new spin control widget.
+ */
+
txt_spincontrol_t *TXT_NewFloatSpinControl(float *value, float min, float max);
#endif /* #ifndef TXT_SPINCONTROL_H */
--- a/textscreen/txt_strut.h
+++ b/textscreen/txt_strut.h
@@ -22,15 +22,24 @@
#ifndef TXT_STRUT_H
#define TXT_STRUT_H
+/**
+ * @file txt_strut.h
+ *
+ * Strut widget.
+ */
+
+/**
+ * Strut widget.
+ *
+ * A strut is a widget that takes up a fixed amount of space. It can
+ * be visualised as a transparent box. Struts are used to provide
+ * spacing between widgets.
+ */
+
typedef struct txt_strut_s txt_strut_t;
#include "txt_widget.h"
-//
-// A strut is used to force a table to a minimum width/height. It is not
-// visible but it takes up space.
-//
-
struct txt_strut_s
{txt_widget_t widget;
@@ -37,6 +46,13 @@
int width;
int height;
};
+
+/**
+ * Create a new strut.
+ *
+ * @param width Width of the strut, in characters.
+ * @param height Height of the strut, in characters.
+ */
txt_strut_t *TXT_NewStrut(int width, int height);
--- a/textscreen/txt_table.h
+++ b/textscreen/txt_table.h
@@ -22,9 +22,29 @@
#ifndef TXT_TABLE_H
#define TXT_TABLE_H
+/**
+ * @file txt_table.h
+ *
+ * Table widget.
+ */
+
+/**
+ * Table widget.
+ *
+ * A table is a widget that contains other widgets. It may have
+ * multiple columns, in which case the child widgets are laid out
+ * in a grid. Columns automatically grow as necessary, although
+ * minimum column widths can be set using @ref TXT_SetColumnWidths.
+ *
+ * To create a new table, use @ref TXT_NewTable. It is also
+ * possible to use @ref TXT_NewHorizBox to create a table, specifying
+ * widgets to place inside a horizontal list. A vertical list is
+ * possible simply by creating a table containing a single column.
+ */
+
typedef struct txt_table_s txt_table_t;
-#include "txt_widget.h"
+#include "txt_widget.h"
struct txt_table_s
{@@ -48,14 +68,114 @@
extern txt_widget_class_t txt_table_class;
+void TXT_InitTable(txt_table_t *table, int columns);
+
+/**
+ * Create a new table.
+ *
+ * @param columns The number of columns in the new table.
+ * @return Pointer to the new table structure.
+ */
+
txt_table_t *TXT_NewTable(int columns);
+
+/**
+ * Create a table containing the specified widgets packed horizontally,
+ * from left to right.
+ *
+ * The arguments to this function are variable. Each argument must
+ * be a pointer to a widget, and the list is terminated with a
+ * NULL.
+ *
+ * @return Pointer to the new table structure.
+ */
+
txt_table_t *TXT_NewHorizBox(TXT_UNCAST_ARG(first_widget), ...);
-void TXT_InitTable(txt_table_t *table, int columns);
+
+/**
+ * Get the currently selected widget within a table.
+ *
+ * This function will recurse through subtables if necessary.
+ *
+ * @param table The table.
+ * @return Pointer to the widget that is currently selected.
+ */
+
txt_widget_t *TXT_GetSelectedWidget(TXT_UNCAST_ARG(table));
+
+/**
+ * Add a widget to a table.
+ *
+ * Widgets are added to tables horizontally, from left to right.
+ * For example, for a table with three columns, the first call
+ * to this function will add a widget to the first column, the second
+ * call to the second column, the third call to the third column,
+ * and the fourth will return to the first column, starting a new
+ * row.
+ *
+ * For adding many widgets, it may be easier to use
+ * @ref TXT_AddWidgets.
+ *
+ * @param table The table.
+ * @param widget The widget to add.
+ */
+
void TXT_AddWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
+
+/**
+ * Add multiple widgets to a table.
+ *
+ * Widgets are added as described in the documentation for the
+ * @ref TXT_AddWidget function. This function adds multiple
+ * widgets. The number of arguments is variable, and the argument
+ * list must be terminated by a NULL pointer.
+ *
+ * @param table The table.
+ */
+
void TXT_AddWidgets(TXT_UNCAST_ARG(table), ...);
+
+/**
+ * Select the given widget that is contained within the specified
+ * table.
+ *
+ * This function will recursively search through subtables if
+ * necessary.
+ *
+ * @param table The table.
+ * @param widget The widget to select.
+ * @return Non-zero (true) if it has been selected,
+ * or zero (false) if it was not found within
+ * this table.
+ */
+
int TXT_SelectWidget(TXT_UNCAST_ARG(table), TXT_UNCAST_ARG(widget));
+
+/**
+ * Set the widths of the columns of the table.
+ *
+ * The arguments to this function are variable, and correspond
+ * to the number of columns in the table. For example, if a table
+ * has five columns, the width of each of the five columns must be
+ * specified.
+ *
+ * The width values are in number of characters.
+ *
+ * Note that this function only sets the minimum widths for columns;
+ * if the columns contain widgets that are wider than the widths
+ * specified, they will be larger.
+ *
+ * @param table The table.
+ */
+
void TXT_SetColumnWidths(TXT_UNCAST_ARG(table), ...);
+
+/**
+ * Remove all widgets from a table.
+ *
+ * @param table The table.
+ */
+
void TXT_ClearTable(TXT_UNCAST_ARG(table));
#endif /* #ifndef TXT_TABLE_T */
--- a/textscreen/txt_widget.h
+++ b/textscreen/txt_widget.h
@@ -19,15 +19,27 @@
// 02111-1307, USA.
//
-// Base GUI "widget" class that all widgets inherit from.
-
#ifndef TXT_WIDGET_H
#define TXT_WIDGET_H
+/**
+ * @file txt_widget.h
+ *
+ * Base "widget" GUI component class.
+ */
+
+#ifndef DOXYGEN
+
#define TXT_UNCAST_ARG_NAME(name) uncast_ ## name
#define TXT_UNCAST_ARG(name) void * TXT_UNCAST_ARG_NAME(name)
#define TXT_CAST_ARG(type, name) type *name = (type *) uncast_ ## name
+#else
+
+#define TXT_UNCAST_ARG(name) txt_widget_t *name
+
+#endif
+
typedef enum
{TXT_VERT_TOP,
@@ -42,8 +54,20 @@
TXT_HORIZ_RIGHT,
} txt_horiz_align_t;
-typedef struct txt_widget_class_s txt_widget_class_t;
+/**
+ * A GUI widget.
+ *
+ * A widget is an individual component of a GUI. Various different widget
+ * types exist.
+ *
+ * Widgets may emit signals. The types of signal emitted by a widget
+ * depend on the type of the widget. It is possible to be notified
+ * when a signal occurs using the @ref TXT_SignalConnect function.
+ */
+
typedef struct txt_widget_s txt_widget_t;
+
+typedef struct txt_widget_class_s txt_widget_class_t;
typedef struct txt_callback_table_s txt_callback_table_t;
typedef void (*TxtWidgetSizeCalc)(TXT_UNCAST_ARG(widget));
@@ -82,14 +106,33 @@
void TXT_InitWidget(TXT_UNCAST_ARG(widget), txt_widget_class_t *widget_class);
void TXT_CalcWidgetSize(TXT_UNCAST_ARG(widget));
void TXT_DrawWidget(TXT_UNCAST_ARG(widget), int selected);
-void TXT_SignalConnect(TXT_UNCAST_ARG(widget), char *signal_name,
- TxtWidgetSignalFunc func, void *user_data);
void TXT_EmitSignal(TXT_UNCAST_ARG(widget), char *signal_name);
int TXT_WidgetKeyPress(TXT_UNCAST_ARG(widget), int key);
void TXT_WidgetMousePress(TXT_UNCAST_ARG(widget), int x, int y, int b);
void TXT_DestroyWidget(TXT_UNCAST_ARG(widget));
-void TXT_SetWidgetAlign(TXT_UNCAST_ARG(widget), txt_horiz_align_t horiz_align);
void TXT_LayoutWidget(TXT_UNCAST_ARG(widget));
+
+/**
+ * Set a callback function to be invoked when a signal occurs.
+ *
+ * @param widget The widget to watch.
+ * @param signal_name The signal to watch.
+ * @param func The callback function to invoke.
+ * @param user_data User-specified pointer to pass to the callback function.
+ */
+
+void TXT_SignalConnect(TXT_UNCAST_ARG(widget), char *signal_name,
+ TxtWidgetSignalFunc func, void *user_data);
+
+/**
+ * Set the policy for how a widget should be aligned within a table.
+ * By default, widgets are aligned to the left of the column.
+ *
+ * @param widget The widget.
+ * @param horiz_align The alignment to use.
+ */
+
+void TXT_SetWidgetAlign(TXT_UNCAST_ARG(widget), txt_horiz_align_t horiz_align);
#endif /* #ifndef TXT_WIDGET_H */
--- a/textscreen/txt_window.h
+++ b/textscreen/txt_window.h
@@ -22,6 +22,31 @@
#ifndef TXT_WINDOW_H
#define TXT_WINDOW_H
+/**
+ * @file txt_window.h
+ *
+ * Windows.
+ */
+
+/**
+ * A window.
+ *
+ * A window contains widgets, and may also be treated as a table
+ * (@ref txt_table_t) containing a single column.
+ *
+ * Windows can be created using @ref TXT_NewWindow and closed using
+ * @ref TXT_CloseWindow. When a window is closed, it emits the
+ * "closed" signal.
+ *
+ * In addition to the widgets within a window, windows also have
+ * a "tray" area at their bottom containing window action widgets.
+ * These widgets allow keyboard shortcuts to trigger common actions.
+ * Each window has three slots for keyboard shortcuts. By default,
+ * the left slot contains an action to close the window when the
+ * escape button is pressed, while the right slot contains an
+ * action to activate the currently-selected widget.
+ */
+
typedef struct txt_window_s txt_window_t;
#include "txt_widget.h"
@@ -68,18 +93,86 @@
unsigned int window_w, window_h;
};
+/**
+ * Open a new window.
+ *
+ * @param title Title to display in the titlebar of the new window.
+ * @return Pointer to a new @ref txt_window_t structure
+ * representing the new window.
+ */
+
txt_window_t *TXT_NewWindow(char *title);
+
+/**
+ * Close a window.
+ *
+ * @param window Tine window to close.
+ */
+
void TXT_CloseWindow(txt_window_t *window);
-void TXT_SetWindowPosition(txt_window_t *window,
+
+/**
+ * Set the position of a window on the screen.
+ *
+ * The window is specified as coordinates relative to a predefined
+ * position on the screen (eg. center of the screen, top left of the
+ * screen, etc).
+ *
+ * @param window The window.
+ * @param horiz_align Horizontal position on the screen to which the
+ * coordinates are relative (left side, right side
+ * or center).
+ * @param vert_align Vertical position on the screen to which the
+ * coordinates are relative (top, bottom or center).
+ * @param x X coordinate (horizonal axis) for window position.
+ * @param y Y coordinate (vertical axis) for window position.
+ */
+
+void TXT_SetWindowPosition(txt_window_t *window,
txt_horiz_align_t horiz_align,
txt_vert_align_t vert_align,
int x, int y);
+
+/**
+ * Set a window action for a given window.
+ *
+ * Each window can have up to three window actions, which provide
+ * keyboard shortcuts that can be used within a given window.
+ *
+ * @param window The window.
+ * @param position The window action slot to set (left, center or right).
+ * @param action The window action widget. If this is NULL, any
+ * current window action in the given slot is removed.
+ */
+
void TXT_SetWindowAction(txt_window_t *window, txt_horiz_align_t position,
txt_window_action_t *action);
-void TXT_SetKeyListener(txt_window_t *window,
- TxtWindowKeyPress key_listener,
+
+/**
+ * Set a callback function to be invoked whenever a key is pressed within
+ * a window.
+ *
+ * @param window The window.
+ * @param key_listener Callback function.
+ * @param user_data User-specified pointer to pass to the callback
+ * function.
+ */
+
+void TXT_SetKeyListener(txt_window_t *window,
+ TxtWindowKeyPress key_listener,
void *user_data);
-void TXT_SetMouseListener(txt_window_t *window,
+
+/**
+ * Set a callback function to be invoked whenever a mouse button is pressed
+ * within a window.
+ *
+ * @param window The window.
+ * @param mouse_listener Callback function.
+ * @param user_data User-specified pointer to pass to the callback
+ * function.
+ */
+
+void TXT_SetMouseListener(txt_window_t *window,
TxtWindowMousePress mouse_listener,
void *user_data);
--- a/textscreen/txt_window_action.h
+++ b/textscreen/txt_window_action.h
@@ -22,6 +22,22 @@
#ifndef TXT_WINDOW_ACTION_H
#define TXT_WINDOW_ACTION_H
+/**
+ * @file txt_window_action.h
+ *
+ * Window action widget.
+ */
+
+/**
+ * Window action widget.
+ *
+ * A window action is attached to a window and corresponds to a
+ * keyboard shortcut that is active within that window. When the
+ * key is pressed, the action is triggered.
+ *
+ * When a window action is triggered, the "pressed" signal is emitted.
+ */
+
typedef struct txt_window_action_s txt_window_action_t;
#include "txt_widget.h"
@@ -34,17 +50,45 @@
int key;
};
+/**
+ * Create a new window action.
+ *
+ * @param key The keyboard key that triggers this action.
+ * @param label Label to display for this action in the tray
+ * at the bottom of the window.
+ * @return Pointer to the new window action widget.
+ */
+
txt_window_action_t *TXT_NewWindowAction(int key, char *label);
-// Creates an "escape" button that closes the window
+/**
+ * Create a new window action that closes the window when the
+ * escape key is pressed. The label "Close" is used.
+ *
+ * @param window The window to close.
+ * @return Pointer to the new window action widget.
+ */
txt_window_action_t *TXT_NewWindowEscapeAction(txt_window_t *window);
-// Same as above, but the button is named "abort"
+/**
+ * Create a new window action that closes the window when the
+ * escape key is pressed. The label "Abort" is used.
+ *
+ * @param window The window to close.
+ * @return Pointer to the new window action widget.
+ */
txt_window_action_t *TXT_NewWindowAbortAction(txt_window_t *window);
-// Accept button that does nothing
+/**
+ * Create a new "select" window action. This does not really do
+ * anything, but reminds the user that "enter" can be pressed to
+ * activate the currently-selected widget.
+ *
+ * @param window The window.
+ * @return Pointer to the new window action widget.
+ */
txt_window_action_t *TXT_NewWindowSelectAction(txt_window_t *window);
--- /dev/null
+++ b/wince/Makefile.am
@@ -1,0 +1,16 @@
+
+noinst_LIBRARIES=libc_wince.a
+
+if WINDOWS_CE
+
+libc_wince_a_SOURCES = \
+ env.c env.h \
+ errno.c errno.h \
+ fileops.c fileops.h
+
+else
+
+libc_wince_a_SOURCES =
+
+endif
+
--- /dev/null
+++ b/wince/README
@@ -1,0 +1,8 @@
+Windows CE is a horribly crippled operating system. The poor thing doesn't
+even include a complete implementation of the ANSI standard C library. This
+is a mini-library called libc_wince that implements some of the missing
+library functions. I've only implemented those necessary to get Chocolate
+Doom to compile.
+
+On non-Windows CE platforms it is just built as an empty library.
+
--- /dev/null
+++ b/wince/env.c
@@ -1,0 +1,92 @@
+//
+// "Extension" implementation of getenv for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <windows.h>
+#include <lmcons.h>
+#include <secext.h>
+#include <shlobj.h>
+
+#include "env.h"
+
+static void WCharToChar(wchar_t *src, char *dest, int buf_len)
+{+ unsigned int len;
+
+ len = wcslen(src) + 1;
+
+ WideCharToMultiByte(CP_OEMCP, 0, src, len, dest, buf_len, NULL, NULL);
+}
+
+static void SetEnvironment(char *env_string, wchar_t *wvalue)
+{+ char value[MAX_PATH + 10];
+ int env_len;
+
+ // Construct the string for putenv: NAME=value
+
+ env_len = strlen(env_string);
+ strcpy(value, env_string);
+
+ WCharToChar(wvalue, value + env_len, sizeof(value) - env_len);
+
+ // Set the environment variable:
+
+ putenv(value);
+}
+
+static int ReadOwnerName(wchar_t *value, DWORD len)
+{+ HKEY key;
+ DWORD valtype;
+
+ if (RegOpenKeyExW(HKEY_CURRENT_USER,
+ L"\\ControlPanel\\Owner", 0,
+ KEY_READ, &key) != ERROR_SUCCESS)
+ {+ return 0;
+ }
+
+ valtype = REG_SZ;
+
+ if (RegQueryValueExW(key, L"Name", NULL, &valtype,
+ (LPBYTE) value, &len) != ERROR_SUCCESS)
+ {+ return 0;
+ }
+
+ // Close the key
+
+ RegCloseKey(key);
+
+ return 1;
+}
+
+void PopulateEnvironment(void)
+{+ wchar_t temp[MAX_PATH];
+
+ // Username:
+
+ if (ReadOwnerName(temp, MAX_PATH))
+ {+ SetEnvironment("USER=", temp);+ SetEnvironment("USERNAME=", temp);+ }
+
+ // Temp dir:
+
+ GetTempPathW(MAX_PATH, temp);
+ SetEnvironment("TEMP=", temp);+
+ // Use My Documents dir as home:
+
+ SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0);
+ SetEnvironment("HOME=", temp);+}
+
--- /dev/null
+++ b/wince/env.h
@@ -1,0 +1,24 @@
+//
+// "Extension" implementation of getenv for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#ifndef WINCE_ENV_H
+#define WINCE_ENV_H
+
+// SDL provides an implementation of getenv/putenv:
+
+#include "SDL_getenv.h"
+
+#ifndef getenv
+#define getenv SDL_getenv
+#endif
+#ifndef putenv
+#define putenv SDL_putenv
+#endif
+
+extern void PopulateEnvironment(void);
+
+#endif /* #ifndef WINCE_ENV_H */
+
--- /dev/null
+++ b/wince/errno.c
@@ -1,0 +1,20 @@
+//
+// "Extension" implementation of errno.h for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#include <windows.h>
+
+#include "errno.h"
+
+// This should really be a thread-local variable. Oh well.
+
+static int my_errno;
+
+int *_GetErrno()
+{+ my_errno = GetLastError();
+ return &my_errno;
+}
+
--- /dev/null
+++ b/wince/errno.h
@@ -1,0 +1,17 @@
+//
+// "Extension" implementation of errno.h for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#ifndef WINCE_ERRNO_H
+#define WINCE_ERRNO_H
+
+#define EISDIR 21 /* Is a directory */
+
+extern int *_GetErrno();
+
+#define errno (*_GetErrno())
+
+#endif /* #ifndef WINCE_ERROR_H */
+
--- /dev/null
+++ b/wince/fileops.c
@@ -1,0 +1,49 @@
+//
+// "Extension" implementation of ANSI C file functions for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <windows.h>
+
+#include "fileops.h"
+
+int remove(const char *pathname)
+{+ wchar_t temp[MAX_PATH + 1];
+
+ MultiByteToWideChar(CP_OEMCP,
+ 0,
+ pathname,
+ strlen(pathname) + 1,
+ temp,
+ MAX_PATH);
+
+ return DeleteFileW(temp) != 0;
+}
+
+int rename(const char *oldpath, const char *newpath)
+{+ wchar_t oldpath1[MAX_PATH + 1];
+ wchar_t newpath1[MAX_PATH + 1];
+
+ MultiByteToWideChar(CP_OEMCP,
+ 0,
+ oldpath,
+ strlen(oldpath) + 1,
+ oldpath1,
+ MAX_PATH);
+ MultiByteToWideChar(CP_OEMCP,
+ 0,
+ newpath,
+ strlen(newpath) + 1,
+ newpath1,
+ MAX_PATH);
+
+ return MoveFileW(oldpath1, newpath1);
+}
+
--- /dev/null
+++ b/wince/fileops.h
@@ -1,0 +1,14 @@
+//
+// "Extension" implementation of ANSI C file functions for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#ifndef WINCE_FILEOPS_H
+#define WINCE_FILEOPS_H
+
+int remove(const char *pathname);
+int rename(const char *oldpath, const char *newpath);
+
+#endif /* #ifndef WINCE_FILEOPS_H */
+
--- /dev/null
+++ b/wince/libc_wince.h
@@ -1,0 +1,4 @@
+
+#include "env.h"
+#include "fileops.h"
+