Added small theme.

diff --git a/configure b/configure
index 08cef5479e3c29553e69b9f2d7c32e2bfc622a02..23c917bc9d7a8583829d10766d9b1a2db72fa46c 100755 (executable)
--- a/configure
+++ b/configure
@@ -2357,7 +2357,9 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "Makefile
 src/Makefile
 themes/Makefile
-themes/default/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+themes/default/Makefile
+themes/small/Makefile
+" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2472,7 +2474,9 @@ cat >> $CONFIG_STATUS <<EOF
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
 src/Makefile
 themes/Makefile
-themes/default/Makefile"}
+themes/default/Makefile
+themes/small/Makefile
+"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -2542,4 +2546,4 @@ EOF
 chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
- 
+

diff --git a/configure.in b/configure.in
index ce5f4b027c6db918316458aa687f8b11eb6864ab..21f22b6c3f72689bbecae352c90bbbcd68aef8b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,4 +31,6 @@ AC_OUTPUT(
 Makefile
 src/Makefile
 themes/Makefile
-themes/default/Makefile) 
+themes/default/Makefile
+themes/small/Makefile
+)

diff --git a/src/tetrinet.c b/src/tetrinet.c
index 330e4411c98812bd36495cd9659f80d635704e64..60ad5fdb56a095f9144c690ff5f2d8c179cd7474 100644 (file)
--- a/src/tetrinet.c
+++ b/src/tetrinet.c
@@ -180,6 +180,8 @@ void tetrinet_inmessage (enum inmsg_type msgtype, char *data)
             fieldslabelupdate ();
         }
         winlist_clear ();
+        fields_attdefclear ();
+        fields_gmsgclear ();
         partyline_text ("\014\02*** Disconnected from server");
         break;
     case IN_CONNECTERROR:
@@ -1292,9 +1294,16 @@ notfieldkey:
                 char buf[256], *s;
                 s = fields_gmsginputtext ();
                 if (strlen(s) > 0) {
-                    /* post message */
-                    sprintf (buf, "<%s> %s", nick, s);
-                    client_outmessage (OUT_GMSG, buf);
+                    if (strncmp("/me ", s, 4) == 0) {
+                        /* post /me thingy */
+                        sprintf (buf, "* %s %s", nick, s+4);
+                        client_outmessage (OUT_GMSG, buf);
+                    }
+                    else {
+                        /* post message */
+                        sprintf (buf, "<%s> %s", nick, s);
+                        client_outmessage (OUT_GMSG, buf);
+                    }
                 }
                 /* hide input area */
                 fields_gmsginput (FALSE);

diff --git a/themes/Makefile.am b/themes/Makefile.am
index dcc4764a751d69dec6684f29d37eca4c4b0434fa..e0d6014c76e8465485615e8c4c2933847b45d7c4 100644 (file)
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1 +1 @@
-SUBDIRS = default
+SUBDIRS = default small

diff --git a/themes/Makefile.in b/themes/Makefile.in
index 49a535c0bb276f54626650abc3f49d8b3f4ae484..0616d51d90ccdcac30568ac38426e47beebf0505 100644 (file)
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -84,7 +84,7 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 ZVT_LIBS = @ZVT_LIBS@
 
-SUBDIRS = default
+SUBDIRS = default small
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in

diff --git a/themes/small/Makefile.am b/themes/small/Makefile.am
new file mode 100644 (file)
index 0000000..a6dc418
--- /dev/null
+++ b/themes/small/Makefile.am
@@ -0,0 +1,3 @@
+smallthemedir = $(pkgdatadir)/themes/small
+
+smalltheme_DATA = blocks.png theme.cfg

diff --git a/themes/small/Makefile.in b/themes/small/Makefile.in
new file mode 100644 (file)
index 0000000..afcf987
--- /dev/null
+++ b/themes/small/Makefile.in
@@ -0,0 +1,217 @@
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+CC = @CC@
+ESD_CFLAGS = @ESD_CFLAGS@
+ESD_CONFIG = @ESD_CONFIG@
+ESD_LIBS = @ESD_LIBS@
+GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
+GNOMEUI_LIBS = @GNOMEUI_LIBS@
+GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
+GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
+GNOME_CONFIG = @GNOME_CONFIG@
+GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
+GNOME_LIBDIR = @GNOME_LIBDIR@
+GNOME_LIBS = @GNOME_LIBS@
+GNORBA_CFLAGS = @GNORBA_CFLAGS@
+GNORBA_LIBS = @GNORBA_LIBS@
+GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CONFIG = @GTK_CONFIG@
+GTK_LIBS = @GTK_LIBS@
+MAKEINFO = @MAKEINFO@
+ORBIT_CFLAGS = @ORBIT_CFLAGS@
+ORBIT_CONFIG = @ORBIT_CONFIG@
+ORBIT_IDL = @ORBIT_IDL@
+ORBIT_LIBS = @ORBIT_LIBS@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+ZVT_LIBS = @ZVT_LIBS@
+
+smallthemedir = $(pkgdatadir)/themes/small
+
+smalltheme_DATA = blocks.png theme.cfg
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DATA =  $(smalltheme_DATA)
+
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/small/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+       cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-smallthemeDATA: $(smalltheme_DATA)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(smallthemedir)
+       @list='$(smalltheme_DATA)'; for p in $$list; do \
+         if test -f $(srcdir)/$$p; then \
+           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(smallthemedir)/$$p"; \
+           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(smallthemedir)/$$p; \
+         else if test -f $$p; then \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(smallthemedir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(smallthemedir)/$$p; \
+         fi; fi; \
+       done
+
+uninstall-smallthemeDATA:
+       @$(NORMAL_UNINSTALL)
+       list='$(smalltheme_DATA)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(smallthemedir)/$$p; \
+       done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = themes/small
+
+distdir: $(DISTFILES)
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(top_distdir) && pwd`; \
+       distdir=`cd $(distdir) && pwd`; \
+       cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu themes/small/Makefile
+       @for file in $(DISTFILES); do \
+         d=$(srcdir); \
+         if test -d $$d/$$file; then \
+           cp -pr $$d/$$file $(distdir)/$$file; \
+         else \
+           test -f $(distdir)/$$file \
+           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+           || cp -p $$d/$$file $(distdir)/$$file || :; \
+         fi; \
+       done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-smallthemeDATA
+install-data: install-data-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-smallthemeDATA
+uninstall: uninstall-am
+all-am: Makefile $(DATA)
+all-redirect: all-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+       $(mkinstalldirs)  $(DESTDIR)$(smallthemedir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-smallthemeDATA install-smallthemeDATA tags distdir \
+info-am info dvi-am dvi check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

diff --git a/themes/small/blocks.png b/themes/small/blocks.png
new file mode 100644 (file)
index 0000000..e0df9ec
Binary files /dev/null and b/themes/small/blocks.png differ

diff --git a/themes/small/theme.cfg b/themes/small/theme.cfg
new file mode 100644 (file)
index 0000000..6b10966
--- /dev/null
+++ b/themes/small/theme.cfg
@@ -0,0 +1,8 @@
+[Theme]
+Name=GTetrinet Default Theme (small)
+Author=Zillidot (kswong@zip.com.au)
+Description=Default GTetrinet Theme (small) (no sound)
+
+[Graphics]
+Blocks=blocks.png
+BlockSize=16