Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add Hebrew (Standard) layout #59

Merged
merged 2 commits into from
Mar 22, 2022
Merged

add Hebrew (Standard) layout #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96eb24a
add Hebrew (Standard) layout
Mar 21, 2022
e529ffd
locally define KBD IDs if missing in FreeRDP
Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 11 additions & 5 deletions libweston/backend-rdp/rdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,16 @@ struct rdp_to_xkb_keyboard_layout {

/* table reversed from
https://github.com/awakecoding/FreeRDP/blob/master/libfreerdp/locale/xkb_layout_ids.c#L811 */
/* Locally define missing keyboard layout IDs in FreeRDP 2.x */
#ifndef KBD_HEBREW_STANDARD
/* 0x2040d is for Hebrew (Standard) */
#define KBD_HEBREW_STANDARD 0x2040d
#endif
#ifndef KBD_PERSIAN
/* 0x50429 is for Dari (Afghanistan) */
#define KBD_PERSIAN 0x50429
#endif

static const
struct rdp_to_xkb_keyboard_layout rdp_keyboards[] = {
{KBD_ARABIC_101, "ara", 0},
Expand All @@ -992,6 +1002,7 @@ struct rdp_to_xkb_keyboard_layout rdp_keyboards[] = {
{KBD_FINNISH, "fi", 0},
{KBD_FRENCH, "fr", 0},
{KBD_HEBREW, "il", 0},
{KBD_HEBREW_STANDARD, "il", "basic"},
{KBD_HUNGARIAN, "hu", 0},
{KBD_HUNGARIAN_101_KEY, "hu", "standard"},
{KBD_ICELANDIC, "is", 0},
Expand Down Expand Up @@ -1029,12 +1040,7 @@ struct rdp_to_xkb_keyboard_layout rdp_keyboards[] = {
// Such as key <AE01>~<AE10> is 1,2,3...0 on Windows, not Persian numbers,
// but Xkb doesn't have that layout in "ir" group.
{KBD_FARSI, "ir", "pes"},
// 0x50429 is for Dari(Afghanistan)
#if WINPR_VERSION_MAJOR >= 3
{KBD_PERSIAN, "af", "basic"},
#else
{0x50429, "af", "basic"},
#endif
{KBD_VIETNAMESE, "vn", 0},
{KBD_ARMENIAN_EASTERN, "am", 0},
{KBD_AZERI_LATIN, 0, 0},
Expand Down