Unix: Do not show drive letter in TChDirDialog/TDirListBox

See #141.
magiblot · May 21, 2024 · 545bc7d · 545bc7d
1 parent e5b8d3f
commit 545bc7d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/source/tvision/tchdrdlg.cpp b/source/tvision/tchdrdlg.cpp
@@ -122,6 +122,15 @@ static void trimEndSeparator(char *path)
         path[len-1] = EOS;
 }
 
+static void getCurrentDir( char *dir )
+{
+    getCurDir( dir );
+#if defined( _TV_UNIX )
+    // Remove drive letter.
+    memmove(dir, dir + 2, strlen(dir) - 2 + 1);
+#endif
+}
+
 void TChDirDialog::handleEvent( TEvent& event )
 {
     TDialog::handleEvent( event );
@@ -133,15 +142,15 @@ void TChDirDialog::handleEvent( TEvent& event )
             switch( event.message.command )
                 {
                 case cmRevert:
-                    getCurDir( curDir );
+                    getCurrentDir( curDir );
                     break;
                 case cmChangeDir:
                     {
                     TDirEntry *p = dirList->list()->at( dirList->focused );
                     strcpy( curDir, p->dir() );
                     if( strcmp( curDir, drivesText ) == 0 )
                         break;
-                    else if( driveValid( curDir[0] ) )
+                    else if( isSeparator( curDir[0] ) || driveValid( curDir[0] ) )
                         {
                         int len = strlen( curDir );
                         if( !isSeparator(curDir[len-1]) )
@@ -175,7 +184,7 @@ void TChDirDialog::setUpDialog()
     if( dirList != 0 )
         {
         char curDir[MAXPATH];
-        getCurDir( curDir );
+        getCurrentDir( curDir );
         dirList->newDirectory( curDir );
         if( dirInput != 0 )
             {

diff --git a/source/tvision/tdirlist.cpp b/source/tvision/tdirlist.cpp
@@ -131,27 +131,35 @@ void TDirListBox::showDirs( TDirCollection *dirs )
     strcpy( org, pathDir );
 
     char *curDir = dir;
-    char *end = dir + 3;
-    char hold = *end;
-    *end = EOS;         // mark end of drive name
-    strcpy( name, curDir );
-    dirs->insert( new TDirEntry( org, name ) );
-
-    *end = hold;        // restore full path
-    curDir = end;
+    char *end;
+
+    // Show root directory.
+    if( (end = strchr( curDir, '\\' )) != 0 )
+        {
+        char hold = *(++end);
+        *end = EOS;
+        strcpy( name, curDir );
+        dirs->insert( new TDirEntry( org, dir ) );
+        *end = hold;
+        curDir = end;
+        }
+    else
+        return;
+
+    // Show directories up to the current one.
     while( (end = strchr( curDir, '\\' )) != 0 )
         {
         *end = EOS;
-        strncpy( name, curDir, size_t(end-curDir) );
-        name[size_t(end-curDir)] = EOS;
+        strcpy( name, curDir );
         dirs->insert( new TDirEntry( org - indent, dir ) );
         *end = '\\';
-        curDir = end+1;
+        curDir = end + 1;
         indent += indentSize;
         }
 
     cur = dirs->getCount() - 1;
 
+    // Show subdirectories.
     end = strrchr( dir, '\\' );
     char path[MAXPATH];
     strncpy( path, dir, size_t(end-dir+1) );
@@ -198,7 +206,10 @@ void TDirListBox::newDirectory( TStringView str )
 {
     strnzcpy( dir, str, sizeof(dir) );
     TDirCollection *dirs = new TDirCollection( 5, 5 );
+#if !defined( _TV_UNIX )
+    // Add 'Drives' entry.
     dirs->insert( new TDirEntry( drives, drives ) );
+#endif
     if( str == drives )
         showDrives( dirs );
     else