Author: nornagon
Date: 2004-12-28 18:06:38 -0500 (Tue, 28 Dec 2004)
New Revision: 439
Added:
trunk/clients/termvisual/
trunk/clients/termvisual/termvisual.pl
Modified:
trunk/clients/irssi/libtool
trunk/clients/irssi/ltmain.sh
trunk/clients/wxhaver/src/wxHaver.h
trunk/clients/wxhaver/src/wxHaverParser.cpp
Log:
Added Term::Visual client
Modified: trunk/clients/irssi/libtool
===================================================================
--- trunk/clients/irssi/libtool 2004-12-28 22:40:25 UTC (rev 438)
+++ trunk/clients/irssi/libtool 2004-12-28 23:06:38 UTC (rev 439)
@@ -40,11 +40,11 @@
if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
# The names of the tagged configurations supported by this script.
-available_tags=" CXX F77"
+available_tags=" CXX"
# ### BEGIN LIBTOOL CONFIG
-# Libtool was configured on host odin.hardison.net:
+# Libtool was configured on host mimiru:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
@@ -316,10 +316,10 @@
link_all_deplibs=no
# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.3/
/usr/lib/gcc/i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../../i486-linux/lib/i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../../i486-linux/lib/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../ /lib/i486-linux/3.3.3/ /lib/
/usr/lib/i486-linux/3.3.3/ /usr/lib/"
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/
/usr/lib/gcc/i486-linux/3.3.5/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/
/usr/lib/i486-linux/3.3.5/ /usr/lib/"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib
/usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib /usr/lib/atlas
/usr/lib/GNUstep/System/Library/Libraries "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -387,7 +387,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 203 $"
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $"
# Check that we have a working $echo.
@@ -2210,10 +2210,6 @@
$echo "$modename: warning: \`-l' is ignored for archives/objects"
1>&2
continue
fi
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path
$sys_lib_search_path $shlib_search_path; do
for search_ext in .la $std_shrext .so .a; do
@@ -3276,6 +3272,11 @@
age="$number_minor"
revision="$number_minor"
;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'"
1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more
information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
esac
;;
no)
@@ -6768,7 +6769,7 @@
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
-# Libtool was configured on host odin.hardison.net:
+# Libtool was configured on host mimiru:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
@@ -6941,11 +6942,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects="/usr/lib/gcc-lib/i486-linux/3.3.3/../../../crti.o
/usr/lib/gcc-lib/i486-linux/3.3.3/crtbeginS.o"
+predep_objects="/usr/lib/gcc-lib/i486-linux/3.3.5/../../../crti.o
/usr/lib/gcc-lib/i486-linux/3.3.5/crtbeginS.o"
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects="/usr/lib/gcc-lib/i486-linux/3.3.3/crtendS.o
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../crtn.o"
+postdep_objects="/usr/lib/gcc-lib/i486-linux/3.3.5/crtendS.o
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../crtn.o"
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -6957,7 +6958,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc-lib/i486-linux/3.3.3
-L/usr/lib/gcc-lib/i486-linux/3.3.3/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc-lib/i486-linux/3.3.5
-L/usr/lib/gcc-lib/i486-linux/3.3.5/../../.."
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
@@ -7037,10 +7038,10 @@
link_all_deplibs=no
# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.3/
/usr/lib/gcc/i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../../i486-linux/lib/i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../../i486-linux/lib/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../ /lib/i486-linux/3.3.3/ /lib/
/usr/lib/i486-linux/3.3.3/ /usr/lib/"
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/
/usr/lib/gcc/i486-linux/3.3.5/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/
/usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/
/usr/lib/i486-linux/3.3.5/ /usr/lib/"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib
/usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib /usr/lib/atlas
/usr/lib/GNUstep/System/Library/Libraries "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -7062,302 +7063,3 @@
# ### END LIBTOOL TAG CONFIG: CXX
-# ### BEGIN LIBTOOL TAG CONFIG: F77
-
-# Libtool was configured on host odin.hardison.net:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=no
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=i686-pc-linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# A language-specific compiler.
-CC="g77"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="grep -E"
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=32768
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation ?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=""
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience
\${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix
\${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB
\$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname
\$wl\$soname -o \$lib"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
-cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >>
\$output_objdir/\$libname.ver~
-\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
- \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname
\$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[
][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/
{\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/
{\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to yes if building a shared library automatically hardcodes DIR into the
library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=no
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.3/
/usr/lib/gcc/i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../../i486-linux/lib/i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../../i486-linux/lib/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../i486-linux/3.3.3/
/usr/lib/gcc-lib/i486-linux/3.3.3/../../../ /lib/i486-linux/3.3.3/ /lib/
/usr/lib/i486-linux/3.3.3/ /usr/lib/"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib
/usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib /usr/lib/atlas
/usr/lib/GNUstep/System/Library/Libraries "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe |
\$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL TAG CONFIG: F77
-
Modified: trunk/clients/irssi/ltmain.sh
===================================================================
--- trunk/clients/irssi/ltmain.sh 2004-12-28 22:40:25 UTC (rev 438)
+++ trunk/clients/irssi/ltmain.sh 2004-12-28 23:06:38 UTC (rev 439)
@@ -44,7 +44,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 203 $"
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $"
# Check that we have a working $echo.
@@ -1867,10 +1867,6 @@
$echo "$modename: warning: \`-l' is ignored for archives/objects"
1>&2
continue
fi
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path
$sys_lib_search_path $shlib_search_path; do
for search_ext in .la $std_shrext .so .a; do
@@ -2933,6 +2929,11 @@
age="$number_minor"
revision="$number_minor"
;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'"
1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more
information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
esac
;;
no)
Added: trunk/clients/termvisual/termvisual.pl
===================================================================
--- trunk/clients/termvisual/termvisual.pl 2004-12-28 22:40:25 UTC (rev
438)
+++ trunk/clients/termvisual/termvisual.pl 2004-12-28 23:06:38 UTC (rev
439)
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use Carp;
+use POE;
+use Term::Visual;
+use Haver::Protocol;
+use Haver::Config;
+
+my $config;
+
+POE::Session->create(
+ inline_states => {
+ _start => \&handle_start,
+ user_input => \&handle_user_input,
+ shutdown => \&handle_shutdown,
+ _stop => \&handle_stop,
+ },
+);
+
+my %commands = (
+ quit => \&command_quit,
+ connect => \&command_connect,
+);
+
+sub handle_start {
+ my ($kernel, $heap) = @_[KERNEL, HEAP];
+
+ $heap->{config} = Haver::Config->new(
+ file => "config",
+ default => {
+ UID => $ENV{USER} || 'A_User',
+ Channel => 'lobby',
+ HistSize => 50,
+ BufferSize => 1000,
+ Server => 'localhost',
+ Port => '7070',
+ CommandChars => '/.',
+ },
+ );
+
+ $heap->{vt} = Term::Visual->new( Alias => "user_interface" );
+
+ $heap->{window_id} = $heap->{vt}->create_window(
+ Window_Name => "foo",
+# Status => { 0 => { format => "template for
status line 1.",
+# fields =>
[qw(text)] },
+# },
+ Buffer_Size => $heap->{config}{BufferSize},
+ History_Size => $heap->{config}{HistSize},
+ Status_Height => 1,
+ Title => "Haver"
+ );
+
+ $kernel->post( user_interface => send_me_input => "user_input" );
+
+# $vt->set_status_field($window_id, text => "status field");
+# $kernel->alarm(update_time => int(time() / 60) * 60 + 60);
+}
+
+sub handle_stop {
+}
+
+sub handle_shutdown {
+ my ($kernel, $heap) = @_[KERNEL, HEAP];
+# $heap->{vt}->delete_window($heap->{window_id});
+# $heap->{vt}->shutdown;
+ $heap->{config}->save;
+ exit;
+}
+
+sub handle_user_input {
+ my ($kernel, $heap, $input, $exception) = @_[KERNEL, HEAP, ARG0, ARG1];
+
+ if (defined $exception) {
+ warn "Got exception: $exception";
+ $heap->{config}->save;
+ command_quit();
+ exit;
+ }
+
+ if ($input =~ /^\s*[$heap->{config}{CommandChars}](.+)$/x) {
+ my @args = split / /, $1;
+ my $cmd = shift @args;
+ if (exists $commands{$cmd}) {
+ &{$commands{$cmd}}(@args);
+ } else {
+ $heap->{vt}->print($heap->{window_id}, "Unknown
command: $cmd");
+ }
+ return;
+ }
+
+ $heap->{vt}->print($heap->{window_id}, "$input");
+}
+
+sub command_quit {
+ my $heap = $poe_kernel->get_active_session()->get_heap();
+ $heap->{vt}->print($heap->{window_id}, "Shutting down...");
+ $heap->{config}->save;
+ exit;
+}
+
+sub command_connect {
+ my $heap = $poe_kernel->get_active_session()->get_heap();
+ $heap->{vt}->print($heap->{window_id}, "Connect command received");
+}
+
+POE::Kernel->run();
+exit 0;
Modified: trunk/clients/wxhaver/src/wxHaver.h
===================================================================
--- trunk/clients/wxhaver/src/wxHaver.h 2004-12-28 22:40:25 UTC (rev 438)
+++ trunk/clients/wxhaver/src/wxHaver.h 2004-12-28 23:06:38 UTC (rev 439)
@@ -32,6 +32,9 @@
#include "wx/wx.h"
#endif
+#define DEBUGLEVEL 1
+#define DEBUG(level, cmd) if ((level) <= DEBUGLEVEL) { cmd; }
+
enum {
WH_ID_Quit = 1,
WH_ID_Connect,
Modified: trunk/clients/wxhaver/src/wxHaverParser.cpp
===================================================================
--- trunk/clients/wxhaver/src/wxHaverParser.cpp 2004-12-28 22:40:25 UTC (rev
438)
+++ trunk/clients/wxhaver/src/wxHaverParser.cpp 2004-12-28 23:06:38 UTC (rev
439)
@@ -35,7 +35,9 @@
vector<wxString> Split(wxString line, wxString splitby, unsigned int limit)
{
+ DEBUG(2,
printf("Splitting \"%s\" by \"%s\"\n", line.c_str(), splitby.c_str());
+ );
size_t tp;
vector<wxString> tokens;
int i = 1;
@@ -107,13 +109,13 @@
void wxHaverParser::Parse(wxString line)
{
Strip(line);
- printf("Got line \"%s\" to parse\n", line.c_str());
+ DEBUG(1, printf("Got line \"%s\" to parse\n", line.c_str()) );
vector<wxString> cmd = Split(line, "\t");
if (_commands.find(cmd[0]) == _commands.end()) {
printf("Command %s doesn't exist\n", cmd[0].c_str());
return;
}
- printf("Command exists\n");
+ DEBUG(2, printf("Command exists\n"); );
wxString command = cmd[0];
cmd.erase(cmd.begin());
(*_commands[command])(cmd);
@@ -126,14 +128,16 @@
void wxHaverUserParser::Parse(wxString line)
{
- printf("User did \"%s\"\n", line.c_str());
+ DEBUG(2, printf("User did \"%s\"\n", line.c_str()); );
vector<wxString> cmd = Split(line, " ", 2);
+ DEBUG(2,
printf("Command is: |%s| args: |%s|\n", cmd[0].c_str(), cmd[1].c_str());
+ );
if (_commands.find(cmd[0]) == _commands.end()) {
printf("User command %s doesn't exist\n", cmd[0].c_str());
return;
}
- printf("User command exists\n");
+ DEBUG(1, printf("User command exists\n"); );
wxString command = cmd[0];
cmd.erase(cmd.begin());
printf("command = %s\n", command.c_str());
