Tuio client split into its own package

Author: jcowgar

all.bash

@@ -2,7 +2,7 @@
 
 set -eux
 
-for d in iup iup-glcanvas iup-pplot iup-webbrowser demos 
+for d in iup iup-glcanvas iup-pplot iup-tuio iup-webbrowser demos 
 do
 	gomake -j 4 -C $d "$@"
 done

iup-tuio/Makefile

@@ -0,0 +1,26 @@
+# Copyright (C) 2011 by Jeremy Cowgar <[email protected]>
+# 
+# This file is part of go-iup.
+#
+# go-iup is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+# 
+# go-iup 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 Lesser General Public
+# License along with go-iup.  If not, see <http://www.gnu.org/licenses/>.
+
+# Use "gomake install" to build and install
+
+include $(GOROOT)/src/Make.inc
+
+TARG=github.com/jcowgar/go-iup/tuio
+DEPS=../iup
+CGOFILES=tuio.go
+
+include $(GOROOT)/src/Make.pkg

iup-tuio/tuio.go

@@ -0,0 +1,46 @@
+/* 
+	Copyright (C) 2011 by Jeremy Cowgar <[email protected]>
+
+	This file is part of go-iup.
+
+	go-iup is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as
+	published by the Free Software Foundation, either version 3 of
+	the License, or (at your option) any later version.
+
+	go-iup 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 Lesser General Public
+	License along with go-iup.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package pplot
+
+/*
+#cgo LDFLAGS: -liupcontrols -liuptuio
+#cgo linux LDFLAGS: -liupgtk
+#cgo windows LDFLAGS: -liup -lgdi32 -lole32 -lcomdlg32 -lcomctl32
+
+#include <stdlib.h>
+#include <iup.h>
+#include <iupcontrols.h>
+#include <iuptuio.h>
+*/
+import "C"
+import . "github.com/jcowgar/go-iup"
+
+var tuioLibOpened = false
+
+func TuioClient(port int) *Ihandle {
+	OpenControlLib()
+	
+	if tuioLibOpened == false {
+		C.IupTuioOpen()
+		tuioLibOpened = true
+	}
+	
+	return (*Ihandle)(C.IupTuioClient(C.int(port)))
+}

iup/core.go

@@ -20,7 +20,7 @@
 package iup
 
 /*
-#cgo LDFLAGS: -liupcontrols -liupcd -liuptuio -liupim
+#cgo LDFLAGS: -liupcontrols -liupcd -liupim
 #cgo linux LDFLAGS: -liupgtk
 #cgo windows LDFLAGS: -liup -lgdi32 -lole32 -lcomdlg32 -lcomctl32
 

iup/resources.go

@@ -22,7 +22,6 @@ package iup
 /*
 #include <stdlib.h>
 #include <iup.h>
-#include <iuptuio.h>
 #include <iupim.h>
 */
 import "C"
@@ -206,10 +205,6 @@ func Timer() *Ihandle {
 	return (*Ihandle)(C.IupTimer())
 }
 
-func TuioClient(port int) *Ihandle {
-	return (*Ihandle)(C.IupTuioClient(C.int(port)))
-}
-
 func User() *Ihandle {
 	return (*Ihandle)(C.IupUser())
 }