sigrid/orca

base.h+1−0

@@ -111,6 +111,7 @@ static bool orca_is_valid_glyph(Glyph c) { · 110 unmodified lines
111	case ';':	111	case ';':
112	case '=':	112	case '=':
113	case '?':	113	case '?':
		114	case '$':
114	return true;	115	return true;
115	}	116	}
116	return false;	117	return false;

plan9.c+41−35

 	return false;
 }
+static void
+command(char *s)
+{
+	char *a;
+	int x;
+	if ((a = strchr(s, ':')) != nil)
+		*a++ = 0;
+	if (strcmp(s, "play") == 0)
+		pause = false;
+	else if (strcmp(s, "stop") == 0)
+		pause = true;
+	else if (strcmp(s, "run") == 0)
+		forward = true;
+	else if (a != nil) {
+		x = atoi(a);
+		if (strcmp(s, "bpm") == 0)
+			apm = bpm = MAX(1, x);
+		else if (strcmp(s, "apm") == 0)
+			apm = MAX(1, x);
+		else if (strcmp(s, "frame") == 0)
+			tick = MAX(0, x);
+		else if (strcmp(s, "skip") == 0)
+			tick = MAX(0, tick+x);
+		else if (strcmp(s, "rewind") == 0)
+			tick = MAX(0, tick-x);
+		/* FIXME color, find, select, inject, write, time */
+	}
+}
 static void
 process(Oevent_list *events)
 {
 	int i, off;
 	Oevent *e;
 	u8int u[4];
+	char tmp[64];
 	for (e = events->buffer, i = 0; i < events->count; i++, e++) {
 		if (e->any.oevent_type == Oevent_type_midi_note) {
-			Oevent_midi_note const *n = &e->midi_note;
+			Oevent_midi_note *n = &e->midi_note;
 			u[0] = 1;
 			u[1] = 0x90 | n->channel;
 			u[2] = (n->octave + 1)*12 + n->note;
 			noteoff[off].u[2] = u[2];
 			noteoff[off].u[3] = 0;
 			noteoff[off].at = tick + n->duration;
+		} else if (e->any.oevent_type == Oevent_type_cmd_string) {
+			Oevent_cmd_string *c = &e->cmd_string;
+			memmove(tmp, c->chars, c->count);
+			tmp[c->count] = 0;
+			command(tmp);
 		}
 	}
 	}
 }
