aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05: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 Witold Filipczyk
parent 6bc992250b
commit b196d8ee01
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

@ -443,7 +443,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:

3
src/terminal/event.h
View File

@ -52,9 +52,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;
};

6
src/terminal/kbd.c
View File

@ -40,8 +40,6 @@
/* TODO: move stuff from here to itrm.{c,h} and mouse.{c,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 *);
@ -359,7 +357,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));
}
@ -554,9 +551,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;

7
src/terminal/terminal.c
View File

@ -255,16 +255,15 @@ exec_on_slave_terminal( struct terminal *term,
unsigned char *delete, int dlen,
int 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);
}