From fed4a4e052416f3a13f5ad46c252a84f856626f3 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 11 Mar 2011 16:21:52 +0000 Subject: keysyms für kbdneo Deadkey-Makro verändert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@2368 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/kbdneo2/Quelldateien/kbdneo2.c | 58 +++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 15 deletions(-) (limited to 'windows/kbdneo2/Quelldateien/kbdneo2.c') diff --git a/windows/kbdneo2/Quelldateien/kbdneo2.c b/windows/kbdneo2/Quelldateien/kbdneo2.c index b5d3838..2ad2e6e 100644 --- a/windows/kbdneo2/Quelldateien/kbdneo2.c +++ b/windows/kbdneo2/Quelldateien/kbdneo2.c @@ -1,10 +1,12 @@ -/* **************************************************************************\ +/****************************************************************************\ * Module Name: KBDNEO2.C * Deutsches ergonomische Layout Neo 2.0 -\************************************************************************** */ +\****************************************************************************/ #include #include "kbd.h" +//#include "kbd_mod.h" +#include "keysym4utf16.h" #include "kbdneo2.h" #if defined(_M_IA64) @@ -16,9 +18,42 @@ #endif -/* **************************************************************************\ +/* **************************************************************************************************************\ * ausVK[] - Virtual Scan Code to Virtual Key -\************************************************************************** */ +* +* +---+ +---------------+ +---------------+ +---------------+ +--------------+ +* |T01| |F1 ¦F2 ¦F3 ¦F4 | |F5 ¦F6 ¦F7 ¦F8 | |F9 ¦F10¦F11¦F12| |Druk¦Roll¦Paus| +* +---+ +---------------+ +---------------+ +---------------+ +--------------+ +* +---------------------------------------------------------+ +--------------+ +---------------+ +* |T29¦T02¦T03¦T04¦T05¦T06¦T07¦T08¦T09¦T0A¦T0B¦T0C¦T0D¦ T0E | |Einf¦Pos1¦PgUp| ¦Num¦ / ¦ * ¦ - ¦ +* |---------------------------------------------------------| |--------------| +---+---+---+---¦ +* |T0F¦T10¦T11¦T12¦T13¦T14¦T15¦T16¦T17¦T18¦T19¦T1A¦T1B¦ Ret | |Entf¦Ende¦PgDn| ¦ 7 ¦ 8 ¦ 9 ¦ ¦ +* |-----------------------------------------------------+ | +--------------+ +---+---+---¦ ¦ +* | T3A ¦T1E¦T1F¦T20¦T21¦T22¦T23¦T24¦T25¦T26¦T27¦T28¦T2B¦ | ¦ 4 ¦ 5 ¦ 6 ¦ + ¦ +* |---------------------------------------------------------| +----+ +---+---+---+---¦ +* |T2A ¦T56¦T2C¦T2D¦T2E¦T2F¦T30¦T31¦T32¦T33¦T34¦T35¦ T36 | | Up | ¦ 1 ¦ 2 ¦ 3 ¦ ¦ +* |---------------------------------------------------------| +----+----+----+ +-------+---¦ ¦ +* | Str ¦ Fe ¦ Al ¦ Leerzeichen ¦X38 ¦ Fe ¦ Me ¦ Str | |Left¦Down¦ Re.¦ ¦ 0 ¦ , ¦Ent¦ +* +---------------------------------------------------------+ +--------------+ +---------------+ +* +* +* +---+ +---------------+ +---------------+ +---------------+ +--------------+ +* |Esc| |F1 ¦F2 ¦F3 ¦F4 | |F5 ¦F6 ¦F7 ¦F8 | |F9 ¦F10¦F11¦F12| |Druk¦Roll¦Paus| +* +---+ +---------------+ +---------------+ +---------------+ +--------------+ +* +---------------------------------------------------------+ +--------------+ +---------------+ +* |T1 ¦1 ¦2 ¦3 ¦4 ¦5 ¦6 ¦7 ¦8 ¦9 ¦0 ¦- ¦T2 ¦Back | |Einf¦Pos1¦PgUp| ¦Num¦ / ¦ * ¦ - ¦ +* |---------------------------------------------------------| |--------------| +---+---+---+---¦ +* |Tab¦x ¦v ¦l ¦c ¦w ¦k ¦h ¦g ¦f ¦q ¦ß ¦T3 ¦ Ret | |Entf¦Ende¦PgDn| ¦ 7 ¦ 8 ¦ 9 ¦ ¦ +* |-----------------------------------------------------+ | +--------------+ +---+---+---¦ ¦ +* | M3 ¦u ¦i ¦a ¦e ¦o ¦s ¦n ¦r ¦t ¦d ¦y ¦M3 ¦ | ¦ 4 ¦ 5 ¦ 6 ¦ + ¦ +* |---------------------------------------------------------| +----+ +---+---+---+---¦ +* |Ums ¦M4 ¦ü ¦ö ¦ä ¦p ¦z ¦b ¦m ¦, ¦. ¦j ¦ Umsch | | Up | ¦ 1 ¦ 2 ¦ 3 ¦ ¦ +* |---------------------------------------------------------| +----+----+----+ +-------+---¦ ¦ +* | Str ¦ Fe ¦ Al ¦ Leerzeichen ¦ M4 ¦ Fe ¦ Me ¦ Str | |Left¦Down¦ Re.¦ ¦ 0 ¦ , ¦Ent¦ +* +---------------------------------------------------------+ +--------------+ +---------------+ +* +\************************************************************************************************************** */ + static ALLOC_SECTION_LDATA USHORT ausVK[] = { T00, T01, T02, T03, T04, T05, T06, T07, @@ -231,7 +266,7 @@ static ALLOC_SECTION_LDATA VK_TO_WCHARS6 aVkToWch6[] = { {0xff ,0 ,0x0060 ,0x00b8 ,0x02da ,0x00a8 ,0x1FFE ,0x00af }, {VK_TAB ,0 ,'\t' ,'\t' ,WCH_DEAD ,'\t' ,'\t' ,'\t' }, {0xff ,0 ,WCH_NONE ,WCH_NONE ,0x266b ,WCH_NONE ,WCH_NONE ,WCH_NONE }, -{'X' ,CAPLOK | KANALOK ,'x' ,'X' ,0x2026 ,WCH_NONE ,0x03be ,0x039E }, //WCH_NONE sollte »Seite hoch« sein (AHK?) +{'X' ,CAPLOK | KANALOK ,'x' ,'X' ,ellipsis ,WCH_NONE ,0x03be ,0x039E }, //WCH_NONE sollte »Seite hoch« sein (AHK?) {'V' ,CAPLOK | KANALOK ,'v' ,'V' ,'_' ,WCH_NONE ,WCH_NONE ,0x221a }, //Kana: '\b' vom AHK übernommen {'L' ,CAPLOK | KANALOK ,'l' ,'L' ,'[' ,WCH_NONE ,0x03BB ,0x039b }, //WCH_NONE sollte »Pfeil hoch« sein (AHK?) {'C' ,CAPLOK | KANALOK ,'c' ,'C' ,']' ,WCH_NONE ,0x03C7 ,0x2102 }, //WCH_NONE sollte »Entfernen« sein (AHK?) @@ -3428,42 +3463,35 @@ DEADTRANS( 0x0338 , 0x2ADD , 0x2ADC , 0x0000), static ALLOC_SECTION_LDATA KBDTABLES KbdTables = { // Modifier keys - &CharModifiers, // Characters tables - aVkToWcharTable, // Diakritika vorhanden - aDeadKey, // Namen der Keys - aKeyNames, aKeyNamesExt, aKeyNamesDead, // Scancodes zu Virtual Keys - ausVK, sizeof(ausVK) / sizeof(ausVK[0]), aE0VscToVk, aE1VscToVk, -// KLLF_ALTGR damit AltGr = Strg+Alt - - MAKELONG(KLLF_ALTGR, KBD_VERSION), - +// Kein Rechtes Alt daher AltGr auskommentiert +// MAKELONG(KLLF_ALTGR, KBD_VERSION), + 0, // keine Ligaturen - 0, 0, NULL -- cgit v1.2.3