From fe0594bceea6e934fc4697e83e962f66c2c1f95b Mon Sep 17 00:00:00 2001
From: Rui Guo <firemeteor.guo@gmail.com>
Date: Wed, 3 Jun 2009 12:06:05 +0800
Subject: [PATCH] Change the script command to the stlye of 'layout' commands.

---
 src/comm.c    |  5 +----
 src/process.c |  8 ++------
 src/script.c  | 13 ++++++++++++-
 src/script.h  |  1 +
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/comm.c b/src/comm.c
index 45a0b4d..0762f76 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -283,7 +283,7 @@ struct comm comms[RC_LAST + 1] =
   { "resize",		NEED_DISPLAY|ARGS_0|ARGS_ORMORE },
   { "screen",		ARGS_0|ARGS_ORMORE },
 #ifdef SCRIPT
-  { "scriptcall",	ARGS_1|ARGS_ORMORE },
+  { "script",	        ARGS_2|ARGS_ORMORE },
 #endif
 #ifdef COPY_PASTE
   { "scrollback",	NEED_FORE|ARGS_1 },
@@ -300,9 +300,6 @@ struct comm comms[RC_LAST + 1] =
   { "slowpaste",	NEED_FORE|ARGS_01 },
   { "sorendition",      ARGS_012 },
   { "source",		ARGS_1 },
-#ifdef SCRIPT
-  { "sourcescript",	ARGS_1234 },
-#endif
   { "split",		NEED_DISPLAY|ARGS_01 },
   { "startup_message",	ARGS_1 },
   { "stuff",		NEED_LAYER|ARGS_012 },
diff --git a/src/process.c b/src/process.c
index cb615f4..8a87605 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3912,12 +3912,8 @@ int key;
       break;
 
 #ifdef SCRIPT
-    case RC_SCRIPTCALL:
-      LuaCall(args);
-      break;
-
-    case RC_SOURCESCRIPT:
-      ScriptSource(*argl, args);
+    case RC_SCRIPT:
+      ScriptCmd(argc, args);
       break;
 #endif
 
diff --git a/src/script.c b/src/script.c
index 98d1cbb..156ca31 100644
--- a/src/script.c
+++ b/src/script.c
@@ -103,6 +103,17 @@ ScriptSource(int argc, const char **argv)
     LMsg(1, "Could not source specified script %s", script);
 }
 
+void
+ScriptCmd(int argc, const char **argv)
+{
+  const char * sub = *argv;
+  argv++;argc--;
+  if (!strcmp(sub, "call"))
+    LuaCall(argv);
+  else if (!strcmp(sub, "source"))
+    ScriptSource(argc, argv);
+}
+
 /* Event notification handling */
 
 struct gevents {
@@ -143,7 +154,7 @@ get_object_event_queue(char *name, char *obj) {
 
     if (lo >= n || strcmp(name, event_table[lo].name))
       return 0;
-    else
+    else 
       return (struct event *)(obj + event_table[lo].offset);
 }
 
diff --git a/src/script.h b/src/script.h
index 9234509..832838d 100644
--- a/src/script.h
+++ b/src/script.h
@@ -47,6 +47,7 @@ struct binding
 
 void LoadBindings(void);
 void FinializeBindings(void);
+void ScriptCmd __P((int argc, const char **argv));
 
 struct listener {
 
-- 
2.11.4.GIT