[Gridflow-cvs] [svn] commit: r6424 - in /trunk/src: gridflow.cxx x11.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Tue Oct 19 22:47:52 EDT 2010


Author: matju
Date: Tue Oct 19 22:47:51 2010
New Revision: 6424

Log:
missing commit, mostly about separate loading of x11 (this just fixes what was broken, it doesn't make the feature work)

Modified:
    trunk/src/gridflow.cxx
    trunk/src/x11.cxx

Modified: trunk/src/gridflow.cxx
==============================================================================
--- trunk/src/gridflow.cxx (original)
+++ trunk/src/gridflow.cxx Tue Oct 19 22:47:51 2010
@@ -1095,6 +1095,7 @@
 	startup_format();
 	STARTUP_LIST()
 	// avoid linking directly to those parts (cross-platform optional-linkage)
+	sys_load_lib(0,"gridflow/gridflow_x11");
 	sys_load_lib(0,"gridflow/gridflow_gem_loader");
 	sys_load_lib(0,"gridflow/gridflow_pdp");     
 	sys_load_lib(0,"gridflow/gridflow_unicorn");

Modified: trunk/src/x11.cxx
==============================================================================
--- trunk/src/x11.cxx (original)
+++ trunk/src/x11.cxx Tue Oct 19 22:47:51 2010
@@ -405,10 +405,8 @@
 			XExposeEvent &ex = e.xexpose;
 			if (mode==2) show_section(ex.x,ex.y,ex.width,ex.height);
 		}break;
-		case ButtonPress:  {XButtonEvent &eb = e.xbutton; eb.state |=   128<<eb.button ;
-			report_pointer(eb.y,eb.x,eb.state);}break;
-		case ButtonRelease:{XButtonEvent &eb = e.xbutton; eb.state &= ~(128<<eb.button);
-			report_pointer(eb.y,eb.x,eb.state);}break;
+		case ButtonPress:  {XButtonEvent &eb = e.xbutton; report_pointer(eb.y,eb.x,eb.state | (128<<eb.button));}break;
+		case ButtonRelease:{XButtonEvent &eb = e.xbutton; report_pointer(eb.y,eb.x,eb.state &~(128<<eb.button));}break;
 		case KeyPress:
 		case KeyRelease:{
 			XKeyEvent &ek = e.xkey;
@@ -693,8 +691,9 @@
 	return target;
 }
 
-\end class FormatX11 {install_format("#io.x11",6,"");}
-void startup_x11 () {
+\end class FormatX11 {post("FormatX11 \\startup"); install_format("#io.x11",6,"");}
+extern "C" void gridflow_x11_setup () {
+	post("startup_x11");
 	\startall
 }
 



More information about the Gridflow-cvs mailing list