Autohotkey: Kleinigkeiten ausgebessert

git-svn-id: https://svn.neo-layout.org@122 b9310e46-f624-0410-8ea1-cfbb3a30dc96

3 files changed, 91 insertions, 61 deletions

diff --git a/windows/XP/autohotkey/README.txt b/windows/XP/autohotkey/README.txt
index 2505905..1a3a4e6 100644
--- a/windows/XP/autohotkey/README.txt
+++ b/windows/XP/autohotkey/README.txt
@@ -47,7 +47,7 @@ L�sung ist dann, einmal die normale Controltaste zu dr�cken.
 

 Ohne die Remap-Datei k�nnen 

 die 3. Ebene mit Ctrl+Win 

-die 4. entsprechend mit Ctrl-Win-Shift

+die 4. mit Ctrl+Win+Shift

 die 5. mit AltGr 

 die 6. mit AltGr+Shift

 erreicht werden.

diff --git a/windows/XP/autohotkey/neo20-remap.ahk b/windows/XP/autohotkey/neo20-remap.ahk
index 31e169a..eca8d69 100644
--- a/windows/XP/autohotkey/neo20-remap.ahk
+++ b/windows/XP/autohotkey/neo20-remap.ahk
@@ -1,7 +1,7 @@
 /*

   Mod3: Umbelegung von Win+Ctrl auf CapsLock und #,

   Mod5: Zweites AltGr auf <

-  Version vom 03.05.2007

+  Version vom 21.05.2007

 */

 

 ;#InstallKeybdHook

@@ -42,8 +42,8 @@ Send {Control Down}
 Loop

 {

    Sleep, 10

-   GetKeyState, state, CapsLock, P

-   if state = U  

+   GetKeyState, keystate, CapsLock, P

+   if keystate = U  

    break

    ; The key has been released, so break out of the loop.

 }

@@ -58,8 +58,8 @@ Send {Control Down}
 Loop

 {

    Sleep, 10

-   GetKeyState, state, #, P

-   if state = U  

+   GetKeyState, keystate, #, P

+   if keystate = U  

    break

    ; The key has been released, so break out of the loop.

 }

@@ -79,8 +79,8 @@ Send {SC138 Down}
 Loop

 {

    Sleep, 10

-   GetKeyState, state, <, P

-   if state = U  

+   GetKeyState, keystate, <, P

+   if keystate = U  

    break

    ; The key has been released, so break out of the loop.

 }

@@ -93,14 +93,14 @@ return
 ; ----------------------------

 

 toggleneo:

-   if state <>

+   if suspendstate <>

    {

-      state =

+      suspendstate =

       menu, tray, rename, %enable%, %disable%

    }

    else

    {

-      state = : Deaktiviert

+      suspendstate = : Deaktiviert

       menu, tray, rename, %disable%, %enable%

    }

    menu, tray, tip, %name%%state%

