merge 8.6

1 files changed, 180 insertions, 1 deletions

diff --git a/generic/ks_names.h b/generic/ks_names.h
index 3386ec0..3577390 100644
--- a/generic/ks_names.h
+++ b/generic/ks_names.h
@@ -426,9 +426,9 @@
 { "nacute", 0x1F1 },
 { "ncaron", 0x1F2 },
 { "odoubleacute", 0x1F5 },
-{ "udoubleacute", 0x1FB },
 { "rcaron", 0x1F8 },
 { "uring", 0x1F9 },
+{ "udoubleacute", 0x1FB },
 { "tcedilla", 0x1FE },
 { "abovedot", 0x1FF },
 { "Hstroke", 0x2A1 },
@@ -628,6 +628,7 @@
 { "Serbian_nje", 0x6AA },
 { "Serbian_tshe", 0x6AB },
 { "Macedonia_kje", 0x6AC },
+{ "Ukrainian_ghe_with_upturn", 0x6AD },
 { "Byelorussian_shortu", 0x6AE },
 { "Cyrillic_dzhe", 0x6AF },
 { "Serbian_dze", 0x6AF },
@@ -650,6 +651,7 @@
 { "Serbian_NJE", 0x6BA },
 { "Serbian_TSHE", 0x6BB },
 { "Macedonia_KJE", 0x6BC },
+{ "Ukrainian_GHE_WITH_UPTURN", 0x6BD },
 { "Byelorussian_SHORTU", 0x6BE },
 { "Cyrillic_DZHE", 0x6BF },
 { "Serbian_DZE", 0x6BF },
@@ -910,6 +912,7 @@
 { "leftdoublequotemark", 0xAD2 },
 { "rightdoublequotemark", 0xAD3 },
 { "prescription", 0xAD4 },
+{ "permille", 0xAD5 },
 { "minutes", 0xAD6 },
 { "seconds", 0xAD7 },
 { "latincross", 0xAD9 },
@@ -1009,6 +1012,14 @@
 { "hebrew_taw", 0xCFA },
 { "hebrew_taf", 0xCFA },
 { "Hebrew_switch", 0xFF7E },
+{ "XF86ModeLock", 0x1008FF01 },
+{ "XF86MonBrightnessUp", 0x1008FF02 },
+{ "XF86MonBrightnessDown", 0x1008FF03 },
+{ "XF86KbdLightOnOff", 0x1008FF04 },
+{ "XF86KbdBrightnessUp", 0x1008FF05 },
+{ "XF86KbdBrightnessDown", 0x1008FF06 },
+{ "XF86MonBrightnessCycle", 0x1008FF07 },
+{ "XF86Standby", 0x1008FF10 },
 { "XF86AudioLowerVolume", 0x1008FF11 },
 { "XF86AudioMute", 0x1008FF12 },
 { "XF86AudioRaiseVolume", 0x1008FF13 },
@@ -1016,3 +1027,171 @@
 { "XF86AudioStop", 0x1008FF15 },
 { "XF86AudioPrev", 0x1008FF16 },
 { "XF86AudioNext", 0x1008FF17 },
