[Gridflow-cvs] [svn] commit: r6214 - in /trunk: Makefile src/gridflow.cxx src/unicorn.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Tue Sep 7 20:17:24 EDT 2010


Author: matju
Date: Tue Sep  7 20:17:13 2010
New Revision: 6214

Log:
introducing the unicorn (separating the wtf-8 hack from the rest of the system)

Added:
    trunk/src/unicorn.cxx
Modified:
    trunk/Makefile
    trunk/src/gridflow.cxx

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Sep  7 20:17:13 2010
@@ -14,7 +14,7 @@
 OBJS2 = src/gridflow.o src/grid.o src/classes1.o src/classes2.o src/classes3.o src/classes_gui.o \
 src/number.1.o src/number.2.o src/number.3.o src/number.4.o \
 src/formats.o
-PDLIB += gridflow_pdp$(PDSUF)
+PDLIB += gridflow_pdp$(PDSUF) gridflow_unicorn$(PDSUF)
 
 OS = $(shell uname -s | sed -e 's/^MINGW.*/nt/')
 FILT = $(RUBY) -w src/source_filter.rb
@@ -91,14 +91,16 @@
 $(PDLIB1): $(OBJS2) $(OBJS) $(H) $(COMMON_DEPS)
 	$(CXX) -DPDSUF=\"$(PDSUF)\" $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -xnone $(OBJS2) $(OBJS) $(LDSOFLAGS) -o $@
 
-gridflow_gem9292$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
-	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                              -xc++ src/gem.cxx.fcs -o $@
-gridflow_gem9293$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
-	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -DGEMSTATE93                 -xc++ src/gem.cxx.fcs -o $@
-gridflow_gem9393$(PDSUF): src/gem.cxx.fcs $(H) $(COMMON_DEPS)
-	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -DGEMSTATE93 -DIMAGESTRUCT93 -xc++ src/gem.cxx.fcs -o $@
-gridflow_pdp$(PDSUF):     src/pdp.cxx.fcs $(H) $(COMMON_DEPS)
-	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                              -xc++ src/pdp.cxx.fcs -o $@
+gridflow_gem9292$(PDSUF): src/gem.cxx.fcs     $(H) $(COMMON_DEPS)
+	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                               -o $@ -xc++ src/gem.cxx.fcs
+gridflow_gem9293$(PDSUF): src/gem.cxx.fcs     $(H) $(COMMON_DEPS)
+	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -DGEMSTATE93                  -o $@ -xc++ src/gem.cxx.fcs
+gridflow_gem9393$(PDSUF): src/gem.cxx.fcs     $(H) $(COMMON_DEPS)
+	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) -DGEMSTATE93 -DIMAGESTRUCT93  -o $@ -xc++ src/gem.cxx.fcs
+gridflow_pdp$(PDSUF):     src/pdp.cxx.fcs     $(H) $(COMMON_DEPS)
+	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                               -o $@ -xc++ src/pdp.cxx.fcs
+gridflow_unicorn$(PDSUF): src/unicorn.cxx.fcs $(H) $(COMMON_DEPS)
+	$(CXX) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH)                               -o $@ -xc++ src/unicorn.cxx.fcs
 
 beep::
 	@for z in 1 2 3 4 5; do echo -ne '\a'; sleep 1; done

Modified: trunk/src/gridflow.cxx
==============================================================================
--- trunk/src/gridflow.cxx (original)
+++ trunk/src/gridflow.cxx Tue Sep  7 20:17:13 2010
@@ -1069,15 +1069,10 @@
 #ifdef HAVE_GEM
 	try_loading_gem();
 #endif
-	sys_load_lib(0,"gridflow/gridflow_pdp"); // avoid linking directly to [gridflow/gridflow_pdp]
+	sys_load_lib(0,"gridflow/gridflow_pdp");     // avoid linking directly to [gridflow/gridflow_pdp]
+	sys_load_lib(0,"gridflow/gridflow_unicorn"); // avoid linking directly to [gridflow/gridflow_unicorn]
 
 	//sys_gui("bind . <Motion> {puts %W}\n");
-	sys_gui("catch {rename pdtk_canvas_sendkey pdtk_canvas_sendqui\n"
-	  "proc pdtk_canvas_sendkey {name state key iso shift} {\n"
-	  "if {$iso != \"\" && [lsearch {BackSpace Tab Return Escape Space Delete KP_Delete} $iso]<0} {\n"
-	  "  binary scan [encoding convertto $iso] c* bytes\n"
-	  "  foreach byte $bytes {pd [canvastosym $name] key $state [expr {$byte & 255}] $shift \\;}\n"
-	  "} else {pdtk_canvas_sendqui $name $state $key $iso $shift}}}\n");
 #if 0
 	sys_gui("rename pdtk_text_new pdtk_text_nous\n"
 	        "proc pdtk_text_new {a b c d e f g} {pdtk_text_nous $a $b $c $d [encoding convertfrom $e] $f $g}\n"



More information about the Gridflow-cvs mailing list