X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=virtualvend%2Fvvend.py;h=bb38c589cf4bb84b7bbbf9ec62827ba257c3c3b2;hp=3f38cb587b666241978a86178207c317c1ef19fd;hb=6e3e85b01d6022142568306d542ae842bfec9cf1;hpb=dd2b710681ad0f63c258709fc748cf868863ac0d

diff --git a/virtualvend/vvend.py b/virtualvend/vvend.py
index 3f38cb5..bb38c58 100644
--- a/virtualvend/vvend.py
+++ b/virtualvend/vvend.py
@@ -22,6 +22,8 @@ except:
   print "/usr/local/lib/python2.2/site-packages/"
   sys.exit(1)
 
+import pango
+
 #now we have both gtk and gtk.glade imported
 #Also, we know we are running GTK v2
 
@@ -58,6 +60,8 @@ class appgui:
         "on_vvend_delete_event" : self.quit }
     self.wTree.signal_autoconnect (dic)
     display = self.wTree.get_widget("label1")
+    label_font = pango.FontDescription('monospace 28')
+    display.modify_font(label_font)
     display.set_text("*5N4CK0RZ*")
 
     # vending machine password set here
@@ -81,13 +85,22 @@ class appgui:
 
 
     return
-  
+
+    def __del__(self):
+    	try:
+	    self.sock.close()
+	    self.sock.shutdown()
+	except:
+	    pass
+
 #####CALLBACKS
   def keypad_clicked(self,widget):
-    print "button clicked"
-    print widget.get_label()
-    self.do_send(widget.get_label())
-    sys.stdout.write("\a")
+    key = widget.get_label()
+    if key == 'RESET':
+    	key = '11'
+    else:
+    	key = '0'+key
+    self.do_send('2'+key+' keypress\n')
 
   def handleNewConnection(self,source,condition):
     #source is a socket in GTK v 1 and a fd in version 2
@@ -119,6 +132,7 @@ class appgui:
      port = 5150
 
      self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+     self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
      self.sock.bind(('localhost', port))
      self.sock.listen(0)
      print "listening on ", port
@@ -235,30 +249,32 @@ Mark Tearle, June 2004
 
   def do_vend_all(self):
      for i in range(11,99):
-     	self.do_send("101 Vending ",i)
-     	self.do_send("153 Home sensors failing")
-     self.do_send("102 Vend all motors complete")
+     	self.do_send("101 Vending "+str(i)+"\n")
+     	self.do_send("153 Home sensors failing\n")
+     self.do_send("102 Vend all motors complete\n")
   
   def do_vend(self,command):
      fail = None
      if fail:
-     	self.do_send("153 Home sensors failing")
+     	self.do_send("153 Home sensors failing\n")
      else:
-        self.insert("Vending ",command)
-     	self.do_send("100 Vend successful")
+        self.insert("Vending "+command)
+     	self.do_send("100 Vend successful\n")
     
   def do_display(self,string):
      display = self.wTree.get_widget("label1")
-     display.set_text("%10.10s" % (string))
+     display.set_text("%-10.10s" % (string))
+     self.do_send('300 Written\n')
 
   def do_beep(self,command):
      sys.stdout.write("\a")
+     self.do_send('500 Beeped\n')
 
   def do_silence(self,command):
      pass
 
   def do_switches(self):
-     pass
+     self.do_send("600 3F 3F\n")
 
   def do_pong(self):
      self.do_send("000 PONG!\n")