Changeset 3300

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.

Location:

trunk/src/netlabs

Files:

• bin/defaults.cfg (modified) (2 diffs)
• macros/config.e (modified) (10 diffs)
• macros/infoline.e (modified) (6 diffs)
• macros/init.e (modified) (2 diffs)
• macros/keys.e (modified) (5 diffs)
• macros/modecfg.e (modified) (4 diffs)
• macros/modeexec.e (modified) (3 diffs)
• macros/newmenu.e (modified) (7 diffs)
• macros/stdcmds.e (modified) (1 diff)
• mode/e/e.hil (modified) (5 diffs)

trunk/src/netlabs/bin/defaults.cfg ¶

@@ -73 +73 @@
 
 ; Statusline and Titletext
-\NEPMD\User\InfoLine\StatusFields = Line <line> of <lines> * Col <col> * 0x<hex>=<dec> * <ins> * <markingmode>-<streammode> * Ma <ma> * Tabs <tabs>, <tabkey> * <mode> * <modified>
+\NEPMD\User\InfoLine\StatusFields = Line <line> of <lines> * Col <col> * 0x<hex>=<dec> * <ins> * <markingmode>-<streammode> * Ma <ma> * Tabs <tabs>, <matchtab> * <mode> * <modified>
 \NEPMD\User\InfoLine\TitleFields  = <file>/<files> * <filename> * <datetimemodified>
 ; \250
@@ -148 +148 @@
 \NEPMD\User\SpecialKeys\Line\c_enter     = NoAdd,KeepCol
 
-; Tab key
+; Tab and Backtab keys, ShowTabs
+\NEPMD\User\SpecialKeys\tab                 = Text,Spaces
+\NEPMD\User\SpecialKeys\c_tab               = Cursor
+\NEPMD\User\SpecialKeys\c_a_tab             = Text,Tab
+\NEPMD\User\SpecialKeys\s_backtab           = Text,Spaces
+\NEPMD\User\SpecialKeys\c_s_backtab         = Cursor
 \NEPMD\User\SpecialKeys\Tab\MatchWordsAbove = 0
 \NEPMD\User\SpecialKeys\Tab\ShowTabs        = 1

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

@@ -277 +277 @@
    universal rexx_profile
    universal cua_marking_switch
-   universal tab_key
    universal cua_menu_accel
    universal vepm_pointer, cursordimensions
@@ -304 +303 @@
 
    if page = 1 then  --------------------- Page 1 is tabs -------------
-      if fsend_default = 2 then tempstr = .tabs
-      else tempstr = checkini( fsend_default, INI_TABS, DEFAULT_TABS)
-      endif
-      call send_config_data( hndle, tempstr, 3, help_panel)
-      tempstr = 0
-      if not fsend_default then      -- 0: Use values from .ini file
-         newcmd = queryprofile( app_hini, appname, INI_OPTFLAGS)
-         if words(newcmd) >= 14 then
-            -- OPTFLAGS:   14
-            tempstr = word(newcmd, 14)
-         endif
-      elseif fsend_default = 2 then  -- 2: Use current values
-         tempstr = tab_key
-      endif
-      call send_config_data( hndle, tempstr, 19, help_panel)
+; Page 1 is not compatible with the config via the Preferences menu.
+;      if fsend_default = 2 then tempstr = .tabs
+;      else tempstr = checkini( fsend_default, INI_TABS, DEFAULT_TABS)
+;      endif
+;      call send_config_data( hndle, tempstr, 3, help_panel)
+;      tempstr = 0
+;      if not fsend_default then      -- 0: Use values from .ini file
+;         newcmd = queryprofile( app_hini, appname, INI_OPTFLAGS)
+;         if words(newcmd) >= 14 then
+;            -- OPTFLAGS:   14
+;            tempstr = word(newcmd, 14)
+;         endif
+;      elseif fsend_default = 2 then  -- 2: Use current values
+;         tempstr = tab_key
+;      endif
+;      call send_config_data( hndle, tempstr, 19, help_panel)
 
    elseif page = 2 then  ----------------- Page 2 is margins ----------
@@ -353 +353 @@
 
    elseif page = 4 then  ----------------- Page 4 is paths ------------
