aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-07-25 11:17:41 (GMT)
committerrathnor <rathnor>2003-07-25 11:17:41 (GMT)
commit1487798293883177e861e6fe533e15b50c9027ef (patch)
tree3e761263f16b37cebf222fbf61edfc69fa56c1f6
parentac7edef9ad73818435420479a0dfa9c5ed517a79 (diff)
downloadfluxbox_paul-1487798293883177e861e6fe533e15b50c9027ef.zip
fluxbox_paul-1487798293883177e861e6fe533e15b50c9027ef.tar.bz2
fix fbrun on multiple screens
-rw-r--r--ChangeLog2
-rw-r--r--util/fbrun/FbRun.cc6
-rw-r--r--util/fbrun/FbRun.hh4
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 93f89cc..f4d3d29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.5: 2Changes for 0.9.5:
3*03/07/25: 3*03/07/25:
4 * Make fbrun work properly on multiple screens (Simon)
5 FbRun.hh/cc
4 * Make sure all the menus have titles, make -version go to stdout (Simon) 6 * Make sure all the menus have titles, make -version go to stdout (Simon)
5 Screen.cc Slit.cc Toolbar.cc ToolbarHandler.cc Xinerama.hh 7 Screen.cc Slit.cc Toolbar.cc ToolbarHandler.cc Xinerama.hh
6 Workspace.cc main.cc 8 Workspace.cc main.cc
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index 6c7a53a..09f6075 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbRun.cc,v 1.14 2003/07/10 10:18:08 fluxgen Exp $ 22// $Id: FbRun.cc,v 1.15 2003/07/25 11:17:41 rathnor Exp $
23 23
24#include "FbRun.hh" 24#include "FbRun.hh"
25 25
@@ -41,10 +41,10 @@
41using namespace std; 41using namespace std;
42FbRun::FbRun(int x, int y, size_t width): 42FbRun::FbRun(int x, int y, size_t width):
43 m_font("fixed"), 43 m_font("fixed"),
44 m_win((int)0, x, y, //screen num and position 44 m_display(FbTk::App::instance()->display()),
45 m_win((int)DefaultScreen(m_display), x, y, //screen num and position
45 width + m_bevel, m_font.height() + 2, // size 46 width + m_bevel, m_font.height() + 2, // size
46 KeyPressMask|ExposureMask), // eventmask 47 KeyPressMask|ExposureMask), // eventmask
47 m_display(FbTk::App::instance()->display()),
48 m_bevel(4), 48 m_bevel(4),
49 m_gc(DefaultGC(m_display, DefaultScreen(m_display))), 49 m_gc(DefaultGC(m_display, DefaultScreen(m_display))),
50 m_end(false), 50 m_end(false),
diff --git a/util/fbrun/FbRun.hh b/util/fbrun/FbRun.hh
index a92ca90..7ece48c 100644
--- a/util/fbrun/FbRun.hh
+++ b/util/fbrun/FbRun.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbRun.hh,v 1.10 2003/06/24 10:22:42 fluxgen Exp $ 22// $Id: FbRun.hh,v 1.11 2003/07/25 11:17:41 rathnor Exp $
23 23
24#ifndef FBRUN_HH 24#ifndef FBRUN_HH
25#define FBRUN_HH 25#define FBRUN_HH
@@ -97,8 +97,8 @@ private:
97 void tabCompleteHistory(); 97 void tabCompleteHistory();
98 98
99 FbTk::Font m_font; ///< font used to draw command text 99 FbTk::Font m_font; ///< font used to draw command text
100 FbTk::FbWindow m_win; ///< toplevel window
101 Display *m_display; ///< display connection 100 Display *m_display; ///< display connection
101 FbTk::FbWindow m_win; ///< toplevel window
102 std::string m_runtext; ///< command to execute 102 std::string m_runtext; ///< command to execute
103 int m_bevel; ///< distance to window edge from font in pixels 103 int m_bevel; ///< distance to window edge from font in pixels
104 GC m_gc; ///< graphic context 104 GC m_gc; ///< graphic context