added EJ command: return runtime properties

 * main motivation is to have a way of getting the number of buffers
   in the ring. "EJ" or "1EJ" will do that.
   This simplifies macros that will have to iterate all the buffers.
   They no longer have to close the existing buffers to do that.
 * "0EJ" will get the current user interface. This is useful to select
   a different color scheme in the startup profile depending on the UI,
   for instance.

3 files changed, 74 insertions, 0 deletions

diff --git a/src/parser.cpp b/src/parser.cpp
index 6995a6b..66b46c4 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1890,6 +1890,63 @@ StateECommand::custom(gchar chr)
 		break;
 
 	/*$
+	 * [key]EJ -> value -- Get and set system properties
+	 * -EJ -> value
+	 * value,keyEJ
+	 *
+	 * This command may be used to get and set system
+	 * properties.
+	 * With one argument, it retrieves a numeric property
+	 * identified by \fIkey\fP.
+	 * If \fIkey\fP is omitted, the prefix sign is implied
+	 * (1 or -1).
+	 * With two arguments, it sets property \fIkey\fP to
+	 * \fIvalue\fP and returns nothing. Currently, there
+	 * are no properties that can be set.
+	 *
+	 * The following property keys are defined:
+	 * .IP 0 4
+	 * The current user interface: 1 for Curses, 2 for GTK
+	 * .IP 1
+	 * The current numbfer of buffers: Also the numeric id
+	 * of the last buffer in the ring. This is implied if
+	 * no argument is given, so \(lqEJ\(rq returns the number
+	 * of buffers in the ring.
+	 */
+	case 'J': {
+		BEGIN_EXEC(&States::start);
+
+		tecoInt property;
+
+		expressions.eval();
+		property = expressions.pop_num_calc();
+		if (expressions.args() > 0)
+			throw Error("Cannot set property %" TECO_INTEGER_FORMAT
+			            " for <EJ>", property);
+
+		switch (property) {
+		case 0: /* user interface */
+#ifdef INTERFACE_CURSES
+			expressions.push(1);
+#elif defined(INTERFACE_GTK)
+			expressions.push(2);
+#else
+#error Missing value for current interface!
+#endif
+			break;
+
+		case 1: /* number of buffers */
+			expressions.push(ring.get_id(ring.last()));
+			break;
+
+		default:
+			throw Error("Invalid property %" TECO_INTEGER_FORMAT
+			            " for <EJ>", property);
+		}
+		break;
+	}
+
+	/*$
 	 * [bool]EX -- Exit program
 	 * -EX
 	 *
diff --git a/src/ring.cpp b/src/ring.cpp
index 03cda37..fdd8206 100644
--- a/src/ring.cpp
+++ b/src/ring.cpp
@@ -173,6 +173,21 @@ Ring::UndoTokenEdit::run(void)
 	buffer = NULL;
 }
 
+tecoInt
+Ring::get_id(Buffer *buffer)
+{
+	tecoInt ret = 0;
+	Buffer *cur;
+
+	TAILQ_FOREACH(cur, &head, buffers) {
+		ret++;
+		if (cur == buffer)
+			break;
+	}
+
+	return ret;
+}
+
 Buffer *
 Ring::find(const gchar *filename)
 {
diff --git a/src/ring.h b/src/ring.h
index b9e9ced..5dc3a37 100644
--- a/src/ring.h
+++ b/src/ring.h
@@ -186,6 +186,8 @@ public:
 		return TAILQ_LAST(&head, Head);
 	}
 
+	tecoInt get_id(Buffer *buffer);
+
 	Buffer *find(const gchar *filename);
 	Buffer *find(tecoInt id);