-; Page 4 is not compatible with the config via the Options menu.
+; Page 4 is not compatible with the config via the Preferences menu.
 ;compile if CHECK_FOR_LEXAM
 ;      if lexam_is_available then
@@ -624 +624 @@
    universal rexx_profile
    universal cua_marking_switch
-   universal tab_key
-   universal default_tab_key
    universal cua_menu_accel
    universal vepm_pointer, cursordimensions
@@ -837 +835 @@
 
    elseif configid = 19 then
-      on = newcmd
-      if on <> default_tab_key then
-         if ChangeFileSettings = 1 then                      -- change current file's setting
-            tab_key = on -- old definition
-            'postme RefreshInfoline TABKEY'
-         elseif ChangeFileSettings = 'REFRESHDEFAULT' then
-            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 = on
-               'postme RefreshInfoLine TABKEY'
-            endif
-         endif
-         default_tab_key = on
-      endif
-
-      if perm then
-         newcmd = queryprofile( app_hini, appname, INI_OPTFLAGS)
-         if newcmd <> '' then
-            -- OPTFLAGS:   14
-            call setprofile( app_hini, appname, INI_OPTFLAGS,
-                             subword( newcmd, 1, 13) on subword( newcmd, 15))
-         else
-            'SaveOptions OptOnly'
-         endif
-      endif
+;      on = newcmd
+;      if on <> default_tab_key then
+;         if ChangeFileSettings = 1 then                      -- change current file's setting
+;            tab_key = on -- old definition
+;            'postme RefreshInfoline TABKEY'
+;         elseif ChangeFileSettings = 'REFRESHDEFAULT' then
+;            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 = on
+;               'postme RefreshInfoLine TABKEY'
+;            endif
+;         endif
+;         default_tab_key = on
+;      endif
+;
+;      if perm then
+;         newcmd = queryprofile( app_hini, appname, INI_OPTFLAGS)
+;         if newcmd <> '' then
+;            -- OPTFLAGS:   14
+;            call setprofile( app_hini, appname, INI_OPTFLAGS,
+;                             subword( newcmd, 1, 13) on subword( newcmd, 15))
+;         else
+;            'SaveOptions OptOnly'
+;         endif
+;      endif
 
    elseif configid = 20 then
@@ -963 +961 @@
    universal show_longnames
    universal rexx_profile
-   universal tab_key
-   universal default_tab_key
    universal vepm_pointer, cursordimensions
    universal appname
@@ -1066 +1062 @@
    endif
 
-   default_tab_key = 0
-   if tabkey <> '' then
-      default_tab_key = tabkey
-   endif
-   tab_key = default_tab_key
+;   default_tab_key = 0
+;   if tabkey <> '' then
+;      default_tab_key = tabkey
+;   endif
+;   tab_key = default_tab_key
 
    bm_filename = queryprofile( app_hini, appname, INI_BITMAP)
@@ -1253 +1249 @@
    universal rexx_profile
    universal escape_key
-   universal tab_key
    universal cua_menu_accel
    universal cua_marking_switch
@@ -1273 +1268 @@
                     rexx_profile                       || ' ' ||  -- 12 REXX profile
                     escape_key                         || ' ' ||  -- 13 Esc opens commandline
-                    tab_key                            || ' ' ||  -- 14 Tabkey
+                    0                                  || ' ' ||  -- 14 Tabkey
                     bitmap_present                     || ' ' ||  -- 15 Background bitmap
                     queryframecontrol(EFRAMEF_TOOLBAR) || ' ' ||  -- 16 Toolbar
@@ -1558 +1553 @@
    getfileid fid
    on = (GetAVar( fid'.expand') = 1)
-   return on
-
-; ---------------------------------------------------------------------------
-defproc GetTabkey
-   universal tab_key
-   getfileid fid
-   on = (GetAVar( fid'.tabkey') = 1)
    return on
 

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

@@ -154 +154 @@
 defc RefreshStatusLine
    if .visible then
-      'setstatusline 'GetStatusFields()
+      'SetStatusLine 'GetStatusFields()
    endif  -- .visible
    return
@@ -329 +329 @@
 ; Replace info field vars with '%...' or other values
 defproc GetInfoFieldValue(FVar, var FFlag)
-   universal tab_key
    universal stream_mode
    universal expand_on
