From 7726e33b0a66ac5895b6f283665bb5e81a6d7b0d Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Fri, 13 Jul 2007 19:28:45 +0200
Subject: [PATCH] bug 181: Simplification. Reverted changes causing
 incompatibility.

---
 src/terminal/event.c    | 2 +-
 src/terminal/event.h    | 3 ---
 src/terminal/kbd.c      | 6 ------
 src/terminal/terminal.c | 7 +++----
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/terminal/event.c b/src/terminal/event.c
index 4628fc77..1b3c5641 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -447,7 +447,7 @@ invalid_utf8_start_byte:
 		return 0;
 	case EVENT_TEXTAREA:
 		if (textarea_editor)
-			textarea_edit(1, ilev->info.textarea, NULL, NULL, NULL);
+			textarea_edit(1, term, NULL, NULL, NULL);
 		break;
 
 	default:
diff --git a/src/terminal/event.h b/src/terminal/event.h
index b0f197a7..a2324deb 100644
--- a/src/terminal/event.h
+++ b/src/terminal/event.h
@@ -59,9 +59,6 @@ struct interlink_event {
 		/* ::EVENT_INIT, ::EVENT_RESIZE, ::EVENT_REDRAW */
 #define interlink_event_size term_event_size
 		struct interlink_event_size size;
-
-		/* EVENT_TEXTAREA */
-		struct terminal *textarea;
 	} info;
 };
 
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index 21761dd9..7d82af22 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -42,8 +42,6 @@
 #include "util/time.h"
 
 struct itrm *ditrm = NULL;
-static struct terminal *slave_term;
-static unsigned char *term_addr = (unsigned char *)&slave_term;
 
 static void free_itrm(struct itrm *);
 static void in_kbd(struct itrm *);
@@ -363,7 +361,6 @@ unblock_itrm_x(void *h)
 
 	memset(&ev, 0, sizeof(ev));
 	ev.ev = EVENT_TEXTAREA;
-	ev.info.textarea = slave_term;
 	itrm_queue_event(ditrm, (char *) &ev, sizeof(ev));
 }
 
@@ -558,9 +555,6 @@ has_nul_byte:
 	}
 
 	RD(fg);
-	for (i = 0; i < sizeof(slave_term); i++) {
-		RD(term_addr[i]);
-	}
 
 	if (!init_string(&path)) goto free_and_return;
 
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index c1d940b6..e781ff33 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -256,16 +256,15 @@ exec_on_slave_terminal( struct terminal *term,
 		 	unsigned char *delete, int dlen,
 			enum term_exec fg)
 {
-	int data_size = sizeof(term) + plen + dlen + 1 /* 0 */ + 1 /* fg */ + 2 /* 2 null char */;
+	int data_size = plen + dlen + 1 /* 0 */ + 1 /* fg */ + 2 /* 2 null char */;
 	unsigned char *data = fmem_alloc(data_size);
 
 	if (!data) return;
 
 	data[0] = 0;
 	data[1] = fg;
-	memcpy(data + 2, &term, sizeof(term));
-	memcpy(data + 2 + sizeof(term), path, plen + 1);
-	memcpy(data + 2 + sizeof(term) + plen + 1, delete, dlen + 1);
+	memcpy(data + 2, path, plen + 1);
+	memcpy(data + 2 + plen + 1, delete, dlen + 1);
 	hard_write(term->fdout, data, data_size);
 	fmem_free(data);
 }
-- 
2.11.4.GIT