From 9b2ff241cf17b7f708c0a7d00b590c9cb63f4e81 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 10 Jun 2022 11:07:32 +0900 Subject: [PATCH] keyrouter: Rename keyrouter_grab for shorter name Change-Id: I30b62158ede60976ac760d39bafb894f274acf21 --- src/keyrouter/keyrouter.c | 32 ++++++------ src/keyrouter/keyrouter.h | 16 +++--- src/keyrouter/keyrouter_grab.c | 116 ++++++++++++++++++++--------------------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/keyrouter/keyrouter.c b/src/keyrouter/keyrouter.c index 199af6b..730b8a8 100644 --- a/src/keyrouter/keyrouter.c +++ b/src/keyrouter/keyrouter.c @@ -42,7 +42,7 @@ keyrouter_handle_display_destroy(struct wl_listener *listener, void *data) wl_global_destroy(keyrouter->global); - keyrouter_grab_destroy(keyrouter->keyrouter_grab); + keyrouter_grab_destroy(keyrouter->keygrab); free(keyrouter); } @@ -57,8 +57,8 @@ ds_tizen_keyrouter_create(struct wl_display *display) return NULL; } - keyrouter->keyrouter_grab = keyrouter_grab_create(); - if (keyrouter->keyrouter_grab == NULL) { + keyrouter->keygrab = keyrouter_grab_create(); + if (keyrouter->keygrab == NULL) { ds_err("Failed to create keyrouter."); free(keyrouter); return NULL; @@ -67,7 +67,7 @@ ds_tizen_keyrouter_create(struct wl_display *display) keyrouter->global = wl_global_create(display, &tizen_keyrouter_interface, TIZEN_KEYROUTER_VERSION, keyrouter, keyrouter_bind); if (!keyrouter->global) { - keyrouter_grab_destroy(keyrouter->keyrouter_grab); + keyrouter_grab_destroy(keyrouter->keygrab); free(keyrouter); return NULL; } @@ -119,7 +119,7 @@ keyrouter_handle_keygrab_set(struct wl_client *wl_client, return; } - res = keyrouter_grab_grab_key(keyrouter->keyrouter_grab, + res = keyrouter_grab_grab_key(keyrouter->keygrab, mode, key, (void *)wl_client); tizen_keyrouter_send_keygrab_notify(resource, surface, key, mode, res); @@ -138,7 +138,7 @@ keyrouter_handle_keygrab_unset(struct wl_client *wl_client, keyrouter = client->keyrouter; /* ungrab TOP POSITION grab first, this grab mode is not check privilege */ - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_TOPMOST, key, (void *)wl_client); ret = keyrouter_check_privilege(client, @@ -149,13 +149,13 @@ keyrouter_handle_keygrab_unset(struct wl_client *wl_client, return; } - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_EXCLUSIVE, key, (void *)wl_client); - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE, key, (void *)wl_client); - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_TOPMOST, key, (void *)wl_client); - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_SHARED, key, (void *)wl_client); tizen_keyrouter_send_keygrab_notify(resource, surface, key, TIZEN_KEYROUTER_MODE_NONE, res); @@ -207,7 +207,7 @@ keyrouter_handle_keygrab_set_list(struct wl_client *wl_client, if (ret == false) { grab_data->err = TIZEN_KEYROUTER_ERROR_NO_PERMISSION; } else { - res = keyrouter_grab_grab_key(keyrouter->keyrouter_grab, + res = keyrouter_grab_grab_key(keyrouter->keygrab, grab_data->mode, grab_data->key, (void *)wl_client); grab_data->err = res; @@ -240,7 +240,7 @@ keyrouter_handle_keygrab_unset_list(struct wl_client *wl_client, } wl_array_for_each(ungrab_data, ungrab_list) { - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_TOPMOST, ungrab_data->key, (void *)wl_client); ret = keyrouter_check_privilege(client, wl_client, @@ -248,16 +248,16 @@ keyrouter_handle_keygrab_unset_list(struct wl_client *wl_client, if (!ret) { ungrab_data->err = TIZEN_KEYROUTER_ERROR_NO_PERMISSION; } else { - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_EXCLUSIVE, ungrab_data->key, (void *)wl_client); - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE, ungrab_data->key, (void *)wl_client); - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_TOPMOST, ungrab_data->key, (void *)wl_client); - keyrouter_grab_ungrab_key(keyrouter->keyrouter_grab, + keyrouter_grab_ungrab_key(keyrouter->keygrab, TIZEN_KEYROUTER_MODE_SHARED, ungrab_data->key, (void *)wl_client); ungrab_data->err = TIZEN_KEYROUTER_ERROR_NONE; diff --git a/src/keyrouter/keyrouter.h b/src/keyrouter/keyrouter.h index ab10f9b..11fbadc 100644 --- a/src/keyrouter/keyrouter.h +++ b/src/keyrouter/keyrouter.h @@ -55,7 +55,7 @@ struct ds_tizen_keyrouter struct ds_tizen_keyrouter_key_options *opts; - struct ds_tizen_keyrouter_grab *keyrouter_grab; + struct ds_tizen_keyrouter_grab *keygrab; bool security_initialized; }; @@ -87,24 +87,24 @@ struct ds_tizen_ungrab_data struct ds_tizen_keyrouter_grab * keyrouter_grab_create(void); void -keyrouter_grab_destroy(struct ds_tizen_keyrouter_grab *keyrouter_grab); +keyrouter_grab_destroy(struct ds_tizen_keyrouter_grab *keygrab); int -keyrouter_grab_grab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_grab_key(struct ds_tizen_keyrouter_grab *keygrab, int type, int keycode, void *data); void -keyrouter_grab_ungrab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_ungrab_key(struct ds_tizen_keyrouter_grab *keygrab, int type, int keycode, void *data); int -keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keygrab, int keycode, int pressed, struct wl_list *delivery_list); void -keyrouter_grab_set_focus_client(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_set_focus_client(struct ds_tizen_keyrouter_grab *keygrab, void *focus_client); void -keyrouter_grab_set_top_client(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_set_top_client(struct ds_tizen_keyrouter_grab *keygrab, void *top_client); bool -keyrouter_grab_check_grabbed_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_check_grabbed_key(struct ds_tizen_keyrouter_grab *keygrab, int keycode); #endif diff --git a/src/keyrouter/keyrouter_grab.c b/src/keyrouter/keyrouter_grab.c index 6af0c85..755f6d4 100644 --- a/src/keyrouter/keyrouter_grab.c +++ b/src/keyrouter/keyrouter_grab.c @@ -6,41 +6,41 @@ #include "keyrouter.h" static struct wl_list * -keyrouter_grab_get_grabbed_list(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_get_grabbed_list(struct ds_tizen_keyrouter_grab *keygrab, int type, int keycode) { switch(type) { case TIZEN_KEYROUTER_MODE_EXCLUSIVE: - return &keyrouter_grab->hard_keys[keycode].grab.excl; + return &keygrab->hard_keys[keycode].grab.excl; case TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE: - return &keyrouter_grab->hard_keys[keycode].grab.or_excl; + return &keygrab->hard_keys[keycode].grab.or_excl; case TIZEN_KEYROUTER_MODE_TOPMOST: - return &keyrouter_grab->hard_keys[keycode].grab.top; + return &keygrab->hard_keys[keycode].grab.top; case TIZEN_KEYROUTER_MODE_SHARED: - return &keyrouter_grab->hard_keys[keycode].grab.shared; + return &keygrab->hard_keys[keycode].grab.shared; default: return NULL; } } bool -keyrouter_grab_check_grabbed_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, int keycode) +keyrouter_grab_check_grabbed_key(struct ds_tizen_keyrouter_grab *keygrab, int keycode) { struct wl_list *list; - list = keyrouter_grab_get_grabbed_list(keyrouter_grab, TIZEN_KEYROUTER_MODE_EXCLUSIVE, keycode); + list = keyrouter_grab_get_grabbed_list(keygrab, TIZEN_KEYROUTER_MODE_EXCLUSIVE, keycode); if (list && !wl_list_empty(list)) return true; - list = keyrouter_grab_get_grabbed_list(keyrouter_grab, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE, keycode); + list = keyrouter_grab_get_grabbed_list(keygrab, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE, keycode); if (list && !wl_list_empty(list)) return true; - list = keyrouter_grab_get_grabbed_list(keyrouter_grab, TIZEN_KEYROUTER_MODE_TOPMOST, keycode); + list = keyrouter_grab_get_grabbed_list(keygrab, TIZEN_KEYROUTER_MODE_TOPMOST, keycode); if (list && !wl_list_empty(list)) return true; - list = keyrouter_grab_get_grabbed_list(keyrouter_grab, TIZEN_KEYROUTER_MODE_SHARED, keycode); + list = keyrouter_grab_get_grabbed_list(keygrab, TIZEN_KEYROUTER_MODE_SHARED, keycode); if (list && !wl_list_empty(list)) return true; @@ -64,13 +64,13 @@ keyrouter_grab_check_duplicated_data(struct wl_list *list, void *data) } static bool -keyrouter_grab_check_grabbed(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_check_grabbed(struct ds_tizen_keyrouter_grab *keygrab, int type, int keycode, void *data) { struct wl_list *list; bool ret; - list = keyrouter_grab_get_grabbed_list(keyrouter_grab, type, keycode); + list = keyrouter_grab_get_grabbed_list(keygrab, type, keycode); if (list == NULL) { ds_err("keycode(%d) had no list for type(%d).", keycode, type); return false; @@ -101,10 +101,10 @@ keyrouter_grab_check_grabbed(struct ds_tizen_keyrouter_grab *keyrouter_grab, } void -keyrouter_grab_set_focus_client(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_set_focus_client(struct ds_tizen_keyrouter_grab *keygrab, void *focus_client) { - keyrouter_grab->focus_client = focus_client; + keygrab->focus_client = focus_client; if (focus_client) ds_dbg("[%s] focus client has been set. (focus_client=0x%p)", __FUNCTION__, focus_client); @@ -113,9 +113,9 @@ keyrouter_grab_set_focus_client(struct ds_tizen_keyrouter_grab *keyrouter_grab, } void -keyrouter_grab_set_top_client(struct ds_tizen_keyrouter_grab *keyrouter_grab, void *top_client) +keyrouter_grab_set_top_client(struct ds_tizen_keyrouter_grab *keygrab, void *top_client) { - keyrouter_grab->top_client = top_client; + keygrab->top_client = top_client; if (top_client) ds_dbg("[%s] top client has been set. (top_client=0x%p)", __FUNCTION__, top_client); @@ -124,7 +124,7 @@ keyrouter_grab_set_top_client(struct ds_tizen_keyrouter_grab *keyrouter_grab, vo } int -keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keygrab, int keycode, int pressed, struct wl_list *delivery_list) { struct ds_tizen_keyrouter_key_info *info, *delivery; @@ -135,8 +135,8 @@ keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keyrouter_grab, return 0; } - if (!wl_list_empty(&keyrouter_grab->hard_keys[keycode].grab.excl)) { - info = wl_container_of(keyrouter_grab->hard_keys[keycode].grab.excl.next, info, link); + if (!wl_list_empty(&keygrab->hard_keys[keycode].grab.excl)) { + info = wl_container_of(keygrab->hard_keys[keycode].grab.excl.next, info, link); if (info) { delivery = calloc(1, sizeof(struct ds_tizen_keyrouter_key_info)); if (delivery == NULL) { @@ -148,8 +148,8 @@ keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keyrouter_grab, ds_dbg("Exclusive Mode: keycode: %d to data: %p", keycode, info->data); return 1; } - } else if (!wl_list_empty(&keyrouter_grab->hard_keys[keycode].grab.or_excl)) { - info = wl_container_of(keyrouter_grab->hard_keys[keycode].grab.or_excl.next, info, link); + } else if (!wl_list_empty(&keygrab->hard_keys[keycode].grab.or_excl)) { + info = wl_container_of(keygrab->hard_keys[keycode].grab.or_excl.next, info, link); if (info) { delivery = calloc(1, sizeof(struct ds_tizen_keyrouter_key_info)); if (delivery == NULL) { @@ -161,9 +161,9 @@ keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keyrouter_grab, ds_dbg("OR-Excl Mode: keycode: %d to data: %p", keycode, info->data); return 1; } - } else if (!wl_list_empty(&keyrouter_grab->hard_keys[keycode].grab.top)) { - wl_list_for_each(info, &keyrouter_grab->hard_keys[keycode].grab.top, link) { - if (keyrouter_grab->top_client && keyrouter_grab->top_client == info->data) { + } else if (!wl_list_empty(&keygrab->hard_keys[keycode].grab.top)) { + wl_list_for_each(info, &keygrab->hard_keys[keycode].grab.top, link) { + if (keygrab->top_client && keygrab->top_client == info->data) { delivery = calloc(1, sizeof(struct ds_tizen_keyrouter_key_info)); if (delivery == NULL) { ds_err("Failed to allocate memory."); @@ -177,21 +177,21 @@ keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keyrouter_grab, } } - if (keyrouter_grab->focus_client) { + if (keygrab->focus_client) { delivery = calloc(1, sizeof(struct ds_tizen_keyrouter_key_info)); if (delivery == NULL) { ds_err("Failed to allocate memory."); return 0; } - delivery->data = keyrouter_grab->focus_client; + delivery->data = keygrab->focus_client; wl_list_insert(delivery_list, &delivery->link); count++; ds_dbg("Focus: keycode: %d to data: %p, count: %d", keycode, delivery->data, count); } - if (!wl_list_empty(&keyrouter_grab->hard_keys[keycode].grab.shared)) { - wl_list_for_each(info, &keyrouter_grab->hard_keys[keycode].grab.shared, link) { - if (keyrouter_grab->focus_client && keyrouter_grab->focus_client == info->data) + if (!wl_list_empty(&keygrab->hard_keys[keycode].grab.shared)) { + wl_list_for_each(info, &keygrab->hard_keys[keycode].grab.shared, link) { + if (keygrab->focus_client && keygrab->focus_client == info->data) continue; delivery = calloc(1, sizeof(struct ds_tizen_keyrouter_key_info)); if (delivery == NULL) { @@ -209,7 +209,7 @@ keyrouter_grab_key_process(struct ds_tizen_keyrouter_grab *keyrouter_grab, } int -keyrouter_grab_grab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_grab_key(struct ds_tizen_keyrouter_grab *keygrab, int type, int keycode, void *data) { struct ds_tizen_keyrouter_key_info *info = NULL; @@ -220,7 +220,7 @@ keyrouter_grab_grab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, return TIZEN_KEYROUTER_ERROR_INVALID_KEY; } - if (keyrouter_grab_check_grabbed(keyrouter_grab, type, keycode, data)) + if (keyrouter_grab_check_grabbed(keygrab, type, keycode, data)) return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY; info = calloc(1, sizeof(struct ds_tizen_keyrouter_key_info)); @@ -232,15 +232,15 @@ keyrouter_grab_grab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, wl_list_init(&info->link); - list = keyrouter_grab_get_grabbed_list(keyrouter_grab, type, keycode); + list = keyrouter_grab_get_grabbed_list(keygrab, type, keycode); if (!list) { ds_err("keycode(%d) had no list for type(%d)", keycode, type); free(info); return TIZEN_KEYROUTER_ERROR_INVALID_MODE; } - if (!keyrouter_grab->hard_keys[keycode].keycode) - keyrouter_grab->hard_keys[keycode].keycode = keycode; + if (!keygrab->hard_keys[keycode].keycode) + keygrab->hard_keys[keycode].keycode = keycode; wl_list_insert(list, &info->link); @@ -264,7 +264,7 @@ keyrouter_list_remove_data(struct wl_list *list, void *data) } void -keyrouter_grab_ungrab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, +keyrouter_grab_ungrab_key(struct ds_tizen_keyrouter_grab *keygrab, int type, int keycode, void *data) { struct wl_list *list; @@ -274,10 +274,10 @@ keyrouter_grab_ungrab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, return; } - if (keyrouter_grab->hard_keys[keycode].keycode == 0) + if (keygrab->hard_keys[keycode].keycode == 0) return; - list = keyrouter_grab_get_grabbed_list(keyrouter_grab, type, keycode); + list = keyrouter_grab_get_grabbed_list(keygrab, type, keycode); if (list == NULL) { ds_err("keycode(%d) had no list for type(%d)", keycode, type); return; @@ -289,34 +289,34 @@ keyrouter_grab_ungrab_key(struct ds_tizen_keyrouter_grab *keyrouter_grab, struct ds_tizen_keyrouter_grab * keyrouter_grab_create(void) { - struct ds_tizen_keyrouter_grab *keyrouter_grab = NULL; + struct ds_tizen_keyrouter_grab *keygrab = NULL; int i; - keyrouter_grab = calloc(1, sizeof(struct ds_tizen_keyrouter_grab)); - if (keyrouter_grab == NULL) { + keygrab = calloc(1, sizeof(struct ds_tizen_keyrouter_grab)); + if (keygrab == NULL) { ds_err("Failed to allocate memory."); return NULL; } /* FIXME: Who defined max keycode? */ - keyrouter_grab->hard_keys = calloc(KEYROUTER_MAX_KEYS, sizeof(struct ds_tizen_keyrouter_grabbed)); - if (keyrouter_grab->hard_keys == NULL) { + keygrab->hard_keys = calloc(KEYROUTER_MAX_KEYS, sizeof(struct ds_tizen_keyrouter_grabbed)); + if (keygrab->hard_keys == NULL) { ds_err("Failed to allocate memory."); - free(keyrouter_grab); + free(keygrab); return NULL; } for (i = 0; i < KEYROUTER_MAX_KEYS; i++) { /* Enable all of keys to grab */ - //keyrouter_grab->hard_keys[i].keycode = i; - wl_list_init(&keyrouter_grab->hard_keys[i].grab.excl); - wl_list_init(&keyrouter_grab->hard_keys[i].grab.or_excl); - wl_list_init(&keyrouter_grab->hard_keys[i].grab.top); - wl_list_init(&keyrouter_grab->hard_keys[i].grab.shared); - wl_list_init(&keyrouter_grab->hard_keys[i].pressed); + //keygrab->hard_keys[i].keycode = i; + wl_list_init(&keygrab->hard_keys[i].grab.excl); + wl_list_init(&keygrab->hard_keys[i].grab.or_excl); + wl_list_init(&keygrab->hard_keys[i].grab.top); + wl_list_init(&keygrab->hard_keys[i].grab.shared); + wl_list_init(&keygrab->hard_keys[i].pressed); } - return keyrouter_grab; + return keygrab; } static void @@ -334,18 +334,18 @@ keyrouter_grab_delete_list(struct wl_list *list) } void -keyrouter_grab_destroy(struct ds_tizen_keyrouter_grab *keyrouter_grab) +keyrouter_grab_destroy(struct ds_tizen_keyrouter_grab *keygrab) { int i; for (i = 0; i < KEYROUTER_MAX_KEYS; i++) { - keyrouter_grab_delete_list(&keyrouter_grab->hard_keys[i].grab.excl); - keyrouter_grab_delete_list(&keyrouter_grab->hard_keys[i].grab.or_excl); - keyrouter_grab_delete_list(&keyrouter_grab->hard_keys[i].grab.top); - keyrouter_grab_delete_list(&keyrouter_grab->hard_keys[i].grab.shared); - keyrouter_grab_delete_list(&keyrouter_grab->hard_keys[i].pressed); + keyrouter_grab_delete_list(&keygrab->hard_keys[i].grab.excl); + keyrouter_grab_delete_list(&keygrab->hard_keys[i].grab.or_excl); + keyrouter_grab_delete_list(&keygrab->hard_keys[i].grab.top); + keyrouter_grab_delete_list(&keygrab->hard_keys[i].grab.shared); + keyrouter_grab_delete_list(&keygrab->hard_keys[i].pressed); } - free(keyrouter_grab->hard_keys); - free(keyrouter_grab); + free(keygrab->hard_keys); + free(keygrab); } -- 2.7.4