norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vte: make independent of uterm

Browse Source 
Remove the last reference to uterm structures so we can put the vte layer
into a separate library without any dependency to rendering
infrastructure.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-09-08 14:20:53 +02:00
parent 0d43751e88
commit 71b8cfe93c
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/terminal.c
View File

@ -372,7 +372,8 @@ static void input_event(struct uterm_input *input,
return; return;
} }
if (kmscon_vte_handle_keyboard(term->vte, ev)) { if (kmscon_vte_handle_keyboard(term->vte, ev->keysym, ev->mods,
ev->unicode)) {
kmscon_console_sb_reset(term->console); kmscon_console_sb_reset(term->console);
schedule_redraw(term); schedule_redraw(term);
} }

28
src/vte.c
View File

@ -2096,16 +2096,16 @@ void kmscon_vte_input(struct kmscon_vte *vte, const char *u8, size_t len)
--vte->parse_cnt; --vte->parse_cnt;
} }
bool kmscon_vte_handle_keyboard(struct kmscon_vte *vte, bool kmscon_vte_handle_keyboard(struct kmscon_vte *vte, uint32_t keysym,
const struct uterm_input_event *ev) unsigned int mods, uint32_t unicode)
{ {
kmscon_symbol_t sym; kmscon_symbol_t sym;
char val; char val;
size_t len; size_t len;
const char *u8; const char *u8;
if (UTERM_INPUT_HAS_MODS(ev, UTERM_CONTROL_MASK)) { if (mods & UTERM_CONTROL_MASK) {
switch (ev->keysym) { switch (keysym) {
case XK_2: case XK_2:
case XK_space: case XK_space:
vte_write(vte, "\x00", 1); vte_write(vte, "\x00", 1);
@ -2245,7 +2245,7 @@ bool kmscon_vte_handle_keyboard(struct kmscon_vte *vte,
} }
} }
switch (ev->keysym) { switch (keysym) {
case XK_BackSpace: case XK_BackSpace:
vte_write(vte, "\x08", 1); vte_write(vte, "\x08", 1);
return true; return true;
@ -2515,23 +2515,25 @@ bool kmscon_vte_handle_keyboard(struct kmscon_vte *vte,
return true; return true;
} }
if (ev->unicode != UTERM_INPUT_INVALID) { if (unicode != KMSCON_VTE_INVALID) {
if (vte->flags & FLAG_7BIT_MODE) { if (vte->flags & FLAG_7BIT_MODE) {
val = ev->unicode; val = unicode;
if (ev->unicode & 0x80) { if (unicode & 0x80) {
log_debug("invalid keyboard input in 7bit mode U+%x; mapping to '?'", ev->unicode); log_debug("invalid keyboard input in 7bit mode U+%x; mapping to '?'",
unicode);
val = '?'; val = '?';
} }
vte_write(vte, &val, 1); vte_write(vte, &val, 1);
} else if (vte->flags & FLAG_8BIT_MODE) { } else if (vte->flags & FLAG_8BIT_MODE) {
val = ev->unicode; val = unicode;
if (ev->unicode > 0xff) { if (unicode > 0xff) {
log_debug("invalid keyboard input in 8bit mode U+%x; mapping to '?'", ev->unicode); log_debug("invalid keyboard input in 8bit mode U+%x; mapping to '?'",
unicode);
val = '?'; val = '?';
} }
vte_write_raw(vte, &val, 1); vte_write_raw(vte, &val, 1);
} else { } else {
sym = kmscon_symbol_make(ev->unicode); sym = kmscon_symbol_make(unicode);
u8 = kmscon_symbol_get_u8(sym, &len); u8 = kmscon_symbol_get_u8(sym, &len);
vte_write_raw(vte, u8, len); vte_write_raw(vte, u8, len);
kmscon_symbol_free_u8(u8); kmscon_symbol_free_u8(u8);

7
src/vte.h
View File

@ -36,7 +36,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "console.h" #include "console.h"
#include "unicode.h" #include "unicode.h"
#include "uterm.h"
/* available character sets */ /* available character sets */
@ -56,6 +55,8 @@ enum kmscon_vte_keyboard_action {
KMSCON_VTE_SEND, KMSCON_VTE_SEND,
}; };
#define KMSCON_VTE_INVALID 0xffffffff
typedef void (*kmscon_vte_write_cb) (struct kmscon_vte *vte, typedef void (*kmscon_vte_write_cb) (struct kmscon_vte *vte,
const char *u8, const char *u8,
size_t len, size_t len,
@ -68,7 +69,7 @@ void kmscon_vte_unref(struct kmscon_vte *vte);
void kmscon_vte_reset(struct kmscon_vte *vte); void kmscon_vte_reset(struct kmscon_vte *vte);
void kmscon_vte_input(struct kmscon_vte *vte, const char *u8, size_t len); void kmscon_vte_input(struct kmscon_vte *vte, const char *u8, size_t len);
bool kmscon_vte_handle_keyboard(struct kmscon_vte *vte, bool kmscon_vte_handle_keyboard(struct kmscon_vte *vte, uint32_t keysym,
const struct uterm_input_event *ev); unsigned int mods, uint32_t unicode);
#endif /* KMSCON_VTE_H */ #endif /* KMSCON_VTE_H */