From: duna.oh Date: Wed, 11 Dec 2024 05:45:52 +0000 (+0900) Subject: input: Replace xkb_map_* with xkb_keymap_* X-Git-Tag: accepted/tizen/unified/20241216.185842~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5045076e4d018f600de89fd8f4f30343d3519fb;p=platform%2Fupstream%2Fenlightenment.git input: Replace xkb_map_* with xkb_keymap_* for more consistency with the returned struct name Please refer to the following commit in libxkbcommon commit 33a66515d6bd28b4c2f31ecfc1c51f8b45b034e8 Author: Daniel Stone Date: Wed Sep 12 19:55:06 2012 +0100 API change: Rename xkb_map_* and group -> layout Change-Id: I2dc246242d5ae95fa8f28ef742fe01a961201067 --- diff --git a/src/bin/debug/e_info_client.c b/src/bin/debug/e_info_client.c index 27fe8aeaf7..1814c3f9f4 100644 --- a/src/bin/debug/e_info_client.c +++ b/src/bin/debug/e_info_client.c @@ -902,7 +902,7 @@ _cb_input_keymap_info_get(const Eldbus_Message *msg) const char *name = NULL, *text = NULL; Eina_Bool res; int i; - int min_keycode=0, max_keycode=0, fd=0, size=0, num_mods=0, num_groups = 0; + int min_keycode=0, max_keycode=0, fd=0, size=0, num_mods=0, num_layouts = 0; struct xkb_context *context = NULL; struct xkb_keymap *keymap = NULL; struct xkb_state *state = NULL; @@ -927,7 +927,7 @@ _cb_input_keymap_info_get(const Eldbus_Message *msg) return; } - keymap = xkb_map_new_from_string(context, map, XKB_KEYMAP_FORMAT_TEXT_V1, 0); + keymap = xkb_keymap_new_from_string(context, map, XKB_KEYMAP_FORMAT_TEXT_V1, 0); munmap(map, size); close(fd); @@ -938,13 +938,13 @@ _cb_input_keymap_info_get(const Eldbus_Message *msg) min_keycode = xkb_keymap_min_keycode(keymap); max_keycode = xkb_keymap_max_keycode(keymap); - num_groups = xkb_map_num_groups(keymap); + num_layouts = xkb_keymap_num_layouts(keymap); num_mods = xkb_keymap_num_mods(keymap); printf("\n"); printf(" min keycode: %d\n", min_keycode); printf(" max keycode: %d\n", max_keycode); - printf(" num_groups : %d\n", num_groups); + printf(" num_layouts : %d\n", num_layouts); printf(" num_mods : %d\n", num_mods); for (i = 0; i < num_mods; i++) { @@ -969,7 +969,7 @@ finish: printf("errname:%s errmsg:%s\n", name?:"null", text?:"null"); } if (state) xkb_state_unref(state); - if (keymap) xkb_map_unref(keymap); + if (keymap) xkb_keymap_unref(keymap); if (context) xkb_context_unref(context); } diff --git a/src/bin/inputmgr/e_comp_input.c b/src/bin/inputmgr/e_comp_input.c index fc790522f7..16c7dcd010 100644 --- a/src/bin/inputmgr/e_comp_input.c +++ b/src/bin/inputmgr/e_comp_input.c @@ -49,7 +49,7 @@ e_comp_input_shutdown(void) /* unreference any existing keymap */ if (e_comp_input_key->xkb.keymap) - xkb_map_unref(e_comp_input_key->xkb.keymap); + xkb_keymap_unref(e_comp_input_key->xkb.keymap); g_rec_mutex_unlock(&e_comp_input_key->xkb.keymap_mutex); diff --git a/src/bin/inputmgr/e_input_device.c b/src/bin/inputmgr/e_input_device.c index 94c8a3555e..fc633ace01 100644 --- a/src/bin/inputmgr/e_input_device.c +++ b/src/bin/inputmgr/e_input_device.c @@ -41,9 +41,9 @@ e_input_device_cached_keymap_get(struct xkb_context *ctx, EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, NULL); if (!cached_keymap) - return xkb_map_new_from_names(ctx, names, flags); + return xkb_keymap_new_from_names(ctx, names, flags); else - return xkb_map_ref(cached_keymap); + return xkb_keymap_ref(cached_keymap); } void diff --git a/src/bin/inputmgr/e_input_evdev.c b/src/bin/inputmgr/e_input_evdev.c index d0f6b0285d..c0ab83e442 100644 --- a/src/bin/inputmgr/e_input_evdev.c +++ b/src/bin/inputmgr/e_input_evdev.c @@ -268,49 +268,49 @@ _device_keyboard_setup(E_Input_Evdev *evdev) return; } - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_CTRL); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_CTRL); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.ctrl_mask = 1 << xkb_idx; else evdev->xkb.ctrl_mask = 0; - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_ALT); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_ALT); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.alt_mask = 1 << xkb_idx; else evdev->xkb.alt_mask = 0; - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_SHIFT); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_SHIFT); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.shift_mask = 1 << xkb_idx; else evdev->xkb.shift_mask = 0; - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_LOGO); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_LOGO); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.win_mask = 1 << xkb_idx; else evdev->xkb.win_mask = 0; - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, XKB_LED_NAME_SCROLL); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_LED_NAME_SCROLL); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.scroll_mask = 1 << xkb_idx; else evdev->xkb.scroll_mask = 0; - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, XKB_LED_NAME_NUM); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_LED_NAME_NUM); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.num_mask = 1 << xkb_idx; else evdev->xkb.num_mask = 0; - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_CAPS); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_CAPS); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.caps_mask = 1 << xkb_idx; else evdev->xkb.caps_mask = 0; - xkb_idx = xkb_map_mod_get_index(evdev->xkb.keymap, "ISO_Level3_Shift"); + xkb_idx = xkb_keymap_mod_get_index(evdev->xkb.keymap, "ISO_Level3_Shift"); if (xkb_idx != XKB_MOD_INVALID) evdev->xkb.altgr_mask = 1 << xkb_idx; else @@ -741,7 +741,7 @@ e_input_evdev_handle_key(E_Input_Evdev *evdev, struct libinput_event_keyboard *e (state ? XKB_KEY_DOWN : XKB_KEY_UP)); /* get the keysym for this code */ - nsyms = xkb_key_get_syms(evdev->xkb.state, code, &syms); + nsyms = xkb_state_key_get_syms(evdev->xkb.state, code, &syms); if (nsyms == 1) sym = syms[0]; @@ -766,7 +766,7 @@ e_input_evdev_handle_key(E_Input_Evdev *evdev, struct libinput_event_keyboard *e /* if shift is active, we need to transform the key to lower */ if (xkb_state_mod_index_is_active(evdev->xkb.state, - xkb_map_mod_get_index(evdev->xkb.keymap, + xkb_keymap_mod_get_index(evdev->xkb.keymap, XKB_MOD_NAME_SHIFT), XKB_STATE_MODS_EFFECTIVE)) { @@ -2549,7 +2549,7 @@ e_input_evdev_device_destroy(E_Input_Evdev *evdev) { if (evdev->xkb.state) xkb_state_unref(evdev->xkb.state); - if (evdev->xkb.keymap) xkb_map_unref(evdev->xkb.keymap); + if (evdev->xkb.keymap) xkb_keymap_unref(evdev->xkb.keymap); } if (evdev->e_dev) g_object_unref(evdev->e_dev); diff --git a/src/bin/server/e_comp_wl_input.c b/src/bin/server/e_comp_wl_input.c index 5819e45062..c8580d8e43 100644 --- a/src/bin/server/e_comp_wl_input.c +++ b/src/bin/server/e_comp_wl_input.c @@ -1472,7 +1472,7 @@ _e_comp_wl_keymap_update(struct xkb_keymap *keymap, const char *keymap_path) /* unreference any existing keymap */ if (comp_wl->xkb.keymap) - xkb_map_unref(comp_wl->xkb.keymap); + xkb_keymap_unref(comp_wl->xkb.keymap); /* unmap any existing keyboard area */ if (comp_wl->xkb.area) @@ -1511,17 +1511,17 @@ _e_comp_wl_keymap_update(struct xkb_keymap *keymap, const char *keymap_path) /* fetch updated modifiers */ comp_wl->kbd.mod_shift = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_SHIFT); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_SHIFT); comp_wl->kbd.mod_caps = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_CAPS); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CAPS); comp_wl->kbd.mod_ctrl = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_CTRL); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CTRL); comp_wl->kbd.mod_alt = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_ALT); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_ALT); comp_wl->kbd.mod_super = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_LOGO); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_LOGO); - if (!(tmp = xkb_map_get_as_string(keymap))) + if (!(tmp = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1))) { ERR("Could not get keymap string"); return; @@ -1562,7 +1562,7 @@ _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap, const char *keymap_pat /* unreference any existing keymap */ g_rec_mutex_lock(&e_comp_input_key->xkb.keymap_mutex); if (e_comp_input_key->xkb.keymap) - xkb_map_unref(e_comp_input_key->xkb.keymap); + xkb_keymap_unref(e_comp_input_key->xkb.keymap); g_rec_mutex_unlock(&e_comp_input_key->xkb.keymap_mutex); @@ -1606,17 +1606,17 @@ _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap, const char *keymap_pat /* fetch updated modifiers */ e_comp_input_key->kbd.mod_shift = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_SHIFT); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_SHIFT); e_comp_input_key->kbd.mod_caps = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_CAPS); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CAPS); e_comp_input_key->kbd.mod_ctrl = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_CTRL); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CTRL); e_comp_input_key->kbd.mod_alt = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_ALT); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_ALT); e_comp_input_key->kbd.mod_super = - xkb_map_mod_get_index(keymap, XKB_MOD_NAME_LOGO); + xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_LOGO); - if (!(tmp = xkb_map_get_as_string(keymap))) + if (!(tmp = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1))) { ERR("Could not get keymap string"); return; @@ -1816,7 +1816,7 @@ e_comp_wl_input_shutdown(void) /* unreference any existing keymap */ if (comp_wl->xkb.keymap) - xkb_map_unref(comp_wl->xkb.keymap); + xkb_keymap_unref(comp_wl->xkb.keymap); /* unreference any existing context */ if (comp_wl->xkb.context) @@ -2043,21 +2043,21 @@ e_comp_wl_input_keymap_compile(struct xkb_context *ctx, struct xkb_rule_names na INF("There is a no keymap file (%s). Generate keymap using rmlvo\n", cache_path); /* fetch new keymap based on names */ - keymap = xkb_map_new_from_names(ctx, &names, 0); + keymap = xkb_keymap_new_from_names(ctx, &names, 0); use_cache_keymap = EINA_FALSE; INF("Completed to load Keymap.\n"); } else { INF("Keymap file (%s) has been found. xkb_keymap is going to be generated with it.\n", cache_path); - keymap = xkb_map_new_from_file(ctx, file, XKB_KEYMAP_FORMAT_TEXT_V1, 0); + keymap = xkb_keymap_new_from_file(ctx, file, XKB_KEYMAP_FORMAT_TEXT_V1, 0); if (!keymap) { WRN("Keymap file is exist (%s) but it is invalid file. Generate keymap using rmlvo\n", cache_path); fclose(file); if (remove(cache_path) != 0) WRN("Failed to remove keymap file: %s (errno: %d)", cache_path, errno); - keymap = xkb_map_new_from_names(ctx, &names, 0); + keymap = xkb_keymap_new_from_names(ctx, &names, 0); use_cache_keymap = EINA_FALSE; INF("Completed to load Keymap.\n"); }