Changeset 1032 for trunk

Timestamp:

01/09/11 00:38:10 (2 years ago)

Author:

reyalP

Message:

script key handling rework from ultima in ​http://chdk.setepontos.com/index.php?topic=5793.msg59376#msg59376

Location:

trunk/core

Files:

• action_stack.c (modified) (1 diff)
• action_stack.h (modified) (1 diff)
• kbd.c (modified) (1 diff)
• luascript.c (modified) (1 diff)
• script.c (modified) (2 diffs)

trunk/core/action_stack.c

@@ -143 +143 @@
 }
 
+void action_wait_for_click(int timeout)
+{
+    action_push(timeout);
+    action_push(AS_WAIT_CLICK);
+}
+
 // Can only be called from an action stack
 void action_push(long p)

trunk/core/action_stack.h

@@ -30 +30 @@
 void action_push_release(long key);
 void action_push_click(long key);
+void action_wait_for_click(int timeout);
 void action_pop();
 long action_get_prev(int p);

trunk/core/kbd.c

@@ -107 +107 @@
 #endif
 
-void camera_press(const char *s)
-{
-    long k = keyid_by_name(s);
-    if (k > 0) {
-        action_push_press(k);
-    } else {
-        ubasic_error = 3;
-    }
-}
-
-void camera_release(const char *s)
-{
-    long k = keyid_by_name(s);
-    if (k > 0) {
-        action_push_release(k);
-    } else {
-        ubasic_error = 3;
-    }
-}
-
-void camera_click(const char *s)
-{
-    long k = keyid_by_name(s);
-    if (k > 0) {
-        action_push_click(k);
-    } else {
-        ubasic_error = 3;
-    }
-}
-
-void camera_wait_click(int timeout)
-{
-    action_push(timeout);
-    action_push(AS_WAIT_CLICK);
-}
-
-int camera_is_pressed(const char *s)
-{
-    long k = keyid_by_name(s);
-    if (k==0xFF) return get_usb_power(1);
-        if (k > 0) {
-        return (kbd_is_key_pressed(k));
-    } else {
-        ubasic_error = 3;
-    }
-    return 0;
-}
-
-int camera_is_clicked(const char *s)
-{
-    long k = keyid_by_name(s);
-    if (k==0xFF) return get_usb_power(1);
-        if (k > 0) {
-        return (kbd_last_clicked == k);
-    } else {
-        ubasic_error = 3;
-    }
-    return 0;
-}
-
-void camera_sleep(long v)
-{
-    action_push_delay(v);
-}
-
-void camera_shoot()
-{
-    action_push(AS_SHOOT);
-}
 // remote autostart
 void script_autostart()

trunk/core/luascript.c

@@ -510 +510 @@
 {
   int timeout = luaL_optnumber( L, 1, 0 );
-  camera_wait_click(timeout);
+  action_wait_for_click(timeout);
   return lua_yield( L, 0 );
 }

trunk/core/script.c

@@ -10 +10 @@
 #include "action_stack.h"
 #include "luascript.h"
+#include "lauxlib.h"
 #include "motion_detector.h"
 #include "shot_histogram.h"
@@ -651 +652 @@
 }
 
+int camera_is_pressed(const char *s)
+{
+    long k = keyid_by_name(s);
+    if (k==0xFF) return get_usb_power(1);
+    if (k > 0) {
+        return (kbd_is_key_pressed(k));
+    } else {
+        if (is_lua())
+            luaL_error( L, "unknown key" );
+        else
+            ubasic_error = UBASIC_E_UNK_KEY;
+    }
+    return 0;
+}
+
+int camera_is_clicked(const char *s)
+{
+    long k = keyid_by_name(s);
+    if (k==0xFF) return get_usb_power(1);
+    if (k > 0) {
+        return (kbd_last_clicked == k);
+    } else {
+        if (is_lua())
+            luaL_error( L, "unknown key" );
+        else
+            ubasic_error = UBASIC_E_UNK_KEY;
+    }
+    return 0;
+}
+
+
+void camera_press(const char *s)
+{
+    // For Lua, luaCB_keyfunc handles this command.
+
+    long k = keyid_by_name(s);
+    if (k > 0) {
+        action_push_press(k);
+    } else {
+        ubasic_error = UBASIC_E_UNK_KEY;
+    }
+}
+
+void camera_release(const char *s)
+{
+    // For Lua, luaCB_keyfunc handles this command.
+
+    long k = keyid_by_name(s);
+    if (k > 0) {
+        action_push_release(k);
+    } else {
+        ubasic_error = UBASIC_E_UNK_KEY;
+    }
+}
+
+void camera_click(const char *s)
+{
+    // For Lua, luaCB_keyfunc handles this command.
+
+    long k = keyid_by_name(s);
+    if (k > 0) {
+        action_push_click(k);
+    } else {
+        ubasic_error = UBASIC_E_UNK_KEY;
+    }
+}
+
+void camera_shoot()
+{
+    action_push(AS_SHOOT);
+}
+
+void camera_sleep(long v)
+{
+    action_push_delay(v);
+}
+
+void camera_wait_click(int t)
+{
+    action_wait_for_click(t);
+}
+