2 files changed, 70 insertions, 137 deletions
diff --git a/windows/neo-vars/src/source/keydefinitions.ahk b/windows/neo-vars/src/source/keydefinitions.ahk
index 9bedf09..80307eb 100644
--- a/windows/neo-vars/src/source/keydefinitions.ahk
+++ b/windows/neo-vars/src/source/keydefinitions.ahk
@@ -236,7 +236,26 @@ Comp := ""
 RSC(sc,vk) {
   global
   vksc%sc% := "VK" . vk . "SC" . sc
-  dnkey := "*" . vksc%sc%
+  RKEY(vksc%sc%)
+}
+
+RSCN(sc,vk1,vk2) {
+  RKEY("VK" . vk1 . "SC" . sc)
+  RKEY("VK" . vk2 . "SC" . sc)
+}
+
+RKEY(key) {
+  RKEYN("*" . key)
+}
+
+RKEYS(keys) {
+  loop,parse,keys,`,
+  {
+    RKEY(A_Loopfield)
+  }
+}
+
+RKEYN(dnkey) {
   upkey := dnkey . " up"
   Hotkey,% dnkey,allstarhook
   Hotkey,% upkey,allstarhook
@@ -295,6 +314,31 @@ Layout00000407() {
   RSC("033","BC")
   RSC("034","BE")
   RSC("035","BD")
+; Numpad
+  RSC("145","90") ; NumLock
+  RSC("135","6F") ; NumpadDiv
+  RSC("037","6A") ; NumpadMult
+  RSC("04A","6D") ; NumpadSub
+  RSC("04E","6B") ; NumpadAdd
+  RSCN("047","67","24") ; Numpad7/NumpadHome
+  RSCN("048","68","26") ; Numpad8/NumpadUp
+  RSCN("049","69","21") ; Numpad9/NumpadPgUp
+  RSCN("04B","64","25") ; Numpad4/NumpadLeft
+  RSCN("04C","65","0C") ; Numpad5/NumpadClear
+  RSCN("04D","66","27") ; Numpad6/NumpadRight
+  RSCN("04F","61","23") ; Numpad1/NumpadEnd
+  RSCN("050","62","28") ; Numpad2/NumpadDown
+  RSCN("051","63","22") ; Numpad3/NumpadPgDn
+  RSCN("052","60","2D") ; Numpad0/NumpadIns
+  RSCN("053","6E","2E") ; NumpadDot/NumpadDel
+; Diverses
+  RKEYS("F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12")
+  RKEYS("space,enter,backspace")
+  RKEYS("del,ins,home,end,pgup,pgdn,up,down,left,right")
+; Diverses ohne *
+  RKEYN("tab")
+  RKEYN("esc")
+  RKEYN("numpadenter")
 ; Modifier
   RSC("02A","A0") ; M2L
   RSC("136","A1") ; M2R
@@ -483,6 +527,31 @@ Layout00000807() {
   RSC("033","BC")
   RSC("034","BE")
   RSC("035","BD")
+; Numpad
+  RSC("145","90") ; NumLock
+  RSC("135","6F") ; NumpadDiv
+  RSC("037","6A") ; NumpadMult
+  RSC("04A","6D") ; NumpadSub
+  RSC("04E","6B") ; NumpadAdd
+  RSCN("047","67","24") ; Numpad7/NumpadHome
+  RSCN("048","68","26") ; Numpad8/NumpadUp
+  RSCN("049","69","21") ; Numpad9/NumpadPgUp
+  RSCN("04B","64","25") ; Numpad4/NumpadLeft
+  RSCN("04C","65","0C") ; Numpad5/NumpadClear
+  RSCN("04D","66","27") ; Numpad6/NumpadRight
+  RSCN("04F","61","23") ; Numpad1/NumpadEnd
+  RSCN("050","62","28") ; Numpad2/NumpadDown
+  RSCN("051","63","22") ; Numpad3/NumpadPgDn
+  RSCN("052","60","2D") ; Numpad0/NumpadIns
+  RSCN("053","6E","2E") ; NumpadDot/NumpadDel
+; Diverses
+  RKEYS("F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12")
+  RKEYS("space,enter,backspace")
+  RKEYS("del,ins,home,end,pgup,pgdn,up,down,left,right")
+; Diverses ohne *
+  RKEYN("tab")
+  RKEYN("esc")
+  RKEYN("numpadenter")
 ; Modifier
   RSC("02A","A0") ; M2L
   RSC("136","A1") ; M2R
diff --git a/windows/neo-vars/src/source/keyhooks.ahk b/windows/neo-vars/src/source/keyhooks.ahk
index 1c1e1d3..b5b3505 100644
--- a/windows/neo-vars/src/source/keyhooks.ahk
+++ b/windows/neo-vars/src/source/keyhooks.ahk
@@ -9,142 +9,6 @@ Suspend, Permit
   Traytogglesuspend()
 return
 
-;;;;;; DOWN EVENTS
-
-; Funktionstasten
-
-*F1::
-*F2::
-*F3::
-*F4::
-*F5::
-*F6::
-*F7::
-*F8::
-*F9::
-*F10::
-*F11::
-*F12::
-
-*space::
-
-; Numpad
-
-*VK90SC145:: ; NumLock
-*VK6FSC135:: ; NumpadDiv
-*VK6ASC037:: ; NumpadMult
-*VK6DSC04A:: ; NumpadSub
-*VK6BSC04E:: ; NumpadAdd
-; *VK0DSC11C:: ; NumpadEnter
-*VK67SC047:: ; NumPad7
-*VK24SC047:: ; NumPadHome
-*VK68SC048:: ; NumPad8
-*VK26SC048:: ; NumPadUp
-*VK69SC049:: ; NumPad9
-*VK21SC049:: ; NumPadPgUp
-*VK64SC04B:: ; NumPad4
-*VK25SC04B:: ; NumPadLeft
-*VK65SC04C:: ; NumPad5
-*VK0CSC04C:: ; NumPadClear
-*VK66SC04D:: ; NumPad6
-*VK27SC04D:: ; NumPadRight
-*VK61SC04F:: ; NumPad1
-*VK23SC04F:: ; NumPadEnd
-*VK62SC050:: ; NumPad2
-*VK28SC050:: ; NumPadDown
-*VK63SC051:: ; NumPad3
-*VK22SC051:: ; NumPadPgDn
-*VK60SC052:: ; NumPad0
-*VK2DSC052:: ; NumPadIns
-*VK6ESC053:: ; NumPadDot
-*VK2ESC053:: ; NumPadDel
-
-; Navigation, Sonstiges
-
-tab::
-esc::
-*enter::
-*backspace::
-*del::
-*ins::
-*home::
-*end::
-*pgup::
-*pgdn::
-*up::
-*down::
-*left::
-*right::
-numpadenter::
-
-;;;;;; UP EVENTS
-
-; Funktionstasten
-
-*F1 up::
-*F2 up::
-*F3 up::
-*F4 up::
-*F5 up::
-*F6 up::
-*F7 up::
-*F8 up::
-*F9 up::
-*F10 up::
-*F11 up::
-*F12 up::
-
-*space up::
-
-; Numpad
-
-*VK90SC145 up:: ; NumLock
-*VK6FSC135 up:: ; NumpadDiv
-*VK6ASC037 up:: ; NumpadMult
-*VK6DSC04A up:: ; NumpadSub
-*VK6BSC04E up:: ; NumpadAdd
-; *VK0DSC11C up:: ; NumpadEnter
-*VK67SC047 up:: ; NumPad7
-*VK24SC047 up:: ; NumPadHome
-*VK68SC048 up:: ; NumPad8
-*VK26SC048 up:: ; NumPadUp
-*VK69SC049 up:: ; NumPad9
-*VK21SC049 up:: ; NumPadPgUp
-*VK64SC04B up:: ; NumPad4
-*VK25SC04B up:: ; NumPadLeft
-*VK65SC04C up:: ; NumPad5
-*VK0CSC04C up:: ; NumPadClear
-*VK66SC04D up:: ; NumPad6
-*VK27SC04D up:: ; NumPadRight
-*VK61SC04F up:: ; NumPad1
-*VK23SC04F up:: ; NumPadEnd
-*VK62SC050 up:: ; NumPad2
-*VK28SC050 up:: ; NumPadDown
-*VK63SC051 up:: ; NumPad3
-*VK22SC051 up:: ; NumPadPgDn
-*VK60SC052 up:: ; NumPad0
-*VK2DSC052 up:: ; NumPadIns
-*VK6ESC053 up:: ; NumPadDot
-*VK2ESC053 up:: ; NumPadDel
-
-; Navigation, Sonstiges
-
-tab up::
-esc up::
-*enter up::
-*backspace up::
-*del up::
-*ins up::
-*home up::
-*end up::
-*pgup up::
-*pgdn up::
-*up up::
-*down up::
-*left up::
-*right up::
-numpadenter up::
-
 allstarhook:
   AllStar(A_ThisHotkey)
 return