-static void
-command(char *s)
-{
-	char *a;
-	int x;
-	if ((a = strchr(s, ':')) != nil)
-		*a++ = 0;
-	if (strcmp(s, "play") == 0)
-		pause = false;
-	else if (strcmp(s, "stop") == 0)
-		pause = true;
-	else if (strcmp(s, "run") == 0)
-		forward = true;
-	else if (a != nil) {
-		x = atoi(a);
-		if (strcmp(s, "bpm") == 0)
-			apm = bpm = MAX(1, x);
-		else if (strcmp(s, "apm") == 0)
-			apm = MAX(1, x);
-		else if (strcmp(s, "frame") == 0)
-			tick = MAX(0, x);
-		else if (strcmp(s, "skip") == 0)
-			tick = MAX(0, tick+x);
-		else if (strcmp(s, "rewind") == 0)
-			tick = MAX(0, tick-x);
-		/* FIXME color, find, select, inject, write, time */
-	}
-}
 void
 threadmain(int argc, char **argv)
 {
 			default:
 				if (key.rune == Kdel || key.rune == ' ')
 					key.rune = '.';
-				if (orca_is_valid_glyph(key.rune)) {
+				if (orca_is_valid_glyph(key.rune) || key.rune == '$') {
 					fieldset(key.rune);
 				} else {
 //					fprint(2, "unhandled key %04x\n", key.rune);

sim.c+28−1

@@ -156,7 +156,8 @@ static void oper_poke_and_stun(Glyph restrict gbuffer, Mark restrict mbuffer, · 155 unmodified lines
156	_(':', midi) \	156	_(':', midi) \
157	_(';', udp) \	157	_(';', udp) \
158	_('=', osc) \	158	_('=', osc) \
159	_('?', midipb)	159	_('?', midipb) \
		160	_('$', cmd)
160		161
161	#define ALPHA_OPERATORS(_) \	162	#define ALPHA_OPERATORS(_) \
162	_('A', add) \	163	_('A', add) \
@@ -393,6 +394,32 @@ BEGIN_OPERATOR(midipb) · 230 unmodified lines
393	oe->lsb = (U8)(index_of(lsb_g) * 127 / 35);	394	oe->lsb = (U8)(index_of(lsb_g) * 127 / 35);
394	END_OPERATOR	395	END_OPERATOR
395		396
		397	BEGIN_OPERATOR(cmd)
		398	Usz n = width - x - 1;
		399	if (n > 16)
		400	n = 16;
		401	Glyph const restrict gline = gbuffer + y width + x + 1;
		402	Mark restrict mline = mbuffer + y width + x + 1;
		403	Glyph cpy[Oevent_cmd_string_count];
		404	Usz i;
		405	for (i = 0; i < n; ++i) {
		406	Glyph g = gline[i];
		407	if (g == '.')
		408	break;
		409	cpy[i] = g;
		410	mline[i] \|= Mark_flag_lock;
		411	}
		412	n = i;
		413	STOP_IF_NOT_BANGED;
		414	Oevent_cmd_string *oe =
		415	(Oevent_cmd_string *)oevent_list_alloc_item(extra_params->oevent_list);
		416	oe->oevent_type = (U8)Oevent_type_cmd_string;
		417	oe->count = (U8)n;
		418	for (i = 0; i < n; ++i) {
		419	oe->chars[i] = cpy[i];
		420	}
		421	END_OPERATOR
		422
396	BEGIN_OPERATOR(add)	423	BEGIN_OPERATOR(add)
397	LOWERCASE_REQUIRES_BANG;	424	LOWERCASE_REQUIRES_BANG;
398	PORT(0, -1, IN \| PARAM);	425	PORT(0, -1, IN \| PARAM);

tui_main.c+12−1

   case '=':
   case '%':
   case '?':
+  case '$':
     return Glyph_class_lowercase;
   case '*':
     return Glyph_class_bang;
       }
       break;
     }
+    case Oevent_type_cmd_string: {
+      Oevent_cmd_string const *ec = &ev->cmd_string;
+      wprintw(win, "CMD\tcount %d\t", (int)ec->count);
+      for (Usz j = 0; j < (Usz)ec->count; ++j) {
+        waddch(win, (chtype)ec->chars[j]);
+      }
+    }
     }
   }
 }
       oosc_send_datagram(oosc_dev, eo->chars, eo->count);
       break;
     }
+    case Oevent_type_cmd_string: {
+      break;
+    }
     }
   }
       {'Z', "lerp", "Transitions operand to target."},
       {'*', "bang", "Bangs neighboring operands."},
       {'#', "comment", "Halts line."},
-      // {'*', "self", "Sends ORCA command."},
       {':', "midi", "Sends MIDI note."},
       {'!', "cc", "Sends MIDI control change."},
       {'?', "pb", "Sends MIDI pitch bend."},
       // {'%', "mono", "Sends MIDI monophonic note."},
       {'=', "osc", "Sends OSC message."},
       {';', "udp", "Sends UDP message."},
+      //{'$', "cmd", "Sends ORCA command."},
   };
   int w_desc = 0;
   for (Usz i = 0; i < ORCA_ARRAY_COUNTOF(items); ++i) {

vmio.h+10−0

   Oevent_type_midi_pb,
   Oevent_type_osc_ints,
   Oevent_type_udp_string,
+  Oevent_type_cmd_string,
 } Oevent_types;
 typedef struct {
   char chars[Oevent_udp_string_count];
 } Oevent_udp_string;
+enum { Oevent_cmd_string_count = 16 };
+typedef struct {
+  U8 oevent_type;
+  U8 count;
+  char chars[Oevent_cmd_string_count];
+} Oevent_cmd_string;
 typedef union {
   Oevent_any any;
   Oevent_midi_note midi_note;
   Oevent_midi_pb midi_pb;
   Oevent_osc_ints osc_ints;
   Oevent_udp_string udp_string;
+  Oevent_cmd_string cmd_string;
 } Oevent;
 typedef struct {

add orca cmd ($ glyph) and support for it on plan9 port

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code