X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FXFormsView.C;h=e0b7208c1692f13299fc623ec013e5a9017436d6;hb=5ede7e4889b088219326a1d4a94a0a2a732a1379;hp=8fec911401d15e5bc52e4a3fc8fd696463bf990c;hpb=5fd921e9e6caa0cd7eaa8ce8e378726407ab70c5;p=lyx.git diff --git a/src/frontends/xforms/XFormsView.C b/src/frontends/xforms/XFormsView.C index 8fec911401..e0b7208c16 100644 --- a/src/frontends/xforms/XFormsView.C +++ b/src/frontends/xforms/XFormsView.C @@ -1,50 +1,42 @@ -/* This file is part of - * ====================================================== +/** + * \file XFormsView.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author unknown * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS. + */ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "XFormsView.h" -#include FORMS_H_LOCATION -#if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)) -#include "frontends/xforms/lyxlookup.h" -#endif -#include "frontends/MiniBuffer.h" -#include "frontends/xforms/XMiniBuffer.h" + +#include "XFormsMenubar.h" +#include "XFormsToolbar.h" +#include "XMiniBuffer.h" + +#include "BufferView.h" #include "debug.h" -#include "intl.h" -#include "lyxrc.h" -#include "support/filetools.h" // OnlyFilename() -#include "frontends/Toolbar.h" -#include "frontends/Menubar.h" -#include "frontends/Timeout.h" -#include "frontends/Dialogs.h" -#include "MenuBackend.h" -#include "ToolbarDefaults.h" #include "lyxfunc.h" -#include "BufferView.h" +#include "MenuBackend.h" + +#include "frontends/Dialogs.h" + +#include "support/filetools.h" // OnlyFilename() #include +using lyx::support::LibFileSearch; + using std::abs; using std::endl; +using std::string; + //extern void AutoSave(BufferView *); extern void QuitLyX(); -// This is very temporary -BufferView * current_view; - extern "C" { static @@ -57,22 +49,33 @@ int C_XFormsView_atCloseMainFormCB(FL_FORM * form, void * p) XFormsView::XFormsView(int width, int height) - : LyXView() + : LyXView(), + icon_pixmap_(0), icon_mask_(0) { - create_form_form_main(*getDialogs(), width, height); + create_form_form_main(width, height); fl_set_form_atclose(getForm(), C_XFormsView_atCloseMainFormCB, 0); - // Connect the minibuffer signals - minibuffer_->inputReady.connect(boost::bind(&LyXFunc::miniDispatch, getLyXFunc(), _1)); - minibuffer_->timeout.connect(boost::bind(&LyXFunc::initMiniBuffer, getLyXFunc())); + view_state_con = + view_state_changed.connect(boost::bind(&XFormsView::show_view_state, this)); + focus_con = + focus_command_buffer.connect(boost::bind(&XMiniBuffer::focus, minibuffer_.get())); // Make sure the buttons are disabled if needed. updateToolbar(); - getDialogs()->redrawGUI.connect(boost::bind(&XFormsView::redraw, this)); + redraw_con = + getDialogs().redrawGUI().connect(boost::bind(&XFormsView::redraw, this)); } -XFormsView::~XFormsView() {} +XFormsView::~XFormsView() +{ + if (icon_pixmap_) + XFreePixmap(fl_get_display(), icon_pixmap_); + + minibuffer_->freeze(); + fl_hide_form(form_); + fl_free_form(form_); +} /// Redraw the main form. @@ -80,15 +83,13 @@ void XFormsView::redraw() { lyxerr[Debug::INFO] << "XFormsView::redraw()" << endl; fl_redraw_form(getForm()); - // This is dangerous, but we know it is safe - XMiniBuffer * m = static_cast(getMiniBuffer()); - m->redraw(); + minibuffer_->redraw(); } FL_FORM * XFormsView::getForm() const { - return form_.get(); + return form_; } @@ -116,14 +117,11 @@ void XFormsView::show(int x, int y, string const & title) fl_show_form(form, placement, FL_FULLBORDER, title.c_str()); - getLyXFunc()->initMiniBuffer(); -#if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)) - InitLyXLookup(fl_get_display(), form_->window); -#endif + show_view_state(); } -void XFormsView::create_form_form_main(Dialogs & dia, int width, int height) +void XFormsView::create_form_form_main(int width, int height) /* to make this work as it should, .lyxrc should have been * read first; OR maybe this one should be made dynamic. * Hmmmm. Lgb. @@ -133,7 +131,7 @@ void XFormsView::create_form_form_main(Dialogs & dia, int width, int height) */ { // the main form - form_.reset(fl_bgn_form(FL_NO_BOX, width, height)); + form_ = fl_bgn_form(FL_NO_BOX, width, height); getForm()->u_vdata = this; FL_OBJECT * obj = fl_add_box(FL_FLAT_BOX, 0, 0, width, height, ""); fl_set_object_color(obj, FL_MCOL, FL_MCOL); @@ -142,48 +140,39 @@ void XFormsView::create_form_form_main(Dialogs & dia, int width, int height) int const air = 2; int const bw = abs(fl_get_border_width()); - menubar_.reset(new Menubar(this, menubackend)); + menubar_.reset(new XFormsMenubar(this, menubackend)); - toolbar_.reset(new Toolbar(this, dia, - air, 30 + air + bw, toolbardefaults)); - toolbar_->set(true); + toolbar_.reset(new XFormsToolbar(this, air, 30 + air + bw)); + toolbar_->init(); int const ywork = 60 + 2 * air + bw; int const workheight = height - ywork - (25 + 2 * air); bufferview_.reset(new BufferView(this, air, ywork, width - 3 * air, workheight)); - ::current_view = bufferview_.get(); - - minibuffer_.reset(new XMiniBuffer(this, air, height - (25 + air), - width - (2 * air), 25)); - // FIXME: why do this in xforms/ ? - autosave_timeout_->timeout.connect(boost::bind(&XFormsView::autoSave, this)); + minibuffer_.reset(new XMiniBuffer(*controlcommand_, + air, height - (25 + air), width - (2 * air), 25)); // assign an icon to main form - string iconname = LibFileSearch("images", "lyx", "xpm"); + string const iconname = LibFileSearch("images", "lyx", "xpm"); if (!iconname.empty()) { unsigned int w, h; - Pixmap lyx_p, lyx_mask; - lyx_p = fl_read_pixmapfile(fl_root, + icon_pixmap_ = fl_read_pixmapfile(fl_root, iconname.c_str(), &w, &h, - &lyx_mask, + &icon_mask_, 0, 0, - 0); // this leaks - fl_set_form_icon(getForm(), lyx_p, lyx_mask); + 0); + fl_set_form_icon(getForm(), icon_pixmap_, icon_mask_); } // set min size fl_set_form_minsize(getForm(), 50, 50); fl_end_form(); - - // This is dangerous, but we know it is safe in this situation - static_cast(minibuffer_.get())->dd_init(); } @@ -194,40 +183,52 @@ void XFormsView::setWindowTitle(string const & title, string const & icon_title) } -// How should this actually work? Should it prohibit input in all BufferViews, -// or just in the current one? If "just the current one", then it should be -// placed in BufferView. If "all BufferViews" then LyXGUI (I think) should -// run "prohibitInput" on all LyXViews which will run prohibitInput on all -// BufferViews. Or is it perhaps just the (input in) BufferViews in the -// current LyxView that should be prohibited (Lgb) (This applies to -// "allowInput" as well.) -void XFormsView::prohibitInput() const +void XFormsView::message(string const & str) { - view()->hideCursor(); + minibuffer_->message(str); +} - static Cursor cursor; - static bool cursor_undefined = true; - if (cursor_undefined) { - cursor = XCreateFontCursor(fl_get_display(), XC_watch); - XFlush(fl_get_display()); - cursor_undefined = false; - } +void XFormsView::clearMessage() +{ + message(getLyXFunc().viewStatusMessage()); +} - /* set the cursor to the watch for all forms and the canvas */ - XDefineCursor(fl_get_display(), getForm()->window, cursor); - XFlush(fl_get_display()); - fl_deactivate_all_forms(); +void XFormsView::show_view_state() +{ + message(getLyXFunc().viewStatusMessage()); } -void XFormsView::allowInput() const +void XFormsView::busy(bool yes) const { - /* reset the cursor from the watch for all forms and the canvas */ + if (yes) { + view()->hideCursor(); + + static Cursor cursor; + static bool cursor_undefined = true; + + if (cursor_undefined) { + cursor = XCreateFontCursor(fl_get_display(), XC_watch); + XFlush(fl_get_display()); + cursor_undefined = false; + } - XUndefineCursor(fl_get_display(), getForm()->window); + /// set the cursor to the watch for all forms and the canvas + XDefineCursor(fl_get_display(), getForm()->window, cursor); + + XFlush(fl_get_display()); - XFlush(fl_get_display()); - fl_activate_all_forms(); + /// we only need to deactivate to prevent resetting the cursor + /// to I-beam over the workarea + fl_deactivate_all_forms(); + } else { + /// reset the cursor from the watch for all forms and the canvas + + XUndefineCursor(fl_get_display(), getForm()->window); + + XFlush(fl_get_display()); + fl_activate_all_forms(); + } }