mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

locale: don't fall back to keymap detection when xkbfile is used

Browse Source
This commit is contained in:
Mads Kiilerich 2012-03-24 01:57:10 +01:00
parent df80dff43d
commit b931891bed
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libfreerdp-locale/CMakeLists.txt
View File

@ -27,7 +27,9 @@ set(FREERDP_LOCALE_SRCS
set(FREERDP_LOCALE_X11_SRCS
xkb_layout_ids.c
xkb_layout_ids.h
xkb_layout_ids.h)
set(FREERDP_LOCALE_X11_KEYMAP_SRCS
keyboard_keymap.c
keyboard_keymap.h
keyboard_x11.c
@ -65,6 +67,8 @@ if(NOT WIN32)
include_directories(${XKBFILE_INCLUDE_DIRS})
set(FREERDP_LOCALE_SRCS ${FREERDP_LOCALE_SRCS} ${FREERDP_LOCALE_XKBFILE_SRCS})
set(FREERDP_LOCALE_LINK_LIBRARIES ${FREERDP_LOCALE_LINK_LIBRARIES} ${XKBFILE_LIBRARIES})
else()
set(FREERDP_LOCALE_SRCS ${FREERDP_LOCALE_SRCS} ${FREERDP_LOCALE_X11_KEYMAP_SRCS})
endif()
endif()
endif()

2
libfreerdp-locale/keyboard.c
View File

@ -74,8 +74,6 @@ uint32 freerdp_keyboard_init(uint32 keyboardLayoutId)
#ifdef WITH_XKBFILE
keyboardLayoutId = freerdp_keyboard_init_xkbfile(keyboardLayoutId, X11_KEYCODE_TO_RDP_SCANCODE);
if (keyboardLayoutId == 0)
keyboardLayoutId = freerdp_keyboard_init_x11(keyboardLayoutId, X11_KEYCODE_TO_RDP_SCANCODE);
#else
keyboardLayoutId = freerdp_keyboard_init_x11(keyboardLayoutId, X11_KEYCODE_TO_RDP_SCANCODE);
#endif