aniani/elinks
0
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-06-30 22:19:29 -04:00
Code

bug 181: Simplification. Reverted changes causing incompatibility.

Browse Source
This commit is contained in:
Witold Filipczyk 2007-07-13 19:28:45 +02:00 committed by Miciah Dashiel Butler Masters
parent 1000f88748
commit 7726e33b0a
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal/event.c
View File

@ -447,7 +447,7 @@ invalid_utf8_start_byte:
return 0; return 0;
case EVENT_TEXTAREA: case EVENT_TEXTAREA:
if (textarea_editor) if (textarea_editor)
textarea_edit(1, ilev->info.textarea, NULL, NULL, NULL); textarea_edit(1, term, NULL, NULL, NULL);
break; break;
default: default:

3
src/terminal/event.h
View File

@ -59,9 +59,6 @@ struct interlink_event {
/* ::EVENT_INIT, ::EVENT_RESIZE, ::EVENT_REDRAW */ /* ::EVENT_INIT, ::EVENT_RESIZE, ::EVENT_REDRAW */
#define interlink_event_size term_event_size #define interlink_event_size term_event_size
struct interlink_event_size size; struct interlink_event_size size;
/* EVENT_TEXTAREA */
struct terminal *textarea;
} info; } info;
}; };

6
src/terminal/kbd.c
View File

@ -42,8 +42,6 @@
#include "util/time.h" #include "util/time.h"
struct itrm *ditrm = NULL; 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 free_itrm(struct itrm *);
static void in_kbd(struct itrm *); static void in_kbd(struct itrm *);
@ -363,7 +361,6 @@ unblock_itrm_x(void *h)
memset(&ev, 0, sizeof(ev)); memset(&ev, 0, sizeof(ev));
ev.ev = EVENT_TEXTAREA; ev.ev = EVENT_TEXTAREA;
ev.info.textarea = slave_term;
itrm_queue_event(ditrm, (char *) &ev, sizeof(ev)); itrm_queue_event(ditrm, (char *) &ev, sizeof(ev));
} }
@ -558,9 +555,6 @@ has_nul_byte:
} }
RD(fg); RD(fg);
for (i = 0; i < sizeof(slave_term); i++) {
RD(term_addr[i]);
}
if (!init_string(&path)) goto free_and_return; if (!init_string(&path)) goto free_and_return;

7
src/terminal/terminal.c
View File

@ -256,16 +256,15 @@ exec_on_slave_terminal( struct terminal *term,
unsigned char *delete, int dlen, unsigned char *delete, int dlen,
enum term_exec fg) 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); unsigned char *data = fmem_alloc(data_size);
if (!data) return; if (!data) return;
data[0] = 0; data[0] = 0;
data[1] = fg; data[1] = fg;
memcpy(data + 2, &term, sizeof(term)); memcpy(data + 2, path, plen + 1);
memcpy(data + 2 + sizeof(term), path, plen + 1); memcpy(data + 2 + plen + 1, delete, dlen + 1);
memcpy(data + 2 + sizeof(term) + plen + 1, delete, dlen + 1);
hard_write(term->fdout, data, data_size); hard_write(term->fdout, data, data_size);
fmem_free(data); fmem_free(data);
} }