diff --git a/windows/XP/autohotkey/neo20.ahk b/windows/XP/autohotkey/neo20.ahk
index f464e9c..a93f7fd 100644
--- a/windows/XP/autohotkey/neo20.ahk
+++ b/windows/XP/autohotkey/neo20.ahk
@@ -1,5 +1,5 @@
 /*

-   NEO-Layout - Version vom 19.05.2007

+   NEO-Layout - Version vom 21.05.2007

    Mod3 (3./4. Ebene) funktioniert �ber Win+Ctrl, 

     Mod5 (5./6. Ebene) �ber AltGr.

    Zur Umbelegung von Mod3 auf CapsLock und #

@@ -27,6 +27,7 @@ disable = Deaktiviere %name%
 ; - CapsLock �ber beide Mod3

 

 

+

 ; ANSI-Darstellung von beliebigen Unicode-Zeichen

 ; -----------------------------------------------

 ; (ben�tigt f�r MyUTF_String):

@@ -108,26 +109,35 @@ menu, tray, add, %name% beenden, exitprogram
 menu, tray, tip, %name%

 

 

+; Sondertasten

+; ------------

 

-;1. Ebene

-;---------

+Space::

+  If A_PriorHotkey = ^           ; circumflex

+    BSUnicode("ˆ")

+  Else If A_PriorHotkey = +      ; tilde  

+    BSUnicode("˜")    

+  Else

+    Send {Space} 

+Return

+

+*Enter::Send {Enter}   

+

+*Esc::Send {Esc} 

+

+*Tab::Send {Tab}

++Tab::Send +{Tab}

+

+*Backspace::Send {BS}    

+^Backspace::Send ^{BS}

 

-Space::                                       

-  If A_PriorHotkey = ^           ; circumflex 

-    BSUnicode("ˆ")                           

-  Else If A_PriorHotkey = +      ; tilde      

-    BSUnicode("˜")                           

-  Else                                        

-    Send {Space}                              

-Return                                        

-                                              

-Enter::Send {Enter}                           

-Esc::Send {Esc}                               

-                                              

 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 

+; 1. Ebene

+; ---------

 

 ^::send {^} ; circumflex, tot

+

 1::

   If A_PriorHotkey = ^          ; circumflex 

     send {bs}�

@@ -162,22 +172,22 @@ return
 q::send x

 

 w::

-  If A_PriorHotkey = <^>!+^ ; punkt darunter 

+  If A_PriorHotkey = <^>!+^      ; punkt darunter 

     BSUnicode("ṿ")

   Else 

     send v

 Return

 

 e::

-  If A_PriorHotkey = <^>!+ ; Schr�gstrich

+  If A_PriorHotkey = <^>!+       ; Schr�gstrich

     BSUnicode("ł")

-  Else If A_PriorHotkey = � ; akut 

+  Else If A_PriorHotkey = �      ; akut 

     BSUnicode("ĺ")

-  Else If A_PriorHotkey = +^ ; caron 

+  Else If A_PriorHotkey = +^     ; caron 

     BSUnicode("ľ")

-  Else If A_PriorHotkey = #^� ; cedilla

+  Else If A_PriorHotkey = #^�    ; cedilla

     BSUnicode("ļ")

-  Else If A_PriorHotkey = <^>!^ ; Mittenpunkt

+  Else If A_PriorHotkey = <^>!^  ; Mittenpunkt

     BSUnicode("ŀ")

   Else If A_PriorHotkey = <^>!+^ ; punkt darunter 

     BSUnicode("ḷ")

@@ -186,29 +196,29 @@ e::
 Return 

 

 r::

-  If A_PriorHotkey = ^ ; circumflex

+  If A_PriorHotkey = ^           ; circumflex

     BSUnicode("ĉ")

-  Else If A_PriorHotkey = +^ ; caron

+  Else If A_PriorHotkey = +^     ; caron

     BSUnicode("č")

-  Else If A_PriorHotkey = � ; akut

+  Else If A_PriorHotkey = �      ; akut

     BSUnicode("ć")

-  Else If A_PriorHotkey = #^� ; cedilla

+  Else If A_PriorHotkey = #^�    ; cedilla

     BSUnicode("ç")

-  Else If A_PriorHotkey = <^>!� ; punkt dar�ber 

+  Else If A_PriorHotkey = <^>!�  ; punkt dar�ber 

     BSUnicode("ċ")

   Else 

     Send c

 Return 

 

 t::

-  If A_PriorHotkey = ^ ; circumflex

+  If A_PriorHotkey = ^           ; circumflex

     BSUnicode("ŵ")

   Else

     send w

 Return

 

 z::

-  If A_PriorHotkey = #^� ; cedilla

+  If A_PriorHotkey = #^�         ; cedilla

     BSUnicode("ķ")

   Else If A_PriorHotkey = <^>!+^ ; punkt darunter 

     BSUnicode("ḳ")

@@ -563,13 +573,13 @@ Return
 Return

 

 +i::

-  If A_PriorHotkey = ^          ; circumflex

-    BSUnicode("Ĝ")

-  Else If A_PriorHotkey = #^^   ; brevis 

+  If A_PriorHotkey = ^           ; circumflex

+    BSUnicode("Ĝ") 

+  Else If A_PriorHotkey = #^^    ; brevis 

     BSUnicode("Ğ")

-  Else If A_PriorHotkey = #^�   ; cedilla 

+  Else If A_PriorHotkey = #^�    ; cedilla 

     BSUnicode("Ģ")

-  Else If A_PriorHotkey = <^>!� ; punkt dar�ber 

+  Else If A_PriorHotkey = <^>!�  ; punkt dar�ber 

     BSUnicode("Ġ")

   Else send G

 Return

@@ -611,17 +621,17 @@ Return
 Return

 

 +s::

-  If A_PriorHotkey = #^+        ; Diaerese

+  If A_PriorHotkey = #^+         ; Diaerese

     Send, {bs}�

-  Else If A_PriorHotkey = ++    ; macron

+  Else If A_PriorHotkey = ++     ; macron

     BSUnicode("Ī")

-  Else If A_PriorHotkey = #^^   ; brevis 

+  Else If A_PriorHotkey = #^^    ; brevis 

     BSUnicode("Ĭ")

-  Else If A_PriorHotkey = #^+�  ; ogonek

+  Else If A_PriorHotkey = #^+�   ; ogonek

     BSUnicode("Į")

-  Else If A_PriorHotkey = +     ; tilde

+  Else If A_PriorHotkey = +      ; tilde

     BSUnicode("Ĩ")

-  Else If A_PriorHotkey = <^>!� ; punkt dar�ber 

+  Else If A_PriorHotkey = <^>!�  ; punkt dar�ber 

     BSUnicode("İ")

   Else 

     Send I

@@ -756,9 +766,9 @@ Return
 Return

 

 +�::  

-  If A_PriorHotkey = #^+     ; Diaerese

+  If A_PriorHotkey = #^+        ; Diaerese

     Send {bs}�

-  Else If A_PriorHotkey = ^  ; circumflex

+  Else If A_PriorHotkey = ^     ; circumflex

     BSUnicode("Ŷ")

   Else

     send Y

@@ -769,7 +779,7 @@ Return
 +c::send �

 

 +v::

-  If A_PriorHotkey = <^>!�    ; punkt dar�ber 

+  If A_PriorHotkey = <^>!�      ; punkt dar�ber 

     BSUnicode("Ṗ")

   Else 

     send P

@@ -889,6 +899,7 @@ Return
 #^y::send {#}  

 #^x::send $

 #^c::send |

+

 #^v::

   If A_PriorHotkey = +    ; tilde

     BSUnicode("≈")

@@ -937,10 +948,10 @@ Return
 #^++::send "        ;doppelakut

 

 #^+a::return

-#^+s::Unicode("ι") ;iota - funktioniert nicht !?

+#^+s::Unicode("ι") ;iota 

 #^+d::Unicode("α") ;alpha

 #^+f::Unicode("ε") ;epsilon

-#^+g::Unicode("ω") ;omega - funktioniert nicht !?

+#^+g::Unicode("ω") ;omega 

 #^+h::Unicode("σ") ;sigma

 #^+j::Unicode("ν") ;nu

 #^+k::Unicode("ρ") ;rho

@@ -1093,6 +1104,7 @@ Return
 ^8::send ^8

 ^9::send ^9

 ^0::send ^0

+^�::send ^-

 

 ^q::send ^x

 ^w::send ^v

@@ -1105,6 +1117,7 @@ Return
 ^o::send ^f

 ^p::send ^q

 ^�::send ^�

+^+::send ^+ ;z.B. Firefox Schrift gr��er

 

 ^a::send ^u

 ^s::send ^i

@@ -1126,7 +1139,7 @@ Return
 ^b::send ^z

 ^n::send ^b

 ^m::send ^m

-^-::send ^j

+^-::send ^- ;z.B. Firefox Schrift kleiner

 

 

 ;Alt-Ebene

@@ -1194,7 +1207,12 @@ Return
 

 #q::sendevent #x

 #w::sendevent #v

-#e::sendevent #l  

+

+#e::

+  Run,%A_WinDir%\System32\Rundll32.exe User32.dll`,LockWorkStation 

+  return

+  ;sendevent #l  

+

 #r::sendevent #c

 #t::sendevent #w

 #z::sendevent #k

@@ -1213,7 +1231,19 @@ Return
 #j::sendevent #n

 #k::sendevent #r

 #l::sendevent #t

-#�::sendevent #d

+

+#�:: ;  sendevent #d

+  FileAppend,

+    (

+    [Shell]

+    Command=2

+    [Taskbar]

+    Command=ToggleDesktop

+    ), DRT.scf

+  Run DRT.scf

+  FileDelete, DRT.scf

+Return 

+

 #�::sendevent #y

 

 #y::sendevent #�

@@ -1332,14 +1362,14 @@ Return
 #^+NumpadUp::Unicode("∩")    ;

 #^+NumpadPgUp::Unicode("≫")  ; gg

 #^+NumpadLeft::Unicode("⊂")  ;

-#^+NumpadClear::Unicode("")    ;

+#^+NumpadClear::Unicode("∊") ;

 #^+NumpadRight::Unicode("⊃") ;

 #^+NumpadEnd::Unicode("≤")   ; leq

 #^+NumpadDown::Unicode("∪")  ;

 #^+NumpadPgDn::Unicode("≥")  ; geq

 #^+NumpadIns::send � 

 #^+NumPadDel::send `,

-  

+

 

 

 ; ------------------------------

@@ -1360,7 +1390,7 @@ Return
 <^>!Numpad8::Unicode("∩")  ;

 <^>!Numpad9::Unicode("≫")  ; gg

 <^>!Numpad4::Unicode("⊂")  ;

-<^>!Numpad5::Unicode("")     ;

+<^>!Numpad5::Unicode("∊")  ;

 <^>!Numpad6::Unicode("⊃")  ;

 <^>!Numpad1::Unicode("≤")  ; leq

 <^>!Numpad2::Unicode("∪")  ;