From: Dana Jansens <danakj@orodu.net>
Date: Sat, 11 Jan 2003 07:13:49 +0000 (+0000)
Subject: broken to all hell. oh no.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=19bfac5195a1917f4a0bbcf910e90d5b800c5146;p=chaz%2Fopenbox

broken to all hell. oh no.
---

diff --git a/otk/display.cc b/otk/display.cc
index 33dca01b..c1d6c61e 100644
--- a/otk/display.cc
+++ b/otk/display.cc
@@ -93,6 +93,7 @@ void OBDisplay::initialize(char *name)
   (void)junk;
 
   // Open the X display
+  printf("getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
   if (!(display = XOpenDisplay(name))) {
     printf(_("Unable to open connection to the X server. Please set the \n\
 DISPLAY environment variable approriately, or use the '-display' command \n\
diff --git a/otk/util.cc b/otk/util.cc
index ebca51d5..39ea0f6c 100644
--- a/otk/util.cc
+++ b/otk/util.cc
@@ -39,6 +39,7 @@ string expandTilde(const string& s) {
 
   const char* const home = getenv("HOME");
   if (home == NULL) return s;
+printf("tilde: getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
 
   return string(home + s.substr(s.find('/')));
 }
diff --git a/src/python.cc b/src/python.cc
index 040d7020..2c71b018 100644
--- a/src/python.cc
+++ b/src/python.cc
@@ -19,17 +19,28 @@ static PyObject *obdict = NULL;
 
 void python_init(char *argv0)
 {
+  std::string path;
+  
   // start the python engine
-  Py_SetProgramName(argv0);
-  Py_Initialize();
+  //Py_SetProgramName(argv0);
+  //Py_Initialize();
   // initialize the C python module
-  init_openbox();
+  //init_openbox();
   // include the openbox directories for python scripts in the sys path
-  PyRun_SimpleString("import sys");
-  PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
-  PyRun_SimpleString(const_cast<char*>(((std::string)"sys.path.append('" +
-                                        otk::expandTilde("~/.openbox/python") +
-                                        "')").c_str()));
+//  PyRun_SimpleString("import sys");
+printf("SCRIPTDIR=%s\n", SCRIPTDIR);
+printf("1 getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
+  path = "sys.path";
+printf("2 getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
+  path = "sys.path.append('";
+printf("3 getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
+  path += SCRIPTDIR;
+  path += "')";
+  PyRun_SimpleString(const_cast<char*>(path.c_str()));
+  path = "sys.path.append('";
+  path += otk::expandTilde("~/.openbox/python");
+  path += "')";
+  PyRun_SimpleString(const_cast<char*>(path.c_str()));
   // import the otk and openbox modules into the main namespace
   PyRun_SimpleString("from openbox import *;");
   // set up convenience global variables