Changeset 1309

Timestamp:

12/22/08 14:43:23 (4 years ago)

Author:

mösi

Message:

Der Taschenrechner unterstützt nun auch Hex-Zahlen (die mit "0x" eingeleitet werden) sowie die binäroperationen | bzw. & für bitweises ODER bzw. UND.

Files:

• windows/neo-vars/src/source/tools.ahk (modified) (6 diffs)

windows/neo-vars/src/source/tools.ahk

@@ -299 +299 @@
   PressHookProc := "Calc"
   CalcEcho := 0
-  CalcVar1 := "0"
-  CalcVar2 := "0"
+  CalcVar1 := ""
+  CalcVar2 := ""
   CalcOp := ""
   CalcPhase := 0
+  CalcHexOut := 0
 }
 
@@ -310 +311 @@
   PressHookProc := "Calc"
   CalcEcho := 1
-  CalcVar1 := "0"
-  CalcVar2 := "0"
+  CalcVar1 := ""
+  CalcVar2 := ""
   CalcOp := ""
   CalcPhase := 0
+  CalcHexOut := 0
 }
 
@@ -341 +343 @@
     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
@@ -354 +373 @@
     } 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
@@ -383 +408 @@
     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
@@ -394 +434 @@
       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) {