@@ -385 +384 @@
    elseif FVar = 'TABS'             then FValue = word( .tabs, 1 )                       -- show only 1st tab
                                          FFlag  = 'TABS'
-   elseif FVar = 'TABKEY'           then FValue = word( 'off on', (tab_key = 1) + 1)     -- show 'on' or 'off'
-                                         FFlag  = 'TABKEY'
    elseif FVar = 'MATCHTAB'         then FValue = word( '- match', (matchtab_on = 1) + 1)  -- show '-' or 'match'
                                          FFlag  = 'MATCHTAB'
@@ -550 +547 @@
 ;   call NepmdPmPrintf('PROCESSSELECTREFRESHINFOLINE: executing refreshinfoline -- '.filename)
    'ResetDateTimeModified'  -- required to check file on disk
-   Flags = 'TABS TABKEY MATCHTAB MODE MARGINS FILE SECTION MODIFIED' ||
+   Flags = 'TABS MATCHTAB MODE MARGINS FILE SECTION MODIFIED' ||
            ' STREAMMODE EXPAND MARKINGMODE KEYSET'
    'RefreshInfoLine' Flags
@@ -751 +748 @@
       -- The following uses only internally defined fields and
       -- therefore avoids the overhead for additional refreshs
-      --Standard = "Line <line> of <lines> * Col <col> * '<hex>'x/<dec> * <ins> * <modified>"
-      Standard = "Line <line> of <lines> * Col <col> * '<hex>'x/<dec> * Ma <ma> * Tabs <tabs>, <tabkey> * <mode> * <keyset> * <section> * <modified>"
+      --Example  = "Line <line> of <lines> * Col <col> * 0x<hex>=<dec> * <ins> * Tabs <tabs>, <matchtab> * <markingmode>-<streammode> * <mode> * <codingstyle> * <keyset> * <dict> * <modified>"
+      --Standard = "Line <line> of <lines> * Column <col> * <modified> * <file> File(s)"
+      Standard = "Line %l of %s   Column %c %i   %m   %f"
    elseif Type = 'SEP' then
       KeyPath  = '\NEPMD\User\InfoLine\Sep'
@@ -765 +763 @@
    endif
    IniValue = QueryConfigKey( KeyPath)
