impl: The selection_code variable is now compressed by default

IoeCmcomc · IoeCmcomc · commit ee3288c8b0b4 · 2024-04-22T14:37:35.000+07:00
- This should reduce memory usage when there is a selection and reduce the amount of `try_compress_selection()` calls;
- Add a new function `macro_column_count()` to replace `string_count("-1", ...)` in some macros;
- The selection code will be decompressed when exporting to a pattern file or displaying in the "Secret clipboard editor" dialog.
diff --git a/scripts/action_paste/action_paste.gml b/scripts/action_paste/action_paste.gml
@@ -4,7 +4,7 @@ function action_paste(argument0, argument1) {
 	xx = argument0
 	yy = argument1
 	selection_load(xx, yy, selection_copied, false)
-	history_set(h_selectpaste, xx, yy, try_compress_selection(selection_code))
+	history_set(h_selectpaste, xx, yy, selection_code)
 	changed = 1
 
 
diff --git a/scripts/buffer_pos_char/buffer_pos_char.gml b/scripts/buffer_pos_char/buffer_pos_char.gml
@@ -1,10 +1,7 @@
-function buffer_pos_char(argument0, argument1, argument2){
+function buffer_pos_char(buffer, buffer_size, char){
 	// Find the position of a character in a text buffer, optionally from a start position.
 	// Return the buffer length if not found.
 	
-	var buffer = argument0
-	var buffer_size = argument1
-	var char = argument2
 	if (is_string(char)) {
 		char = ord(char)
 	}
diff --git a/scripts/buffer_substr_copy/buffer_substr_copy.gml b/scripts/buffer_substr_copy/buffer_substr_copy.gml
@@ -1,11 +1,6 @@
-function buffer_substr_copy(argument0, argument1, argument2, argument3){
+function buffer_substr_copy(buffer, pos, size, text_buffer){
 	// Copy a sub-string from a buffer to a text buffer and return the extracted string
-	
-	var buffer = argument0
-	var pos = argument1
-	var size = argument2
-	var text_buffer = argument3
-	
+		
 	buffer_resize(text_buffer, size)
 	buffer_copy(buffer, pos, size, text_buffer, 0)
 	var str = buffer_read(text_buffer, buffer_string)
diff --git a/scripts/draw_window_clip_editor/draw_window_clip_editor.gml b/scripts/draw_window_clip_editor/draw_window_clip_editor.gml
@@ -22,7 +22,7 @@ function draw_window_clip_editor() {
 	else draw_areaheader(x1 + 22, y1 + 48, 396, 330, "剪贴板")
 	draw_theme_color()
 	//text_exists[59] = 0
-	selection_copied = draw_text_edit(59, selection_copied, x1 + 32, y1 + 23 * 3, 370, 300, 0, 0) 
+	selection_copied = try_compress_selection(draw_text_edit(59, try_decompress_selection(selection_copied), x1 + 32, y1 + 23 * 3, 370, 300, 0, 0))
 
 	if (draw_button2(x1 + 320, y1 + 398, 72, condstr(language != 1, "OK", "确定")) && (windowopen = 1 || theme != 3)) {
 		windowclose = 1
diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml
@@ -65,7 +65,7 @@ function draw_window_macro_arpeggio() {
 		}
 		var new_str = array_to_selection(arr_data, total_vals)
 		selection_load_ext(selection_x, selection_y, new_str)
-		history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
diff --git a/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml b/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml
@@ -29,13 +29,12 @@ function draw_window_macro_portamento() {
 		windowalpha = 0
 		windowclose = 0
 		windowopen = 0
+		window = 0
 		str = selection_code
-		val = 0
-		decr = port_cent / string_count("-1", str)
-		inc = decr
 		var arr_data = selection_to_array(str)
-		window = 0
 		total_vals = array_length(arr_data)
+		decr = port_cent / macro_column_count(arr_data)
+		inc = decr
 		val = 0
 		while (val < total_vals) {
 			val += 6
@@ -57,7 +56,7 @@ function draw_window_macro_portamento() {
 		}
 		var new_str = array_to_selection(arr_data, total_vals)
 		selection_load_ext(selection_x, selection_y, new_str)
-		history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
diff --git a/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml b/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml
@@ -31,7 +31,6 @@ function draw_window_macro_setvelocity() {
 		windowclose = 0
 		windowopen = 0
 		window = 0
-		str = selection_code
 		if (!percentvel) {
 			selection_change(m_vel, setvel, false)
 		} else {
@@ -47,7 +46,7 @@ function draw_window_macro_setvelocity() {
 			    }
 			}
 			selection_code_update()
-			history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+			history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		}
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml
@@ -88,7 +88,7 @@ function draw_window_macro_stagger() {
 		}
 		var new_str = array_to_selection(arr_data, total_vals)
 		selection_load(selection_x, selection_y, new_str, true)
-		history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 75, y1 + 128, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
diff --git a/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml b/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml
@@ -69,7 +69,7 @@ function draw_window_macro_stereo() {
 		}
 		var new_str = array_to_selection(arr_data, total_vals)
 		selection_load_ext(selection_x, selection_y, new_str)
-		history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
diff --git a/scripts/macro_chorus/macro_chorus.gml b/scripts/macro_chorus/macro_chorus.gml
@@ -43,7 +43,7 @@ function macro_chorus() {
 	}
 	var new_str = array_to_selection(arr_data, total_vals)
 	selection_load_ext(selection_x, selection_y, new_str)
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
 
diff --git a/scripts/macro_column_count/macro_column_count.gml b/scripts/macro_column_count/macro_column_count.gml
@@ -0,0 +1,13 @@
+function macro_column_count(arr_data, length = undefined){
+	if (is_undefined(length)) {
+		length = array_length(arr_data)
+	}
+	
+	var count = 0
+	for (var i = 0; i < length; ++i) {
+		if (arr_data[i] == -1) {
+			++count
+		}
+	}
+	return count
+}
diff --git a/scripts/macro_column_count/macro_column_count.yy b/scripts/macro_column_count/macro_column_count.yy
diff --git a/scripts/macro_fadein/macro_fadein.gml b/scripts/macro_fadein/macro_fadein.gml
@@ -7,9 +7,9 @@ function macro_fadein() {
 	total_vals = array_length(arr_data)
 	val = 0
 	// Check bottom-right note block's velocity value, calculate fade out from that.
-	velval = array_length_1d(arr_data)
+	velval = array_length(arr_data)
 	maxdecr = arr_data[velval-4]
-	decr = maxdecr/string_count("-1", str)
+	decr = maxdecr/macro_column_count(arr_data)
 	show_debug_message(string(maxdecr))
 	inc = decr
 	//show_debug_message(string_count("-1", str))
@@ -28,7 +28,7 @@ function macro_fadein() {
 	}
 	var new_str = array_to_selection(arr_data, total_vals)
 	selection_load_ext(selection_x, selection_y, new_str)
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
 
diff --git a/scripts/macro_fadeout/macro_fadeout.gml b/scripts/macro_fadeout/macro_fadeout.gml
@@ -8,7 +8,7 @@ function macro_fadeout() {
 	val = 0
 	// Check top-left note block's velocity value, calculate fade out from that.
 	maxdecr = arr_data[4]
-	decr = maxdecr/string_count("-1", str)
+	decr = maxdecr/macro_column_count(arr_data)
 	inc = decr
 	//show_debug_message(string_count("-1", str))
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
@@ -26,7 +26,7 @@ function macro_fadeout() {
 	}
 	var new_str = array_to_selection(arr_data, total_vals)
 	selection_load_ext(selection_x, selection_y, new_str)
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
 
diff --git a/scripts/macro_reset/macro_reset.gml b/scripts/macro_reset/macro_reset.gml
@@ -14,6 +14,6 @@ function macro_reset() {
 	    }
 	}
 	selection_code_update()
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 }
diff --git a/scripts/macro_tremolo/macro_tremolo.gml b/scripts/macro_tremolo/macro_tremolo.gml
@@ -6,7 +6,7 @@ function macro_tremolo() {
 	var arr_temp = selection_to_array(str)
 	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
-	total_cols = string_count("-1", str)
+	total_cols = macro_column_count(arr_temp)
 	//show_debug_message("total cols is "+string(total_cols))
 	val = 0
 	c = 0
diff --git a/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml b/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml
@@ -6,7 +6,7 @@ function macro_tremolo_fadein() {
 	var arr_temp = selection_to_array(str)
 	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
-	total_cols = string_count("-1", str)
+	total_cols = macro_column_count(arr_temp)
 	//show_debug_message("total cols is "+string(total_cols))
 	val = 0
 	c = 0
@@ -45,7 +45,7 @@ function macro_tremolo_fadein() {
 		}
 	    // show_debug_message("End loop. arr_data is now " + string(array_to_selection(arr_data, c)))
 		colcount++
-		current_colsegment = string_count("-1", string(array_to_selection(arr_data, c))) - previous_colsegment
+		current_colsegment = macro_column_count(arr_data, c) - previous_colsegment
 		tremolo_duration = (real(array_length(arr_data)) - prevlength) // Calculate Fade-In
 		f = 0
 		if fade_auto = 1 {
@@ -83,7 +83,7 @@ function macro_tremolo_fadein() {
 	var new_str = array_to_selection(arr_data, c)
 	arr_data = 0
 	selection_load(selection_x, selection_y, new_str, true)
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
 
diff --git a/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml b/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml
@@ -6,7 +6,7 @@ function macro_tremolo_fadeout() {
 	var arr_temp = selection_to_array(str)
 	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
-	total_cols = string_count("-1", str)
+	total_cols = macro_column_count(arr_temp)
 	//show_debug_message("total cols is "+string(total_cols))
 	val = 0
 	c = 0
@@ -45,8 +45,8 @@ function macro_tremolo_fadeout() {
 		}
 	    // show_debug_message("End loop. arr_data is now " + string(array_to_selection(arr_data, c)))
 		colcount++
-		current_colsegment = string_count("-1", string(array_to_selection(arr_data, c))) - previous_colsegment
-		tremolo_duration = (real(array_length_1d(arr_data)) - prevlength) // Calculate Fade-In
+		current_colsegment = macro_column_count(arr_data, c) - previous_colsegment
+		tremolo_duration = (real(array_length(arr_data)) - prevlength) // Calculate Fade-In
 		f = 0
 		if fade_auto = 1 {
 			if (current_colsegment - 4 > 0) decr = 100 / (current_colsegment - 4)
@@ -70,7 +70,7 @@ function macro_tremolo_fadeout() {
 			decr = decr + inc
 			f ++
 		}
-		prevlength = real(array_length_1d(arr_data))
+		prevlength = real(array_length(arr_data))
 		previous_colsegment += current_colsegment
 		decr = 0
 		inc = 0
diff --git a/scripts/macro_velocitylfo/macro_velocitylfo.gml b/scripts/macro_velocitylfo/macro_velocitylfo.gml
@@ -6,7 +6,7 @@ function macro_velocitylfo() {
 	var arr_data = selection_to_array(str)
 	total_vals = array_length(arr_data)
 	val = 0
-	decr = 100/string_count("-1", str)
+	decr = 100/macro_column_count(arr_data)
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
 	while (val < total_vals) {
 		// First column 100
@@ -60,7 +60,7 @@ function macro_velocitylfo() {
 	}
 	var new_str = array_to_selection(arr_data, total_vals)
 	selection_load_ext(selection_x, selection_y, new_str)
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
 
diff --git a/scripts/macro_vibrato/macro_vibrato.gml b/scripts/macro_vibrato/macro_vibrato.gml
@@ -6,7 +6,7 @@ function macro_vibrato() {
 	var arr_data = selection_to_array(str)
 	total_vals = array_length(arr_data)
 	val = 0
-	decr = 100/string_count("-1", str)
+	decr = 100/macro_column_count(arr_data)
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
 	while (val < total_vals) {
 		// First column 100
@@ -51,7 +51,7 @@ function macro_vibrato() {
 	}
 	var new_str = array_to_selection(arr_data, total_vals)
 	selection_load_ext(selection_x, selection_y, new_str)
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
 
diff --git a/scripts/pattern_export/pattern_export.gml b/scripts/pattern_export/pattern_export.gml
@@ -19,7 +19,8 @@ function pattern_export() {
 	//	show_debug_message("endb " + string(endb))
 	buffer_write_short(selection_l)
 	//	show_debug_message("selection_l " + string(selection_l))
-	buffer_write_string(selection_code)
+	// The selection code will be decompressed to keep the file compatible with older versions
+	buffer_write_string(try_decompress_selection(selection_code))
 	//	show_debug_message("selection_code " + string(selection_code))
 	
 	for (a = 0; a < selection_l; a ++) {
diff --git a/scripts/select_all/select_all.gml b/scripts/select_all/select_all.gml
@@ -61,7 +61,7 @@ function select_all(argument0, argument1) {
 	selection_h = endb + 1
 	selection_trim()
 	selection_code_update()
-	history_set(h_select, selection_x, selection_y, try_compress_selection(selection_code), x1, y1, try_compress_selection(str))
+	history_set(h_select, selection_x, selection_y, selection_code, x1, y1, str)
 
 
 
diff --git a/scripts/select_custom/select_custom.gml b/scripts/select_custom/select_custom.gml
@@ -56,7 +56,7 @@ function select_custom() {
 	selection_code_update()
 	starta = selection_x
 	sb_val[0] = starta
-	history_set(h_select, selection_x, selection_y, try_compress_selection(selection_code), 0, 0, try_compress_selection(str))
+	history_set(h_select, selection_x, selection_y, selection_code, 0, 0, str)
 
 
 
diff --git a/scripts/select_outside/select_outside.gml b/scripts/select_outside/select_outside.gml
@@ -56,7 +56,7 @@ function select_outside(argument0, argument1) {
 	selection_code_update()
 	starta = selection_x
 	sb_val[0] = starta
-	history_set(h_select, selection_x, selection_y, try_compress_selection(selection_code), 0, 0, try_compress_selection(selection_code))
+	history_set(h_select, selection_x, selection_y, selection_code, 0, 0, selection_code)
 
 
 
diff --git a/scripts/selection_change/selection_change.gml b/scripts/selection_change/selection_change.gml
@@ -59,7 +59,7 @@ function selection_change(argument0, argument1, argument2) {
 	    }
 	}
 	selection_code_update()
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 
 
 
diff --git a/scripts/selection_changeins/selection_changeins.gml b/scripts/selection_changeins/selection_changeins.gml
@@ -14,7 +14,7 @@ function selection_changeins(argument0) {
 	    }
 	}
 	selection_code_update()
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 
 
 
diff --git a/scripts/selection_code_update/selection_code_update.gml b/scripts/selection_code_update/selection_code_update.gml
@@ -48,6 +48,6 @@ function selection_code_update() {
 	}
 
 	buffer_seek(str_buffer, buffer_seek_start, 0)
-	selection_code = buffer_read(str_buffer, buffer_string)
+	selection_code = try_compress_selection(buffer_read(str_buffer, buffer_string))
 	buffer_delete(str_buffer)
 }
diff --git a/scripts/selection_compress/selection_compress.gml b/scripts/selection_compress/selection_compress.gml
@@ -87,7 +87,7 @@ function selection_compress() {
 	selection_l = nw + 1
 	selection_h = nh + 1
 	selection_code_update()
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 
 
 
diff --git a/scripts/selection_delete/selection_delete.gml b/scripts/selection_delete/selection_delete.gml
@@ -33,7 +33,7 @@ function selection_delete(argument0) {
 	    }
 	}
 	selected = 0
-	if (!argument0) history_set(h_selectchange, 0, 0, "", selection_x, selection_y, try_compress_selection(selection_code))
+	if (!argument0) history_set(h_selectchange, 0, 0, "", selection_x, selection_y, selection_code)
 	selection_code = ""
 	selection_x = 0
 	selection_y = 0
diff --git a/scripts/selection_expand/selection_expand.gml b/scripts/selection_expand/selection_expand.gml
@@ -65,7 +65,7 @@ function selection_expand() {
 	}
 	selection_l = nw
 	selection_code_update()
-	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
+	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 
 
 
diff --git a/scripts/selection_invert/selection_invert.gml b/scripts/selection_invert/selection_invert.gml
@@ -80,7 +80,7 @@ function selection_invert() {
 	selection_h = endb + 1
 	selection_trim()
 	selection_code_update()
-	history_set(h_select, selection_x, selection_y, try_compress_selection(selection_code), xx, yy, try_compress_selection(str))
+	history_set(h_select, selection_x, selection_y, selection_code, xx, yy, str)
 
 
 
diff --git a/scripts/selection_remove/selection_remove.gml b/scripts/selection_remove/selection_remove.gml
diff --git a/scripts/selection_to_array/selection_to_array.gml b/scripts/selection_to_array/selection_to_array.gml
diff --git a/scripts/selection_transpose/selection_transpose.gml b/scripts/selection_transpose/selection_transpose.gml
diff --git a/scripts/try_compress_selection/try_compress_selection.gml b/scripts/try_compress_selection/try_compress_selection.gml
diff --git a/scripts/try_decompress_selection/try_decompress_selection.gml b/scripts/try_decompress_selection/try_decompress_selection.gml

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ function draw_window_macro_arpeggio() {`
`65`	`65`	`}`
`66`	`66`	`var new_str = array_to_selection(arr_data, total_vals)`
`67`	`67`	`selection_load_ext(selection_x, selection_y, new_str)`
`68`		`- history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))`
	`68`	`+ history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`69`	`69`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`70`	`70`	`}`
`71`	`71`	`if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 \|\| theme != 3)) {windowclose = 1}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ function draw_window_macro_setvelocity() {`
`31`	`31`	`windowclose = 0`
`32`	`32`	`windowopen = 0`
`33`	`33`	`window = 0`
`34`		`- str = selection_code`
`35`	`34`	`if (!percentvel) {`
`36`	`35`	`selection_change(m_vel, setvel, false)`
`37`	`36`	`} else {`
`@@ -47,7 +46,7 @@ function draw_window_macro_setvelocity() {`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`	`selection_code_update()`
`50`		`- history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))`
	`49`	`+ history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`51`	`50`	`}`
`52`	`51`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ function draw_window_macro_stagger() {`
`88`	`88`	`}`
`89`	`89`	`var new_str = array_to_selection(arr_data, total_vals)`
`90`	`90`	`selection_load(selection_x, selection_y, new_str, true)`
`91`		`- history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))`
	`91`	`+ history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`92`	`92`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`93`	`93`	`}`
`94`	`94`	`if (draw_button2(x1 + 75, y1 + 128, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 \|\| theme != 3)) {windowclose = 1}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function draw_window_macro_stereo() {`
`69`	`69`	`}`
`70`	`70`	`var new_str = array_to_selection(arr_data, total_vals)`
`71`	`71`	`selection_load_ext(selection_x, selection_y, new_str)`
`72`		`- history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))`
	`72`	`+ history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`73`	`73`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`74`	`74`	`}`
`75`	`75`	`if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 \|\| theme != 3)) {windowclose = 1}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ function macro_chorus() {`
`43`	`43`	`}`
`44`	`44`	`var new_str = array_to_selection(arr_data, total_vals)`
`45`	`45`	`selection_load_ext(selection_x, selection_y, new_str)`
`46`		`- history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))`
	`46`	`+ history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`47`	`47`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`48`	`48`
`49`	`49`