summary refs log tree commit diff
path: root/bin/psfed.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/psfed.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/bin/psfed.c b/bin/psfed.c
index 3cdfaec5..cb0a1475 100644
--- a/bin/psfed.c
+++ b/bin/psfed.c
@@ -248,7 +248,6 @@ static struct {
 	uint32_t scale;
 	uint32_t index;
 	bool modified;
-	uint8_t *copy;
 } normal;
 
 static struct {
@@ -257,6 +256,7 @@ static struct {
 	uint32_t x;
 	uint32_t y;
 	uint8_t *undo;
+	uint8_t *copy;
 } edit = {
 	.scale = 4,
 };
@@ -305,16 +305,11 @@ static void inputNormal(char ch) {
 		break; case 'k': normalDec(NormalCols); normalPrint("index");
 		break; case 'j': normalInc(NormalCols); normalPrint("index");
 		break; case 'y': {
-			if (!normal.copy) normal.copy = malloc(header.glyph.size);
-			if (!normal.copy) err(EX_OSERR, "malloc");
-			memcpy(normal.copy, glyph(normal.index), header.glyph.size);
+			if (!edit.copy) edit.copy = malloc(header.glyph.size);
+			if (!edit.copy) err(EX_OSERR, "malloc");
+			memcpy(edit.copy, glyph(normal.index), header.glyph.size);
 			normalPrint("copy");
 		}
-		break; case 'p': {
-			if (!normal.copy) break;
-			normal.modified = true;
-			memcpy(glyph(normal.index), normal.copy, header.glyph.size);
-		}
 		break; case 'e': {
 			normal.modified = true;
 			edit.index = normal.index;
@@ -356,6 +351,9 @@ static void inputEdit(char ch) {
 				}
 			}
 		}
+		break; case 'p': {
+			memcpy(glyph(edit.index), edit.copy, header.glyph.size);
+		}
 		break; case 'u': {
 			memcpy(glyph(edit.index), edit.undo, header.glyph.size);
 		}