Changeset 3189

Timestamp:

Oct 14, 2018, 10:18:53 AM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Made c_break working. That key is already internally defined as ProcessBreak. It stops working when being defined as accelerator key additionally.
• Added CtrlIsDown and ShiftIsDown procs.

Location:

trunk/src/netlabs/macros

Files:

• keys.e (modified) (2 diffs)
• newmenu.e (modified) (1 diff)

trunk/src/netlabs/macros/keys.e ¶

@@ -217 +217 @@
 
 ; ---------------------------------------------------------------------------
+defproc CtrlIsDown
+   ks = getkeystate( VK_CTRL)
+   fDown = (ks = 1 | ks = 2)
+   return fDown
+
+; ---------------------------------------------------------------------------
 defproc AltIsDown
    ks = getkeystate( VK_ALT)
+   fDown = (ks = 1 | ks = 2)
+   return fDown
+
+; ---------------------------------------------------------------------------
+defproc ShiftIsDown
+   ks = getkeystate( VK_SHIFT)
    fDown = (ks = 1 | ks = 2)
    return fDown
@@ -589 +601 @@
       AccelId = lastkeyaccelid
    endif
-   buildacceltable activeaccel, KeyString''\1''Cmd, Flags, Key, AccelId
+   -- Avoid to define c_break as accelerator key to keep the internal
+   -- definition working. That key is additionally defined as ProcessBreak
+   -- in STDKEYS.E, to make MenuAccelString() work.
+   if not KeyString <> 'c_break' then
+      buildacceltable activeaccel, KeyString''\1''Cmd, Flags, Key, AccelId
+   endif
 
    -- Save key def in array to allow for searching for KeyString and Cmd

trunk/src/netlabs/macros/newmenu.e ¶

@@ -4117 +4117 @@
    UpSplitCfg = upcase( SplitCfg)
 
-   ks = getkeystate( VK_CTRL)
-   fCtrlDown = (ks = 1 | ks = 2)
-   if fCtrlDown then
+   if CtrlIsDown() then
       'ConfigureNewlineCmd' key
       return