Attempt to add {SKIP:N} control code

Signed-off-by: Joachim Wiberg <[email protected]>

Author: troglobit

demo.c

@@ -912,11 +912,17 @@ void render_raining_logo(DemoContext *ctx)
 	}
 }
 
+/* Helper to calculate spaces generated by SKIP command */
+static int calculate_skip_spaces(float skip_screens)
+{
+	return (int)(skip_screens * (WIDTH / 35.0f));
+}
+
 /* Build a map of control code positions in the stripped text */
 typedef struct {
 	int position;  /* Character position in stripped text */
 	float pixel_position;  /* Pixel position based on actual glyph widths */
-	char type;     /* P=pause, S=speed, T=style, C=color */
+	char type;     /* P=pause, S=speed, T=style, C=color, K=skip */
 	char data[64]; /* Parameter data */
 } ControlCode;
 
@@ -963,6 +969,14 @@ static void build_control_map(const char *text)
 						cc->type = 'C';
 						strncpy(cc->data, cmd + 6, 63);
 						num_control_codes++;
+					} else if (strncmp(cmd, "SKIP:", 5) == 0) {
+						/* SKIP is added to control codes for pixel position calculation */
+						cc->type = 'K';
+						strncpy(cc->data, cmd + 5, 63);
+						num_control_codes++;
+						/* Advance char_pos by the spaces that SKIP will insert */
+						float skip_screens = atof(cmd + 5);
+						char_pos += calculate_skip_spaces(skip_screens);
 					}
 				}
 				p = end + 1;
@@ -1041,11 +1055,25 @@ static void apply_scroll_controls(DemoContext *ctx, float scroll_offset)
 	last_offset = scroll_offset;
 
 	/* Apply control codes that we've just reached (not yet triggered) */
-	/* Offset to delay trigger - adjust this value to find the right timing */
-	const float trigger_offset = 500.0f;  /* Try WIDTH as starting point */
-
 	for (int i = 0; i < num_control_codes; i++) {
 		ControlCode *cc = &control_codes[i];
+		float trigger_offset = 0.0f;
+
+		/* Different trigger offsets for different control code types */
+		switch (cc->type) {
+		case 'P':			 /* PAUSE */
+			trigger_offset = 500.0f;
+			break;
+		case 'S':			 /* SPEED */
+			trigger_offset = 500.0f;
+			break;
+		case 'T':			/* STYLE */
+			trigger_offset = 500.0f;
+			break;
+		case 'C':			/* COLOR */
+			trigger_offset = 500.0f;
+			break;
+		}
 
 		/* Trigger when we pass the pixel position plus offset (only once) */
 		if (!triggered[i] && scroll_offset >= cc->pixel_position + trigger_offset) {
@@ -1102,18 +1130,57 @@ static char *strip_control_codes(const char *text)
 	if (!text)
 		return NULL;
 
-	int len = strlen(text);
-	char *result = malloc(len + 1);
+	/* First pass: calculate required size accounting for SKIP expansions */
+	int expanded_len = 0;
+	const char *p = text;
+	while (*p) {
+		if (*p == '{') {
+			const char *end = strchr(p, '}');
+			if (end) {
+				int cmd_len = end - p - 1;
+				char cmd[64] = {0};
+				if (cmd_len > 0 && cmd_len < 64) {
+					strncpy(cmd, p + 1, cmd_len);
+					/* Check if this is a SKIP command */
+					if (strncmp(cmd, "SKIP:", 5) == 0) {
+						float skip_screens = atof(cmd + 5);
+						expanded_len += calculate_skip_spaces(skip_screens);
+					}
+				}
+				p = end + 1;
+				continue;
+			}
+		}
+		expanded_len++;
+		p++;
+	}
+
+	/* Allocate result with room for expansions */
+	char *result = malloc(expanded_len + 1);
 	if (!result)
 		return NULL;
 
+	/* Second pass: copy text and expand SKIP commands */
 	const char *src = text;
 	char *dst = result;
 
 	while (*src) {
 		if (*src == '{') {
 			const char *end = strchr(src, '}');
 			if (end) {
+				int cmd_len = end - src - 1;
+				char cmd[64] = {0};
+				if (cmd_len > 0 && cmd_len < 64) {
+					strncpy(cmd, src + 1, cmd_len);
+					/* Expand SKIP into spaces */
+					if (strncmp(cmd, "SKIP:", 5) == 0) {
+						float skip_screens = atof(cmd + 5);
+						int spaces = calculate_skip_spaces(skip_screens);
+						for (int i = 0; i < spaces; i++) {
+							*dst++ = ' ';
+						}
+					}
+				}
 				src = end + 1;
 				continue;
 			}

scroll.txt

@@ -1,4 +1,4 @@
-{STYLE:bottom}{SPEED:400}
+{SPEED:400}{STYLE:bottom}
 
 
 

scroll2.txt

@@ -0,0 +1,18 @@
+{STYLE:bottom}Welcome to...   the Infix Demo!{PAUSE:2}
+
+
+
+Now scrolling... FAST!
+{SKIP:1}
+{STYLE:roller}Now with 3D roller!{PAUSE:1.5}
+{SKIP:1}
+{COLOR:255,0,0}
+RED
+{SKIP:1}
+{COLOR:0,255,0}
+GREEN
+{SKIP:1}
+{COLOR:0,0,255}
+BLUE
+{SKIP:1}
+{COLOR:0,0,0}{STYLE:wave}Back to waves...    Greetings to the demoscene! <3    

scroll3.txt

@@ -0,0 +1,20 @@
+{STYLE:bottom}Welcome to...   the Infix Demo!{PAUSE:2}
+{SPEED:400}
+
+
+
+Now scrolling... FAST!{SPEED:800}
+{SKIP:1}
+{SPEED:400}
+{STYLE:roller}Now with 3D roller!{PAUSE:1.5}
+{SKIP:1}
+{COLOR:255,0,0}
+RED
+{SKIP:1}
+{COLOR:0,255,0}
+GREEN
+{SKIP:1}
+{COLOR:0,0,255}
+BLUE
+{SKIP:1}
+{COLOR:0,0,0}{STYLE:wave}Back to waves...    Greetings to the demoscene! <3