diff options
author | martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2008-09-01 23:04:37 +0000 |
---|---|---|
committer | martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2008-09-01 23:04:37 +0000 |
commit | d84fe91103aa98ab5c59e905c647da1fc9935b4f (patch) | |
tree | 58b26aa44ba24308321df0626e2509eecf202eee /windows/autohotkey/Source/Methods-Other.ahk | |
parent | edd51d43958b0dfc07db59e73e2245838b00edaa (diff) |
Compose.ahk als zentralen Ort für (neue) Cokos geschaffen.
Weitere Vorbereitungen zur Aufnahme weiterer Cokos.
›©‹ jetzt auch wieder mit großem ›o‹.
git-svn-id: https://svn.neo-layout.org@838 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to 'windows/autohotkey/Source/Methods-Other.ahk')
-rw-r--r-- | windows/autohotkey/Source/Methods-Other.ahk | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/windows/autohotkey/Source/Methods-Other.ahk b/windows/autohotkey/Source/Methods-Other.ahk index a330c9a..3d3fdf6 100644 --- a/windows/autohotkey/Source/Methods-Other.ahk +++ b/windows/autohotkey/Source/Methods-Other.ahk @@ -75,7 +75,6 @@ CheckCompAsc(d,val) { if !DeadCompose
send {bs}
send % val
- isSecondCompKey = 0
return 1
}
}
@@ -87,7 +86,6 @@ CheckCompAsc12(d,val1,val2) { if !DeadCompose
send {bs}
send % val1
- isSecondCompKey = 0
return 1
} else if (Ebene = 2) and (val2 != "") {
if !DeadCompose
@@ -104,8 +102,8 @@ CheckCompUni(d,val) { PriorCompKey =
if !DeadCompose
send {bs}
+ isFurtherCompkey = 0
SendUnicodeChar(val)
- isSecondCompKey = 0
return 1
}
}
@@ -117,15 +115,15 @@ CheckCompUni12(d,val1,val2){ PriorCompKey =
if !DeadCompose
send {bs}
+ isFurtherCompkey = 0
SendUnicodeChar(val1)
- isSecondCompKey = 0
return 1
} else if (Ebene = 2) and (val2 != "") {
PriorCompKey =
if !DeadCompose
send {bs}
+ isFurtherCompkey = 0
SendUnicodeChar(val2)
- isSecondCompKey = 0
return 1
}
}
@@ -137,8 +135,8 @@ CheckComp3Uni(d,val) { PriorCompKey =
if !DeadCompose
send {bs}{bs}
+ isFurtherCompkey = 0
SendUnicodeChar(val)
- isSecondCompKey = 0
return 1
}
}
@@ -150,15 +148,15 @@ CheckComp3Uni12(d,val1,val2) { PriorCompKey =
if !DeadCompose
send {bs}{bs}
+ isFurtherCompkey = 0
SendUnicodeChar(val1)
- isSecondCompKey = 0
return 1
} else if (Ebene = 2) and (val2 != "") {
PriorCompKey =
if !DeadCompose
send {bs}{bs}
+ isFurtherCompkey = 0
SendUnicodeChar(val2)
- isSecondCompKey = 0
return 1
}
}
@@ -166,7 +164,7 @@ CheckComp3Uni12(d,val1,val2) { OutputChar(val) {
global
- if !((CheckComp(val) or PriorCompKey) and DeadCompose)
+ if !(CheckComp(val) and DeadCompose)
send % "{blind}" . val
}
@@ -175,7 +173,7 @@ OutputChar12(val1,val2) { if (Ebene = 1)
c := val1
else c := val2
- if !((CheckComp(c) or PriorCompKey) and DeadCompose)
+ if !(CheckComp(c) and DeadCompose)
if GetKeyState("Shift","P") and isMod2Locked
send % "{blind}{Shift Up}" . c . "{Shift Down}"
else send % "{blind}" . c
@@ -183,17 +181,23 @@ OutputChar12(val1,val2) { CheckComp(d) {
global
+ if isFurtherCompkey {
+ PriorCompKey := CompKey := PriorCompKey . "_" . d
+ CheckCompose()
+ CompKey =
+ isFurtherCompkey := 0
+ return 1
+ }
+ else
+ if PriorCompKey {
+ PriorCompKey := CompKey := PriorCompKey . "_" . d
+ CheckCompose()
+ isFurtherCompKey := 1
+ return 1
+ }
+ else
if (PriorDeadKey = "comp") {
CompKey := d
return 1
- } else if isSecondCompKey {
- isSecondCompKey = 0
- CompKey =
- PriorCompKey =
- ;goto neo_%lastHook%
- } else if PriorCompKey {
- CompKey := PriorCompKey . "_" . d
- isSecondCompKey = 1
- return 1
}
}
|