+{ "XF86HomePage", 0x1008FF18 },
+{ "XF86Mail", 0x1008FF19 },
+{ "XF86Start", 0x1008FF1A },
+{ "XF86Search", 0x1008FF1B },
+{ "XF86AudioRecord", 0x1008FF1C },
+{ "XF86Calculator", 0x1008FF1D },
+{ "XF86Memo", 0x1008FF1E },
+{ "XF86ToDoList", 0x1008FF1F },
+{ "XF86Calendar", 0x1008FF20 },
+{ "XF86PowerDown", 0x1008FF21 },
+{ "XF86ContrastAdjust", 0x1008FF22 },
+{ "XF86RockerUp", 0x1008FF23 },
+{ "XF86RockerDown", 0x1008FF24 },
+{ "XF86RockerEnter", 0x1008FF25 },
+{ "XF86Back", 0x1008FF26 },
+{ "XF86Forward", 0x1008FF27 },
+{ "XF86Stop", 0x1008FF28 },
+{ "XF86Refresh", 0x1008FF29 },
+{ "XF86PowerOff", 0x1008FF2A },
+{ "XF86WakeUp", 0x1008FF2B },
+{ "XF86Eject", 0x1008FF2C },
+{ "XF86ScreenSaver", 0x1008FF2D },
+{ "XF86WWW", 0x1008FF2E },
+{ "XF86Sleep", 0x1008FF2F },
+{ "XF86Favorites", 0x1008FF30 },
+{ "XF86AudioPause", 0x1008FF31 },
+{ "XF86AudioMedia", 0x1008FF32 },
+{ "XF86MyComputer", 0x1008FF33 },
+{ "XF86VendorHome", 0x1008FF34 },
+{ "XF86LightBulb", 0x1008FF35 },
+{ "XF86Shop", 0x1008FF36 },
+{ "XF86History", 0x1008FF37 },
+{ "XF86OpenURL", 0x1008FF38 },
+{ "XF86AddFavorite", 0x1008FF39 },
+{ "XF86HotLinks", 0x1008FF3A },
+{ "XF86BrightnessAdjust", 0x1008FF3B },
+{ "XF86Finance", 0x1008FF3C },
+{ "XF86Community", 0x1008FF3D },
+{ "XF86AudioRewind", 0x1008FF3E },
+{ "XF86BackForward", 0x1008FF3F },
+{ "XF86Launch0", 0x1008FF40 },
+{ "XF86Launch1", 0x1008FF41 },
+{ "XF86Launch2", 0x1008FF42 },
+{ "XF86Launch3", 0x1008FF43 },
+{ "XF86Launch4", 0x1008FF44 },
+{ "XF86Launch5", 0x1008FF45 },
+{ "XF86Launch6", 0x1008FF46 },
+{ "XF86Launch7", 0x1008FF47 },
+{ "XF86Launch8", 0x1008FF48 },
+{ "XF86Launch9", 0x1008FF49 },
+{ "XF86LaunchA", 0x1008FF4A },
+{ "XF86LaunchB", 0x1008FF4B },
+{ "XF86LaunchC", 0x1008FF4C },
+{ "XF86LaunchD", 0x1008FF4D },
+{ "XF86LaunchE", 0x1008FF4E },
+{ "XF86LaunchF", 0x1008FF4F },
+{ "XF86ApplicationLeft", 0x1008FF50 },
+{ "XF86ApplicationRight", 0x1008FF51 },
+{ "XF86Book", 0x1008FF52 },
+{ "XF86CD", 0x1008FF53 },
+{ "XF86Calculater", 0x1008FF54 },
+{ "XF86Clear", 0x1008FF55 },
+{ "XF86Close", 0x1008FF56 },
+{ "XF86Copy", 0x1008FF57 },
+{ "XF86Cut", 0x1008FF58 },
+{ "XF86Display", 0x1008FF59 },
+{ "XF86DOS", 0x1008FF5A },
+{ "XF86Documents", 0x1008FF5B },
+{ "XF86Excel", 0x1008FF5C },
+{ "XF86Explorer", 0x1008FF5D },
+{ "XF86Game", 0x1008FF5E },
+{ "XF86Go", 0x1008FF5F },
+{ "XF86iTouch", 0x1008FF60 },
+{ "XF86LogOff", 0x1008FF61 },
+{ "XF86Market", 0x1008FF62 },
+{ "XF86Meeting", 0x1008FF63 },
+{ "XF86MenuKB", 0x1008FF65 },
+{ "XF86MenuPB", 0x1008FF66 },
+{ "XF86MySites", 0x1008FF67 },
+{ "XF86New", 0x1008FF68 },
+{ "XF86News", 0x1008FF69 },
+{ "XF86OfficeHome", 0x1008FF6A },
+{ "XF86Open", 0x1008FF6B },
+{ "XF86Option", 0x1008FF6C },
+{ "XF86Paste", 0x1008FF6D },
+{ "XF86Phone", 0x1008FF6E },
+{ "XF86Q", 0x1008FF70 },
+{ "XF86Reply", 0x1008FF72 },
+{ "XF86Reload", 0x1008FF73 },
+{ "XF86RotateWindows", 0x1008FF74 },
+{ "XF86RotationPB", 0x1008FF75 },
+{ "XF86RotationKB", 0x1008FF76 },
+{ "XF86Save", 0x1008FF77 },
+{ "XF86ScrollUp", 0x1008FF78 },
+{ "XF86ScrollDown", 0x1008FF79 },
+{ "XF86ScrollClick", 0x1008FF7A },
+{ "XF86Send", 0x1008FF7B },
+{ "XF86Spell", 0x1008FF7C },
+{ "XF86SplitScreen", 0x1008FF7D },
+{ "XF86Support", 0x1008FF7E },
+{ "XF86TaskPane", 0x1008FF7F },
+{ "XF86Terminal", 0x1008FF80 },
+{ "XF86Tools", 0x1008FF81 },
+{ "XF86Travel", 0x1008FF82 },
+{ "XF86UserPB", 0x1008FF84 },
+{ "XF86User1KB", 0x1008FF85 },
+{ "XF86User2KB", 0x1008FF86 },
+{ "XF86Video", 0x1008FF87 },
+{ "XF86WheelButton", 0x1008FF88 },
+{ "XF86Word", 0x1008FF89 },
+{ "XF86Xfer", 0x1008FF8A },
+{ "XF86ZoomIn", 0x1008FF8B },
+{ "XF86ZoomOut", 0x1008FF8C },
+{ "XF86Away", 0x1008FF8D },
+{ "XF86Messenger", 0x1008FF8E },
+{ "XF86WebCam", 0x1008FF8F },
+{ "XF86MailForward", 0x1008FF90 },
+{ "XF86Pictures", 0x1008FF91 },
+{ "XF86Music", 0x1008FF92 },
+{ "XF86Battery", 0x1008FF93 },
+{ "XF86Bluetooth", 0x1008FF94 },
+{ "XF86WLAN", 0x1008FF95 },
+{ "XF86UWB", 0x1008FF96 },
+{ "XF86AudioForward", 0x1008FF97 },
+{ "XF86AudioRepeat", 0x1008FF98 },
+{ "XF86AudioRandomPlay", 0x1008FF99 },
+{ "XF86Subtitle", 0x1008FF9A },
+{ "XF86AudioCycleTrack", 0x1008FF9B },
+{ "XF86CycleAngle", 0x1008FF9C },
+{ "XF86FrameBack", 0x1008FF9D },
+{ "XF86FrameForward", 0x1008FF9E },
+{ "XF86Time", 0x1008FF9F },
+{ "XF86Select", 0x1008FFA0 },
+{ "XF86View", 0x1008FFA1 },
+{ "XF86TopMenu", 0x1008FFA2 },
+{ "XF86Red", 0x1008FFA3 },
+{ "XF86Green", 0x1008FFA4 },
+{ "XF86Yellow", 0x1008FFA5 },
+{ "XF86Blue", 0x1008FFA6 },
+{ "XF86Suspend", 0x1008FFA7 },
+{ "XF86Hibernate", 0x1008FFA8 },
+{ "XF86TouchpadToggle", 0x1008FFA9 },
+{ "XF86TouchpadOn", 0x1008FFB0 },
+{ "XF86TouchpadOff", 0x1008FFB1 },
+{ "XF86AudioMicMute", 0x1008FFB2 },
+{ "XF86Keyboard", 0x1008FFB3 },
+{ "XF86WWAN", 0x1008FFB4 },
+{ "XF86RFKill", 0x1008FFB5 },
+{ "XF86AudioPreset", 0x1008FFB6 },
+{ "XF86RotationLockToggle", 0x1008FFB7 },
+{ "XF86Switch_VT_1", 0x1008FE01 },
+{ "XF86Switch_VT_2", 0x1008FE02 },
+{ "XF86Switch_VT_3", 0x1008FE03 },
+{ "XF86Switch_VT_4", 0x1008FE04 },
+{ "XF86Switch_VT_5", 0x1008FE05 },
+{ "XF86Switch_VT_6", 0x1008FE06 },
+{ "XF86Switch_VT_7", 0x1008FE07 },
+{ "XF86Switch_VT_8", 0x1008FE08 },
+{ "XF86Switch_VT_9", 0x1008FE09 },
+{ "XF86Switch_VT_10", 0x1008FE0A },
+{ "XF86Switch_VT_11", 0x1008FE0B },
+{ "XF86Switch_VT_12", 0x1008FE0C },
+{ "XF86Ungrab", 0x1008FE20 },
+{ "XF86ClearGrab", 0x1008FE21 },
+{ "XF86Next_VMode", 0x1008FE22 },
+{ "XF86Prev_VMode", 0x1008FE23 },
+{ "XF86LogWindowTree", 0x1008FE24 },
+{ "XF86LogGrabInfo", 0x1008FE25 },