Changeset 3300 for trunk/src/netlabs/macros/newmenu.e

Timestamp:

Dec 8, 2018, 12:17:23 AM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Replaced Tab and Backtab configuration.
• Added more options for Tab and Backtab keys and its altered variants.
• Backtab now handles tab chars in a line correctly. For that tab chars are expanded first. The cursor sol. is now correct.
• Removed obsolete funcs, consts and universals like WANT_TAB_INSERTION_TO_SPACE and tab_keys.
• Also removed SMARTFILE.

File:

• trunk/src/netlabs/macros/newmenu.e (modified) (7 diffs)

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

@@ -2659 +2659 @@
 
    DefNextItemStartsSubMenu()
-   DefMenuItem( 'streamnewline',                                              -- Stream and Newline
+   DefMenuItem( 'streamnewline',                                              -- Stream and Newline  >
                 'Stream and Ne~wline',
                 '',
@@ -2780 +2780 @@
                 '',
                 'STATIC')
-   DefMenuItem( 'defaulttabkey',                                                    -- Tabkey: Tab key enters tab char
-                '~Tabkey: tab key enters tab char',
-                'toggle_default_tabkey',
-                'Tabkey enters a tab char instead of spaces',
+   DefMenuItem( 'tab',                                                              -- Tab []
+                'Tab []',
+                'ChangeTab tab',
+                'Change behavior of Tab',
+                '',
+                NoDismiss)
+   DefMenuItem( 'c_tab',                                                            -- Ctrl+Tab []
+                CTRL_KEY__MSG'+Tab []',
+                'ChangeTab c_tab',
+                'Change behavior of 'CTRL_KEY__MSG'+Tab',
+                '',
+                NoDismiss)
+   DefMenuItem( 'c_a_tab',                                                          -- Ctrl+Alt+Tab []
+                CTRL_KEY__MSG'+'ALT_KEY__MSG'+Tab []',
+                'ChangeTab c_a_tab',
+                'Change behavior of 'CTRL_KEY__MSG'+'ALT_KEY__MSG'+Tab',
+                '',
+                NoDismiss)
+   DefMenuItem( 's_backtab',                                                        -- Backtab []
+                'Backtab []',
+                'ChangeTab s_backtab',
+                'Change behavior of Backtab',
+                '',
+                NoDismiss)
+   DefMenuItem( 'c_s_backtab',                                                      -- Ctrl+Backtab []
+                CTRL_KEY__MSG'+Backtab []',
+                'ChangeTab c_s_backtab',
+                'Change behavior of 'CTRL_KEY__MSG'+Backtab',
                 '',
                 NoDismiss)
@@ -3675 +3699 @@
    universal stream_mode
    universal expand_on
-   universal tab_key
    universal matchtab_on
 compile if CHECK_FOR_LEXAM
@@ -4474 +4497 @@
 
 defc menuinit_specialkeys
-   universal default_tab_key
    universal cua_menu_accel
 
-   SetMenuAttribute( GetAVar('mid_defaulttabkey'), MIA_CHECKED, not default_tab_key)
+   MenuText_tab()
+   MenuText_c_tab()
+   MenuText_c_a_tab()
+   MenuText_s_backtab()
+   MenuText_c_s_backtab()
 
    KeyPath = '\NEPMD\User\SpecialKeys\Tab\MatchWordsAbove'
@@ -4522 +4548 @@
    on = QueryConfigKey( KeyPath)
    SetMenuAttribute( GetAVar('mid_blockrightaltkey'),   MIA_CHECKED, not on)
+
+defc ChangeTab
+   KeyString = arg( 1)
+   KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+   Options = QueryConfigKey( KeyPath)
+   NewOptions = Options
+   if wordpos( KeyString, 'tab c_tab c_a_tab') then
+      List = 'Text,Spaces Text,Tab TextIns,Spaces TextIns,Tab Cursor'
+      wp = wordpos( Options, List)
+      Nextwp = wp + 1
+      if Nextwp > words( List) then
+         Nextwp = 1
+      endif
+      NewOptions = word( List, Nextwp)
+   elseif wordpos( KeyString, 's_backtab c_s_backtab') then
+      List = 'Text,Spaces TextIns,Spaces Cursor'
+      wp = wordpos( Options, List)
+      Nextwp = wp + 1
+      if Nextwp > words( List) then
+         Nextwp = 1
+      endif
+      NewOptions = word( List, Nextwp)
+   endif
+   if NewOptions <> Options & NewOptions <> '' then
+      WriteConfigKey( KeyPath, NewOptions)
+   endif
+   SetMenuVarText( KeyString, TabOptionsToText( NewOptions))
+
+defproc TabOptionsToText
+   Options = arg( 1)
+   Text = ''
+   if Options = 'Text,Spaces' then
+      Text = 'moves text with spaces'
+   elseif Options = 'Text,Tab' then
+      Text = 'moves text with tab'
+   elseif Options = 'TextIns,Spaces' then
+      Text = 'moves text in insert mode with spaces'
+   elseif Options = 'TextIns,Tab' then
+      Text = 'moves text in insert mode with tab'
+   elseif Options = 'Cursor' then
+      Text = 'moves cursor'
+   endif
+   return Text
+
+defproc MenuText_tab
+   KeyString = 'tab'
+   KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+   Options = QueryConfigKey( KeyPath)
+   SetMenuVarText( KeyString, TabOptionsToText( Options))
+
+defproc MenuText_c_tab
+   KeyString = 'c_tab'
+   KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+   Options = QueryConfigKey( KeyPath)
+   SetMenuVarText( KeyString, TabOptionsToText( Options))
+
+defproc MenuText_c_a_tab
+   KeyString = 'c_a_tab'
+   KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+   Options = QueryConfigKey( KeyPath)
+   SetMenuVarText( KeyString, TabOptionsToText( Options))
+
+defproc MenuText_s_backtab
+   KeyString = 's_backtab'
+   KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+   Options = QueryConfigKey( KeyPath)
+   SetMenuVarText( KeyString, TabOptionsToText( Options))
+
+defproc MenuText_c_s_backtab
+   KeyString = 'c_s_backtab'
+   KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+   Options = QueryConfigKey( KeyPath)
+   SetMenuVarText( KeyString, TabOptionsToText( Options))
 
 defproc MenuText_scrollafterlocate
@@ -5481 +5580 @@
 
 ; ---------------------------------------------------------------------------
-defc toggle_tabkey
-   universal tab_key
-   universal menuloaded
-   -- Change tab_key for current file
-   tab_key = not tab_key
-   'SetTabKey' tab_key
-   if menuloaded then
-      -- Set MIA_CHECKED attribute for the case MIA_NODISMISS attribute is on
-      SetMenuAttribute( GetAVar('mid_tabkey'), MIA_CHECKED, not tab_key)
-   endif
-
-; ---------------------------------------------------------------------------
-defc toggle_default_tabkey
-   universal default_tab_key
-   universal tab_key
-   universal menuloaded
-   universal app_hini
-   universal appname
-
-   default_tab_key = not default_tab_key
-   -- Change tab_key for current file if it has default tabkey setting
-   getfileid fid
-   next = GetAVar(fid'.tabkey')  -- query file setting
-   if next = 'DEFAULT' | next = '' then  -- unset if tabkey was not changed by any modeexecute
-      tab_key = default_tab_key
-      'RefreshInfoLine TABKEY'
-   endif
-   if menuloaded then
-      -- Set MIA_CHECKED attribute for the case MIA_NODISMISS attribute is on
-      SetMenuAttribute( GetAVar('mid_defaulttabkey'), MIA_CHECKED, not default_tab_key)
-      old = queryprofile( app_hini, appname, INI_OPTFLAGS)
-      new = subword( old, 1, 13)' 'default_tab_key' 'subword( old, 15)
-      call setprofile( app_hini, appname, INI_OPTFLAGS, new)
-   endif
-
-; ---------------------------------------------------------------------------
 defc toggle_matchtab
    universal menuloaded
@@ -5539 +5602 @@
    getfileid fid
    next = GetAVar(fid'.matchtab')  -- query file setting
-   if next = 'DEFAULT' | next = '' then  -- unset if tabkey was not changed by any modeexecute
+   if next = 'DEFAULT' | next = '' then
       matchtab_on = on
       'RefreshInfoLine MATCHTAB'