=== modified file 'driver-csi.c' --- driver-csi.c 2008-10-09 19:23:45 +0000 +++ driver-csi.c 2008-10-08 01:00:22 +0000 @@ -24,18 +24,8 @@ static termkey_keysym register_ss3kpalt_full(termkey_csi *csi, termkey_type type, termkey_keysym sym, int modifier_set, int modifier_mask, unsigned char cmd, const char *name, char kpalt); static termkey_keysym register_csifunc_full(termkey_csi *csi, termkey_type type, termkey_keysym sym, int modifier_set, int modifier_mask, int number, const char *name); -static void *new_driver(termkey_t *tk, const char *term) +static void *new_driver(termkey_t *tk) { - // Only care about term types beginning "xterm" - if(strncmp(term, "xterm", 5) != 0) - return NULL; - - // We want "xterm" or "xtermc" or "xterm-..." - if(term[5] != 0 && term[5] != '-' && term[5] != 'c') - return NULL; - - // Excellent - we'll continue - termkey_csi *csi = malloc(sizeof *csi); csi->tk = tk; === modified file 'driver-ti.c' --- driver-ti.c 2008-10-09 19:23:45 +0000 +++ driver-ti.c 2008-10-08 01:04:47 +0000 @@ -25,12 +25,9 @@ static int funcname2keysym(const char *funcname, termkey_type *typep, termkey_keysym *symp, int *modmask, int *modsetp); static void register_seq(termkey_ti *ti, const char *seq, termkey_type type, termkey_keysym sym, int modmask, int modset); -static void *new_driver(termkey_t *tk, const char *term) +static void *new_driver(termkey_t *tk) { - int err; - - if(setupterm(term, 1, &err) != OK) - return NULL; + setupterm((char*)0, 1, (int*)0); termkey_ti *ti = malloc(sizeof *ti); === modified file 'termkey-internal.h' --- termkey-internal.h 2008-10-09 19:23:45 +0000 +++ termkey-internal.h 2008-10-08 01:04:47 +0000 @@ -8,7 +8,7 @@ struct termkey_driver { - void *(*new_driver)(termkey_t *tk, const char *term); + void *(*new_driver)(termkey_t *tk); void (*free_driver)(void *); termkey_result (*getkey)(termkey_t *tk, termkey_key *key, int force); }; === modified file 'termkey.c' --- termkey.c 2008-10-09 19:23:45 +0000 +++ termkey.c 2008-10-08 01:04:47 +0000 @@ -9,8 +9,8 @@ #include static struct termkey_driver *drivers[] = { + &termkey_driver_ti, &termkey_driver_csi, - &termkey_driver_ti, NULL, }; @@ -133,10 +133,8 @@ register_c0(tk, TERMKEY_SYM_ENTER, 0x0d, NULL); register_c0(tk, TERMKEY_SYM_ESCAPE, 0x1b, NULL); - const char *term = getenv("TERM"); - for(i = 0; drivers[i]; i++) { - void *driver_info = (*drivers[i]->new_driver)(tk, term); + void *driver_info = (*drivers[i]->new_driver)(tk); if(!driver_info) continue;