-   parse value entrybox( Title,
+   parse value EntryBox( Title,
                          '/~Set/~Reset/Standard ~EPM/Cancel',
                          IniValue,

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

@@ -300 +300 @@
    universal rexx_profile
    universal escape_key
-   universal tab_key
 
    CurMenu = ''
@@ -439 +438 @@
    escape_key = 1
 
-   -- o  Will be overridden later.
-   tab_key = 0
-
    -- stay = 0: After a change, move the cursor to the last changed string
 compile if defined( my_stay)

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

@@ -56 +56 @@
    RESPECT_SCROLL_LOCK = 1
 compile endif
--- Ver.3.09:  Set this to 1 if you want the FILE key to quit rather than
--- save the file if the file was not modified.  Has the side effect that
--- the Name command sets .modify to 1.
-compile if not defined(SMARTFILE)
-   SMARTFILE = 1
-compile endif
 -- For Toolkit developers - set to 0 if you don't want the user to be able
 -- to go to line 0.  Affects MH_gotoposition in MOUSE.E and Def Up in STDKEYS.E.
@@ -69 +63 @@
    -- Can be '0', '1', or 'STREAM' (dependant on STREAM_MODE)
    TOP_OF_FILE_VALID = 1
-compile endif
--- Allow pressing tab in insert mode to insert spaces to next tab stop in
--- line mode as well as in stream mode.
-compile if not defined(WANT_TAB_INSERTION_TO_SPACE)
-   -- for line mode only
-   WANT_TAB_INSERTION_TO_SPACE = 0
 compile endif
 compile if not defined(WORD_MARK_TYPE)
@@ -4130 +4118 @@
 
 defc FileOrQuit
-compile if SMARTFILE
    if .modify then
       'File'
@@ -4136 +4123 @@
       'Quit'
    endif
-compile else
-   'File'
-compile endif
 
 defc EditFileDlg
@@ -4387 +4371 @@
    oldline
 
+; ---------------------------------------------------------------------------
+; Todo: Move marked lines
+; Menu item:                                                         Flags:
+; Backtab [moves text with spaces]                             Text        Spaces
+;         [moves text in insert mode with spaces]              TextIns     Spaces
+;         [moves cursor]                                       Cursor
 defc BackTab
    universal matchtab_on
+   universal curkey
+
+   Options = arg( 1)
+   if Options = '' then
+      parse value curkey with KeyString \1 .
+      KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+      Options = QueryConfigKey( KeyPath)
+   endif
+   Options = translate( upcase( Options), ' ', ',')  -- uppercase, commas to spaces
+   fText    = (wordpos( 'TEXT',    Options) > 0)
+   fTextIns = (wordpos( 'TEXTINS', Options) > 0)
+   fCursor  = (wordpos( 'CURSOR',  Options) > 0)
+   fSpaces  = (wordpos( 'SPACES',  Options) > 0)
+   -- Default values
+   if not fText & not fTextIns & not fCursor then
+      fCursor = 1
+   endif
+   if fCursor then
+      fSpaces = 0
+   else
+      fSpaces = 1
+   endif
 
    call UnmarkIfCua()
-   if matchtab_on & .line > 1 then
-      up
-      backtab_word
-      down
-   else
+   do once = 1 to 1
+      oldcol  = .col
+      oldline = .line
+
+      LineStr = textline( .line)
+      -- Handle tabs: expand them to spaces before.
+      -- Correct cursor col. after expansion.
+      -- Therefore the line must be expanded in two parts:
+      LeftLineStr = leftstr( Linestr, .col - 1)
+      RightLineStr = substr( Linestr, .col)
+      TabWidth = word( .tabs, 1)
+      ExpandedLeftLineStr = ExpandLine( LeftLineStr, TabWidth, fChanged)
+      ExpandedRightLineStr = ExpandLine( RightLineStr, TabWidth, fChanged2)
+      if fChanged | fChanged2 then
+         replaceline ExpandedLeftLineStr''ExpandedRightLineStr
+         .col = oldcol + length( ExpandedLeftLineStr) - length( LeftLineStr)
+         oldcol = .col
+      endif
+
+      do i = 1 to 100
+         if not matchtab_on then
+            leave
+         endif
+         if .line < 2 then
+            leave
+         endif
+
+         -- Go one line up
+         .lineg = .line - 1
+         LineStr = textline( .line)
+         -- Ignore empty lines
+         if strip( LineStr) = '' then
+            iterate
+         endif
+         -- Handle tabs: expand them to spaces before
+         TabWidth = word( .tabs, 1)
+         ExpandedLineStr = ExpandLine( LineStr, TabWidth, fChanged)
+         if fChanged then
+            LineStr = ExpandedLineStr
+            replaceline LineStr
+            -- Keep col. Before expansion, it was wrong. Now it should be correct.
+         endif
+
+         -- Go to previous word boundary
+         backtabword
+         -- Check more lines if col is not < oldcol
+         if .col >= oldcol then
+            .col = oldcol
+            iterate
+         -- Check more lines if col 1 is reached
+         elseif .col = 1 then
+            .col = oldcol
+            iterate
+         else
+            leave
+         endif
+      enddo
+
+      .lineg = oldline
+      if .col = oldcol then
       backtab
-   endif
-
+      endif
+      numspc = oldcol - .col
+
+      if fText | (fTextIns & insertstate()) then
+         -- Remove spaces instead of just moving the cursor
+         if numspc > 0 then
+            .col = oldcol
+            do n = 1 to numspc
+               'BackSpace'
+            enddo
+         endif
+      endif
+
+   enddo
+
+; ---------------------------------------------------------------------------
+; Todo: Move marked lines
+; Menu item:                                                         Flags:
+; Tab [moves text with spaces]                                 Text        Sapces
+;     [moves text with tab]                                    Text        Tab
+;     [moves text in insert mode with spaces]                  TextIns     Spaces
+;     [moves text in insert mode with tab]                     TextIns     Tab
+;     [moves cursor]                                           Cursor
 defc Tab
    universal stream_mode
    universal matchtab_on
-   universal tab_key
    universal ondbcs
+   universal curkey
+
+   Options = arg( 1)
+   if Options = '' then
+      parse value curkey with KeyString \1 .
+      KeyPath = '\NEPMD\User\SpecialKeys\'KeyString
+      Options = QueryConfigKey( KeyPath)
+   endif
+   Options = translate( upcase( Options), ' ', ',')  -- uppercase, commas to spaces
+   Options = ChangeStr( 'TABS', Options, 'TAB')      -- eventually correct typo
+   fText    = (wordpos( 'TEXT',    Options) > 0)
+   fTextIns = (wordpos( 'TEXTINS', Options) > 0)
+   fCursor  = (wordpos( 'CURSOR',  Options) > 0)
+   fSpaces  = (wordpos( 'SPACES',  Options) > 0)
+   fTab     = (wordpos( 'TAB',     Options) > 0)
+   -- Default values
+   if not fText & not fTextIns & not fCursor then
+      fText = 1
+   endif
+   if not fCursor & not fSpaces & not fTab then
+      fSpaces = 1
+   endif
+   if fCursor then
+      fSpaces = 0
+      fTab = 0
+   endif
 
    call NextCmdAltersText()
-   if tab_key then
-      call Process_Key( \9)
-   else  -- tab_key
+   do once = 1 to 1
+      if fTab & (fText | (fTextIns & insertstate())) then
+         call Process_Key( \9)
+         leave
+      endif
+
       call UnmarkIfCua()
-      oldcol = .col
-      if matchtab_on and .line > 1 then
-         up
-         tab_word
-         if oldcol >= .col then
+      oldcol  = .col
+      oldline = .line
+      do i = 1 to 100
+         if not matchtab_on then
+            leave
+         endif
+         if .line < 2 then
+            leave
+         endif
+
+         -- Go one line up
+         .lineg = .line - 1
+         -- Ignore empty lines
+         if strip( textline( .line)) = '' then
+            iterate
+         endif
+
+         -- Go to next word boundary or to line end
+         tabword
+         -- Check more lines if col is not > oldcol
+         if .col <= oldcol then
             .col = oldcol
-            tab
+            iterate
+         else
+            leave
          endif
-         down
-      else
+      enddo
+      .lineg = oldline
+      if .col = oldcol then
          tab
       endif
-compile if not WANT_TAB_INSERTION_TO_SPACE
-      if insertstate() & stream_mode then
-compile else
-      if insertstate() then
-compile endif
+
+      if fText | (fTextIns & insertstate()) then
+         -- Insert spaces instead of just moving the cursor
          numspc = .col - oldcol
-         if ondbcs then                                       -- If we're on DBCS,
-            if not (matchtab_on and .line > 1) then           -- and didn't do a matchtab,
-               if words( .tabs) > 1 then
-                  if not wordpos( .col, .tabs) then           -- check if on a tab col.
-                     do i = 1 to words( .tabs)                -- If we got shifted due to being inside a DBC,
-                        if word( .tabs, i) > oldcol then      -- find the col we *should* be in, and
-                           numspc = word( .tabs, i) - oldcol  -- set numspc according to that.
-                           leave
-                        endif
-                     enddo
-                  endif
-               elseif (.col // .tabs) <> 1 then
-                  numspc = .tabs - (oldcol + .tabs - 1) // .tabs
+         -- Handle DBCS
+         do once2 = 1 to 1
+            if not ondbcs then                             -- If we're on DBCS,
+               leave
+            endif
+            if matchtab_on and .line > 1 then              -- and didn't do a matchtab,
+               leave
+            endif
+            if words( .tabs) > 1 then
+               if not wordpos( .col, .tabs) then           -- check if on a tab col.
+                  do i = 1 to words( .tabs)                -- If we got shifted due to being inside a DBC,
+                     if word( .tabs, i) > oldcol then      -- find the col we *should* be in, and
+                        numspc = word( .tabs, i) - oldcol  -- set numspc according to that.
+                        leave
+                     endif
+                  enddo
                endif
+            elseif (.col // .tabs) <> 1 then
+               numspc = .tabs - (oldcol + .tabs - 1) // .tabs
             endif
-         endif  -- ondbcs
+         enddo  -- once2
+         -- Insert spaces
          if numspc > 0 then
             .col = oldcol
-            call Process_Keys( substr( '', 1, numspc))
+            call Process_Keys( copies( ' ', numspc))
          endif
-      endif  -- insertstate()
-   endif  -- tab_key
+      endif
+
+   enddo  -- once
+
+; ---------------------------------------------------------------------------
+defc BackTabWord
+   backtabword
+
+defc TabWord
+   tabword
 
 defc MarkUp

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

@@ -302 +302 @@
         SetHighlight      0 | 1
         SetTabs           <number> or <list of numbers>
-        SetTabkey         0 | 1
         SetMatchTab       0 | 1
         SetMargins        <left> <right> <par>
@@ -455 +454 @@
 /*
 'ModeExecute TEXT SetHighlight 0'
-'ModeExecute TEXT SetTabKey 1'
 'ModeExecute TEXT SetInsertMode 0'
 'ModeExecute TEXT SetDynaSpell 1'
@@ -467 +465 @@
 'ModeExecute BIN SetSaveOptions /ne /ns /nt'
 'ModeExecute BIN SetTabs 1'
-'ModeExecute BIN SetTabKey 1'
 'ModeExecute BIN SetMatchTab 0'
 
@@ -477 +474 @@
 /* Experimental 2 */
 /*
-'ModeExecute E SetTabKey 0'
 'ModeExecute E SetToolbar STANDARD'
 'ModeExecute E SetHighlight 1'

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

@@ -51 +51 @@
 ;         SetHighlight      0 | 1
 ;         SetTabs           <number> or <list of numbers>
-;         SetTabkey         0 | 1
 ;         SetMatchTab       0 | 1
 ;         SetMargins        <left> <right> <par>
@@ -198 +197 @@
    call AddAVar( 'selectsettingslist',
                         'Toolbar Keyset Expand Matchtab' ||
-                        ' Tabkey EditOptions SaveOptions SearchOptions' ||
+                        ' EditOptions SaveOptions SearchOptions' ||
                         ' StreamMode InsertMode' ||
                         ' TextFont TextColor MarkColor Indent' ||
@@ -1141 +1140 @@
    -- Save the value in an array var, because no field var exists
    call UseSetting( 'SearchOptions', arg(1))
-
-; ---------------------------------------------------------------------------
-defc SetTabKey  -- defc tabkey exists
-   universal LoadState
-   universal tab_key
-   universal default_tab_key
-   arg1 = upcase(arg(1))
-   if arg1 = '' | arg1 = 'DEFAULT' then
-      on = default_tab_key
-   elseif wordpos( arg1, '0 OFF') then
-      on = 0
-   else
-      on = 1
-   endif
-   -- Set universal var
-   tab_key = on
-   -- Save the value in an array var, because no field var exists
-   call UseSetting( 'TabKey', arg(1))
-   'RefreshInfoLine TABKEY'
 
 ; ---------------------------------------------------------------------------

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'

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

@@ -970 +970 @@
 
 ; ---------------------------------------------------------------------------
-defc TabKey
-   universal tab_key
-   uparg = upcase( arg( 1))
-   if uparg = ON__MSG or uparg = 1 then
-      tab_key = 1
-   elseif uparg = OFF__MSG or uparg = 0 then
-      tab_key = 0
-   else
-      sayerror 'TabKey = 'word( OFF__MSG ON__MSG, tab_key + 1)
-   endif
-   'refreshinfoline TABKEY'   -- Update statusline if tabkey status displayed
-
-; ---------------------------------------------------------------------------
 defc TabGlyph
    uparg = upcase( arg( 1))

trunk/src/netlabs/mode/e/e.hil ¶

@@ -919 +919 @@
 rexx_profile
 show_longnames
-tab_key
-a_enterkey
-a_padenterkey
 activeaccel
 activemenu
@@ -929 +926 @@
 bkm_avail
 bm_filename
-c_enterkey
-c_padenterkey
 cursordimensions
 cursoreverywhere
@@ -938 +933 @@
 default_search_options
 default_stream_mode
-default_tab_key
 defaultmenu
 edithwnd
-enterkey
 expand_on
 font
@@ -956 +949 @@
 ondbcs
 optflag_extrastuff
-padenterkey
 position_stack
 reflowmargins
 ring_enabled
-s_enterkey
-s_padenterkey
 save_cursor_column
 saveoptions_auto
@@ -1056 +1046 @@
 VM
 WANT_EBOOKIE
-WANT_TAB_INSERTION_TO_SPACE
 WANT_TINY_ICONS
 WORD_MARK_TYPE