sync with bb. mostly cleanups in Window.cc

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 3cc12bc4523e65333d00e6ab719efd728d7b2114..00a640381530341f1974dacc5a92334ac9bb79fd 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -111,6 +111,7 @@ using std::string;
 #include "Workspace.hh"
 #include "Workspacemenu.hh"
 #include "XAtom.hh"
+#include "Input.hh"
 
 // X event scanner for enter/leave notifies - adapted from twm
 struct scanargs {
@@ -162,6 +163,7 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
   load_rc();
 
   xatom = new XAtom(getXDisplay());
+  input = new BInput(this);
 
   cursor.session = XCreateFontCursor(getXDisplay(), XC_left_ptr);
   cursor.move = XCreateFontCursor(getXDisplay(), XC_fleur);
@@ -1143,6 +1145,7 @@ void Blackbox::restart(const char *prog) {
   shutdown();
 
   if (prog) {
+    putenv(const_cast<char *>(screenList.front()->displayString().c_str()));
     execlp(prog, prog, NULL);
     perror(prog);
   }