mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-22 14:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create XKB compose table/state.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-12-20 21:55:31 +01:00
parent 0831b3f301
commit b7affdd92d
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
profiler/src/BackendWayland.cpp
View File

@ -14,6 +14,7 @@
#include <unistd.h> #include <unistd.h>
#include <unordered_map> #include <unordered_map>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-compose.h>
#include <wayland-client.h> #include <wayland-client.h>
#include <wayland-cursor.h> #include <wayland-cursor.h>
#include <wayland-egl.h> #include <wayland-egl.h>
@ -54,6 +55,8 @@ static struct wl_keyboard* s_keyboard;
static struct xkb_context* s_xkbCtx; static struct xkb_context* s_xkbCtx;
static struct xkb_keymap* s_xkbKeymap; static struct xkb_keymap* s_xkbKeymap;
static struct xkb_state* s_xkbState; static struct xkb_state* s_xkbState;
static struct xkb_compose_table* s_xkbComposeTable;
static struct xkb_compose_state* s_xkbComposeState;
struct Output struct Output
{ {
@ -175,6 +178,26 @@ static void KeyboardKeymap( void*, struct wl_keyboard* kbd, uint32_t format, int
if( s_xkbState ) xkb_state_unref( s_xkbState ); if( s_xkbState ) xkb_state_unref( s_xkbState );
s_xkbState = xkb_state_new( s_xkbKeymap ); s_xkbState = xkb_state_new( s_xkbKeymap );
const char* locale = getenv( "LC_ALL" );
if( !locale )
{
locale = getenv( "LC_CTYPE" );
if( !locale )
{
locale = getenv( "LANG" );
if( !locale )
{
locale = "C";
}
}
}
if( s_xkbComposeTable ) xkb_compose_table_unref( s_xkbComposeTable );
s_xkbComposeTable = xkb_compose_table_new_from_locale( s_xkbCtx, locale, XKB_COMPOSE_COMPILE_NO_FLAGS );
if( s_xkbComposeState ) xkb_compose_state_unref( s_xkbComposeState );
s_xkbComposeState = xkb_compose_state_new( s_xkbComposeTable, XKB_COMPOSE_STATE_NO_FLAGS );
} }
static void KeyboardEnter( void*, struct wl_keyboard* kbd, uint32_t serial, struct wl_surface* surf, struct wl_array* keys ) static void KeyboardEnter( void*, struct wl_keyboard* kbd, uint32_t serial, struct wl_surface* surf, struct wl_array* keys )
@ -532,6 +555,8 @@ Backend::~Backend()
xdg_wm_base_destroy( s_wm ); xdg_wm_base_destroy( s_wm );
wl_shm_destroy( s_shm ); wl_shm_destroy( s_shm );
wl_compositor_destroy( s_comp ); wl_compositor_destroy( s_comp );
if( s_xkbComposeState ) xkb_compose_state_unref( s_xkbComposeState );
if( s_xkbComposeTable ) xkb_compose_table_unref( s_xkbComposeTable );
if( s_xkbState ) xkb_state_unref( s_xkbState ); if( s_xkbState ) xkb_state_unref( s_xkbState );
if( s_xkbKeymap ) xkb_keymap_unref( s_xkbKeymap ); if( s_xkbKeymap ) xkb_keymap_unref( s_xkbKeymap );
xkb_context_unref( s_xkbCtx ); xkb_context_unref( s_xkbCtx );