Changeset 47:130f81975a65 in misc

Timestamp:

11/11/09 02:51:04 (2 years ago)

Author:

Eriol

Branch:

misc

Convert:

svn:e60e002c-0983-44b9-b2ae-8842d539f768/misc@50

Message:

Updated for newer libcaca API (Sam Hocevar)

File:

• snake.py (modified) (8 diffs)

snake.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
 # snake.py
 # Playing with ctypes and libcaca
-# http://mornie.org/blog/2007/03/25/Playing-with-ctypes-and-libcaca/
+# http://mornie.org/blog/2007/03/25/Playng-with-ctypes-and-libcaca/
 #
 # Copyright (C) 2007  Daniele Tricoli aka Eriol <eriol@mornie.org>
@@ -28 +27 @@
 #   Applied patch by Sam Hocevar: check for caca_get_event's return value
 #                                 and added caca_event's missing first member
+# * 25/10/07
+#   Updated for newer libcaca API (Sam Hocevar)
 
 import ctypes as C
@@ -45 +46 @@
 RIGHT = 276
 
-class MOUSE(C.Structure):
-    _fields_ = [('x', C.c_uint),
-                ('y', C.c_uint),
-                ('button', C.c_uint)]
-
-class RESIZE(C.Structure):
-    _fields_ = [('w', C.c_uint),
-                ('h', C.c_uint)]
-
-class KEY(C.Structure):
-    _fields_ = [('ch', C.c_uint),
-                ('utf32', C.c_ulong),
-                ('utf8', C.c_char_p * 8)]
-
-class ev(C.Union):
-    _fields_ = [('type', C.c_uint),
-                ('mouse', MOUSE),
-                ('resize', RESIZE),
-                ('key', KEY)]
+class ev(C.Structure):
+    _fields_ = [('opaque_structure', C.c_char_p * 32)]
 
 class Snake(object):
@@ -95 +79 @@
     def draw(self):
         global cv
-        lcaca.cucul_set_color_ansi(cv, 0x05, 0x00)
+        lcaca.caca_set_color_ansi(cv, 0x05, 0x00)
 
         for p in self.body:
-            lcaca.cucul_put_char(cv, p[0], p[1], ord('o'))
-        lcaca.cucul_set_color_ansi(cv, 0x02, 0x00)
-        lcaca.cucul_put_char(cv, self.head[0], self.head[1], ord('@'))
+            lcaca.caca_put_char(cv, p[0], p[1], ord('o'))
+        lcaca.caca_set_color_ansi(cv, 0x02, 0x00)
+        lcaca.caca_put_char(cv, self.head[0], self.head[1], ord('@'))
         lcaca.caca_refresh_display(dp)
 
@@ -118 +102 @@
     def draw(self):
         global cv
-        lcaca.cucul_set_color_ansi(cv, 0x03, 0x00)
-        lcaca.cucul_put_char(cv, self.x, self.y, ord(str(self.value)))
+        lcaca.caca_set_color_ansi(cv, 0x03, 0x00)
+        lcaca.caca_put_char(cv, self.x, self.y, ord(str(self.value)))
         lcaca.caca_refresh_display(dp)
 
 def draw_border():
-    lcaca.cucul_set_color_ansi(cv, 0x04, 0x00)
-    lcaca.cucul_draw_box(cv,
+    lcaca.caca_set_color_ansi(cv, 0x04, 0x00)
+    lcaca.caca_draw_box(cv,
                          0,
                          0,
@@ -133 +117 @@
 event = ev()
 lcaca = C.cdll.LoadLibrary('libcaca.so.0')
-cv = lcaca.cucul_create_canvas(CANVAS_WIDTH, CANVAS_HEIGHT)
+cv = lcaca.caca_create_canvas(CANVAS_WIDTH, CANVAS_HEIGHT)
 dp = lcaca.caca_create_display(cv)
 lcaca.caca_set_display_title(dp, "snake.py - playing with ctypes and libcaca")
@@ -149 +133 @@
 while True:
     while lcaca.caca_get_event(dp, 0x0001, C.byref(event), 0):
-        if event.key.utf32 == 113: # 'q' pressed
+        ch = lcaca.caca_get_event_key_ch(C.byref(event))
+        if ch == 113: # 'q' pressed
             sys.exit()
-        elif event.key.utf32 == UP:
+        elif ch == UP:
             d = 'UP'
-        elif event.key.utf32 == DOWN:
+        elif ch == DOWN:
             d = 'DOWN'
-        elif event.key.utf32 == LEFT:
+        elif ch == LEFT:
             d = 'LEFT'
-        elif event.key.utf32 == RIGHT:
+        elif ch == RIGHT:
             d = 'RIGHT'
 
@@ -176 +161 @@
         s.grow()
 
-    lcaca.cucul_clear_canvas(cv)
+    lcaca.caca_clear_canvas(cv)
     draw_border()
     s.draw()