From 62d4e7eccbf8eca4e395688f2e4fc4948919a59d Mon Sep 17 00:00:00 2001 From: Paul LeoNerd Evans Date: Sun, 2 Nov 2008 14:43:19 +0000 Subject: [PATCH] Pass the 'force' value through to getkey_simple() --- driver-csi.c | 2 +- driver-ti.c | 2 +- termkey-internal.h | 2 +- termkey.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/driver-csi.c b/driver-csi.c index 8633157..6b3f9b0 100644 --- a/driver-csi.c +++ b/driver-csi.c @@ -350,7 +350,7 @@ static termkey_result getkey(termkey_t *tk, termkey_key *key, int force) return getkey_csi(tk, 1, key, force); } else - return (*tk->method.getkey_simple)(tk, key); + return (*tk->method.getkey_simple)(tk, key, force); } static termkey_keysym register_csi_ss3(termkey_csi *csi, termkey_type type, termkey_keysym sym, unsigned char cmd, const char *name) diff --git a/driver-ti.c b/driver-ti.c index cce384f..7cff1ca 100644 --- a/driver-ti.c +++ b/driver-ti.c @@ -115,7 +115,7 @@ static termkey_result getkey(termkey_t *tk, termkey_key *key, int force) } // No special seq. Must be a simple key then - return (*tk->method.getkey_simple)(tk, key); + return (*tk->method.getkey_simple)(tk, key, force); } static struct { diff --git a/termkey-internal.h b/termkey-internal.h index 774cb53..5494cf6 100644 --- a/termkey-internal.h +++ b/termkey-internal.h @@ -49,7 +49,7 @@ struct termkey { struct { void (*eat_bytes)(termkey_t *tk, size_t count); void (*emit_codepoint)(termkey_t *tk, long codepoint, termkey_key *key); - termkey_result (*getkey_simple)(termkey_t *tk, termkey_key *key); + termkey_result (*getkey_simple)(termkey_t *tk, termkey_key *key, int force); } method; }; diff --git a/termkey.c b/termkey.c index d20655f..49b6869 100644 --- a/termkey.c +++ b/termkey.c @@ -17,7 +17,7 @@ static struct termkey_driver *drivers[] = { // Forwards for the "protected" methods static void eat_bytes(termkey_t *tk, size_t count); static void emit_codepoint(termkey_t *tk, long codepoint, termkey_key *key); -static termkey_result getkey_simple(termkey_t *tk, termkey_key *key); +static termkey_result getkey_simple(termkey_t *tk, termkey_key *key, int force); static termkey_keysym register_c0(termkey_t *tk, termkey_keysym sym, unsigned char ctrl, const char *name); static termkey_keysym register_c0_full(termkey_t *tk, termkey_keysym sym, int modifier_set, int modifier_mask, unsigned char ctrl, const char *name); @@ -347,7 +347,7 @@ static void emit_codepoint(termkey_t *tk, long codepoint, termkey_key *key) #define CHARAT(i) (tk->buffer[tk->buffstart + (i)]) -static termkey_result getkey_simple(termkey_t *tk, termkey_key *key) +static termkey_result getkey_simple(termkey_t *tk, termkey_key *key, int force) { unsigned char b0 = CHARAT(0);