diff options
| author | mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2008-12-22 13:43:23 +0000 |
|---|---|---|
| committer | mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2008-12-22 13:43:23 +0000 |
| commit | 4637bc8a3aef197fe25126df874216da9f5ea91e (patch) | |
| tree | 0ee4f1bd5c83c931a83e9b545814b05cd25395e6 /windows/neo-vars | |
| parent | 936124b887f5d7d92839c760c0ae11871e9e438b (diff) | |
Der Taschenrechner unterstützt nun auch Hex-Zahlen (die mit "0x" eingeleitet werden) sowie die binäroperationen | bzw. & für bitweises ODER bzw. UND.
git-svn-id: https://svn.neo-layout.org@1309 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to 'windows/neo-vars')
| -rw-r--r-- | windows/neo-vars/src/source/tools.ahk | 61 |
1 files changed, 55 insertions, 6 deletions
diff --git a/windows/neo-vars/src/source/tools.ahk b/windows/neo-vars/src/source/tools.ahk index e037a6e..3ff4dc0 100644 --- a/windows/neo-vars/src/source/tools.ahk +++ b/windows/neo-vars/src/source/tools.ahk @@ -298,10 +298,11 @@ CharProcCal1() { ; starte Calculator ohne Echo
PressHookProc := "Calc"
CalcEcho := 0
- CalcVar1 := "0"
- CalcVar2 := "0"
+ CalcVar1 := ""
+ CalcVar2 := ""
CalcOp := ""
CalcPhase := 0
+ CalcHexOut := 0
}
CharProcCal2() {
@@ -309,10 +310,11 @@ CharProcCal2() { ; starte Calculator mit Echo
PressHookProc := "Calc"
CalcEcho := 1
- CalcVar1 := "0"
- CalcVar2 := "0"
+ CalcVar1 := ""
+ CalcVar2 := ""
CalcOp := ""
CalcPhase := 0
+ CalcHexOut := 0
}
PressHookCalc(PhysKey, ActKey, Char) {
@@ -340,9 +342,26 @@ PressHookCalc(PhysKey, ActKey, Char) { CalcVar1 := CalcVar1 . "8"
else if ((Char == "U0039") or (Char == "SN__9"))
CalcVar1 := CalcVar1 . "9"
+ else if ((Char == "U0039") or (Char == "SN__9"))
+ CalcVar1 := CalcVar1 . "9"
+ else if ((Char == "U0041") or (Char == "U0061"))
+ CalcVar1 := CalcVar1 . "A"
+ else if ((Char == "U0042") or (Char == "U0062"))
+ CalcVar1 := CalcVar1 . "B"
+ else if ((Char == "U0043") or (Char == "U0063"))
+ CalcVar1 := CalcVar1 . "C"
+ else if ((Char == "U0044") or (Char == "U0064"))
+ CalcVar1 := CalcVar1 . "D"
+ else if ((Char == "U0045") or (Char == "U0065"))
+ CalcVar1 := CalcVar1 . "E"
+ else if ((Char == "U0046") or (Char == "U0066"))
+ CalcVar1 := CalcVar1 . "F"
else if ((Char == "U002E") or (Char == "U002C") or (Char=="SNDot"))
CalcVar1 := CalcVar1 . "."
- else if ((Char == "U002B") or (Char == "SNAdd")) {
+ else if ((Char == "U0078") or (Char == "U0058")) {
+ CalcVar1 := CalcVar1 . "x"
+ CalcHexOut := 1
+ } else if ((Char == "U002B") or (Char == "SNAdd")) {
CalcOp := "+"
CalcPhase := 1
} else if ((Char == "U002D") or (Char == "SNSub")) {
@@ -354,6 +373,12 @@ PressHookCalc(PhysKey, ActKey, Char) { } else if ((Char == "U002F") or (Char == "SNDiv")) {
CalcOp := "/"
CalcPhase := 1
+ } else if (Char == "U0026") {
+ CalcOp := "&"
+ CalcPhase := 1
+ } else if (Char == "U007C") {
+ CalcOp := "|"
+ CalcPhase := 1
} else
PressHookProc := ""
if (CalcEcho) {
@@ -382,9 +407,24 @@ PressHookCalc(PhysKey, ActKey, Char) { CalcVar2 := CalcVar2 . "8"
else if ((Char == "U0039") or (Char == "SN__9"))
CalcVar2 := CalcVar2 . "9"
+ else if ((Char == "U0041") or (Char == "U0061"))
+ CalcVar2 := CalcVar2 . "A"
+ else if ((Char == "U0042") or (Char == "U0062"))
+ CalcVar2 := CalcVar2 . "B"
+ else if ((Char == "U0043") or (Char == "U0063"))
+ CalcVar2 := CalcVar2 . "C"
+ else if ((Char == "U0044") or (Char == "U0064"))
+ CalcVar2 := CalcVar2 . "D"
+ else if ((Char == "U0045") or (Char == "U0065"))
+ CalcVar2 := CalcVar2 . "E"
+ else if ((Char == "U0046") or (Char == "U0066"))
+ CalcVar2 := CalcVar2 . "F"
else if ((Char == "U002E") or (Char == "U002C") or (Char=="SNDot"))
CalcVar2 := CalcVar2 . "."
- else if ((Char == "U000D") or (Char == "SNEnt") or (Char=="U0020") or (Char=="U003D")) {
+ else if ((Char == "U0078") or (Char == "U0058")) {
+ CalcVar2 := CalcVar2 . "x"
+ CalcHexOut := 1
+ } else if ((Char == "U000D") or (Char == "SNEnt") or (Char=="U0020") or (Char=="U003D")) {
if (CalcOp == "+")
CalcResult := CalcVar1 + CalcVar2
else if (CalcOp == "-")
@@ -393,8 +433,17 @@ PressHookCalc(PhysKey, ActKey, Char) { CalcResult := CalcVar1 * CalcVar2
else if (CalcOp == "/")
CalcResult := CalcVar1 / CalcVar2
+ else if (CalcOp == "&")
+ CalcResult := CalcVar1 & CalcVar2
+ else if (CalcOp == "|")
+ CalcResult := CalcVar1 | CalcVar2
else
CalcResult := "Invalid"
+ if (CalcHexOut and (CalcResult != "")) {
+ SetFormat,Integer,h
+ CalcResult := CalcResult + 0
+ SetFormat,Integer,d
+ }
tosend := EncodeUni(CalcResult)
if (CalcEcho) {
Char := "U003D"
|