fix fbrun on multiple screens
rathnor rathnor
3 files changed,
7 insertions(+),
5 deletions(-)
M
ChangeLog
→
ChangeLog
@@ -1,6 +1,8 @@
(Format: Year/Month/Day) Changes for 0.9.5: *03/07/25: + * Make fbrun work properly on multiple screens (Simon) + FbRun.hh/cc * Make sure all the menus have titles, make -version go to stdout (Simon) Screen.cc Slit.cc Toolbar.cc ToolbarHandler.cc Xinerama.hh Workspace.cc main.cc
M
util/fbrun/FbRun.cc
→
util/fbrun/FbRun.cc
@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbRun.cc,v 1.14 2003/07/10 10:18:08 fluxgen Exp $ +// $Id: FbRun.cc,v 1.15 2003/07/25 11:17:41 rathnor Exp $ #include "FbRun.hh"@@ -41,10 +41,10 @@
using namespace std; FbRun::FbRun(int x, int y, size_t width): m_font("fixed"), - m_win((int)0, x, y, //screen num and position + m_display(FbTk::App::instance()->display()), + m_win((int)DefaultScreen(m_display), x, y, //screen num and position width + m_bevel, m_font.height() + 2, // size KeyPressMask|ExposureMask), // eventmask - m_display(FbTk::App::instance()->display()), m_bevel(4), m_gc(DefaultGC(m_display, DefaultScreen(m_display))), m_end(false),
M
util/fbrun/FbRun.hh
→
util/fbrun/FbRun.hh
@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbRun.hh,v 1.10 2003/06/24 10:22:42 fluxgen Exp $ +// $Id: FbRun.hh,v 1.11 2003/07/25 11:17:41 rathnor Exp $ #ifndef FBRUN_HH #define FBRUN_HH@@ -97,8 +97,8 @@ void lastHistoryItem();
void tabCompleteHistory(); FbTk::Font m_font; ///< font used to draw command text - FbTk::FbWindow m_win; ///< toplevel window Display *m_display; ///< display connection + FbTk::FbWindow m_win; ///< toplevel window std::string m_runtext; ///< command to execute int m_bevel; ///< distance to window edge from font in pixels GC m_gc; ///< graphic context