mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Add support for control keys to the protocol

Browse Source 
Add key event to the text_model interface and a key request to the
input_method_context interface. Implement it in the example editor
client and the example keyboard.

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
This commit is contained in:
Jan Arne Petersen
2012-09-09 23:08:45 +02:00
committed by Kristian Høgsberg
parent e202bae9d3
commit ce8a4433f5
6 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+24 -1
View File
@@ -284,8 +284,31 @@ text_model_preedit_styling(void *data,
static void
text_model_key(void *data,
struct text_model *text_model)
struct text_model *text_model,
uint32_t key,
uint32_t state)
{
const char *state_label;
const char *key_label;
if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
state_label = "pressed";
} else {
state_label = "released";
}
switch (key) {
case XKB_KEY_Tab:
key_label = "Tab";
break;
case XKB_KEY_KP_Enter:
key_label = "Enter";
break;
default:
key_label = "Unknown";
}
fprintf(stderr, "%s key was %s.\n", key_label, state_label);
}
static void
clients/keyboard.c
+4
View File
@@ -228,6 +228,8 @@ keyboard_handle_key(struct keyboard *keyboard, const struct key *key)
}
break;
case keytype_enter:
input_method_context_key(keyboard->keyboard->context,
XKB_KEY_KP_Enter, WL_KEYBOARD_KEY_STATE_PRESSED);
break;
case keytype_space:
keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string,
@@ -250,6 +252,8 @@ keyboard_handle_key(struct keyboard *keyboard, const struct key *key)
case keytype_symbols:
break;
case keytype_tab:
input_method_context_key(keyboard->keyboard->context,
XKB_KEY_Tab, WL_KEYBOARD_KEY_STATE_PRESSED);
break;
}
}