Fix #258

gnunn1 · Apr 18, 2016 · 18e50c5 · 18e50c5
1 parent 7fbd7e5
commit 18e50c5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/source/app.d b/source/app.d
@@ -21,6 +21,10 @@ import gx.terminix.cmdparams;
 import gx.terminix.constants;
 
 int main(string[] args) {
+    static if (USE_FILE_LOGGING) {
+        sharedLog = new FileLogger("/tmp/terminix.log");
+    }
+
     trace(format("Starting terminix with %d arguments...", args.length));
     //append TERMINIX_ID to args if present
     try {

diff --git a/source/gx/terminix/application.d b/source/gx/terminix/application.d
@@ -97,7 +97,6 @@ private:
         if (findResource(APPLICATION_RESOURCES, true)) {
             foreach (cssFile; APPLICATION_CSS_RESOURCES) {
                 string cssURI = buildPath(APPLICATION_RESOURCE_ROOT, cssFile);
-                trace(format("Could not load CSS %s", cssURI));
                 if (!addCssProvider(cssURI, ProviderPriority.APPLICATION)) {
                     error(format("Could not load CSS %s", cssURI));
                 }

diff --git a/source/gx/terminix/cmdparams.d b/source/gx/terminix/cmdparams.d
@@ -40,6 +40,7 @@ private:
     string _cmdLine;
     string _terminalUUID;
     string _cwd;
+    string _pwd;
 
     bool _maximize;
     bool _fullscreen;
@@ -88,7 +89,8 @@ public:
         VariantDict vd = acl.getOptionsDict();
 
         _workingDir = validatePath(getValue(vd, CMD_WORKING_DIRECTORY, vts));
-        _cwd = acl.getenv("PWD");
+        _pwd = acl.getenv("PWD");
+        _cwd = acl.getCwd();
 
         if (_cwd.length > 0) _cwd = validatePath(_cwd);
         else _cwd = validatePath(acl.getCwd());
@@ -132,6 +134,7 @@ public:
         trace("\taction=" ~ _action);
         trace("\texecute=" ~ _execute);
         trace("\tcwd=" ~ _cwd);
+        trace("\tpwd=" ~ _pwd);
     }
 
     void clear() {
@@ -144,6 +147,7 @@ public:
         _cmdLine.length = 0;
         _terminalUUID.length = 0;
         _cwd.length = 0;
+        _pwd.length = 0;
         _maximize = false;
         _fullscreen = false;
         _focusWindow = false;
@@ -157,6 +161,10 @@ public:
     @property string cwd() {
         return _cwd;
     }
+
+    @property string pwd() {
+        return _pwd;
+    }
 
     @property string profileName() {
         return _profileName;

diff --git a/source/gx/terminix/constants.d b/source/gx/terminix/constants.d
@@ -16,6 +16,7 @@ immutable bool USE_PIXBUF_DND = false;
 immutable bool SHOW_DEBUG_OPTIONS = false;
 immutable bool CLIPBOARD_BTN_IN_CONTEXT = true;
 immutable bool STYLE_TERMINAL_SCROLLBAR = false;
+immutable bool USE_FILE_LOGGING = false;
 
 //GTK Version required
 immutable uint GTK_VERSION_MAJOR = 3;