-/* 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 <config.h>
#endif
#include "XFormsView.h"
-#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+#include FORMS_H_LOCATION
+#if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5))
#include "frontends/xforms/lyxlookup.h"
#endif
-#include "minibuffer.h"
+#include "frontends/xforms/XMiniBuffer.h"
#include "debug.h"
#include "intl.h"
#include "lyxrc.h"
#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_funcs.h"
#include "BufferView.h"
+#include <boost/bind.hpp>
+#include <boost/signals/connection.hpp>
+using std::abs;
using std::endl;
//extern void AutoSave(BufferView *);
: LyXView()
{
create_form_form_main(width, height);
- fl_set_form_atclose(form_, C_XFormsView_atCloseMainFormCB, 0);
+ fl_set_form_atclose(getForm(), C_XFormsView_atCloseMainFormCB, 0);
- // Connect the minibuffer signals
- minibuffer->stringReady.connect(SigC::slot(getLyXFunc(),
- &LyXFunc::miniDispatch));
- minibuffer->timeout.connect(SigC::slot(getLyXFunc(),
- &LyXFunc::initMiniBuffer));
+ 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();
+ redraw_con = getDialogs().redrawGUI().connect(boost::bind(&XFormsView::redraw, this));
}
-XFormsView::~XFormsView() {}
+XFormsView::~XFormsView()
+{
+ minibuffer_->freeze();
+ fl_hide_form(form_);
+ fl_free_form(form_);
+}
/// Redraw the main form.
-void XFormsView::redraw() {
+void XFormsView::redraw()
+{
lyxerr[Debug::INFO] << "XFormsView::redraw()" << endl;
- fl_redraw_form(form_);
- getMiniBuffer()->redraw();
+ fl_redraw_form(getForm());
+ minibuffer_->redraw();
}
}
-void XFormsView::setPosition(int x, int y)
+void XFormsView::show(int x, int y, string const & title)
{
- fl_set_form_position(form_, x, y);
-}
+ FL_FORM * form = getForm();
+ fl_set_form_minsize(form, form->w, form->h);
-void XFormsView::show(int place, int border, string const & title)
-{
- fl_set_form_minsize(form_, form_->w, form_->h);
- fl_show_form(form_, place, border, title.c_str());
- getLyXFunc()->initMiniBuffer();
-#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+ int placement = FL_PLACE_CENTER | FL_FREE_SIZE;
+
+ // Did we get a valid geometry position ?
+ if (x >= 0 && y >= 0) {
+ fl_set_form_position(form, x, y);
+ placement = FL_PLACE_POSITION;
+ }
+
+ fl_show_form(form, placement, FL_FULLBORDER, title.c_str());
+
+ show_view_state();
+#if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5))
InitLyXLookup(fl_get_display(), form_->window);
#endif
}
{
// the main form
form_ = fl_bgn_form(FL_NO_BOX, width, height);
- form_->u_vdata = this;
+ 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);
int const air = 2;
int const bw = abs(fl_get_border_width());
- //
- // THE MENUBAR
- //
- menubar = new Menubar(this, menubackend);
-
- //
- // TOOLBAR
- //
-
- toolbar = new Toolbar(this, air, 30 + air + bw, toolbardefaults);
-
- // Setup the toolbar
- toolbar->set(true);
+ menubar_.reset(new Menubar(this, menubackend));
- //
- // WORKAREA
- //
+ toolbar_.reset(new Toolbar(this, air, 30 + air + bw, toolbardefaults));
int const ywork = 60 + 2 * air + bw;
int const workheight = height - ywork - (25 + 2 * air);
- ::current_view = bufferview = new BufferView(this, air, ywork,
- width - 3 * air,
- workheight);
+ bufferview_.reset(new BufferView(this, air, ywork,
+ width - 3 * air, workheight));
+ ::current_view = bufferview_.get();
- //
- // MINIBUFFER
- //
-
- minibuffer = new MiniBuffer(this, air, height - (25 + air),
- width - (2 * air), 25);
-
- //
- // TIMERS
- //
-
- autosave_timeout->timeout.connect(SigC::slot(this, &XFormsView::AutoSave));
-
- //
- // Misc
- //
+ minibuffer_.reset(new XMiniBuffer(this, *controlcommand_,
+ air, height - (25 + air), width - (2 * air), 25));
// assign an icon to main form
string iconname = LibFileSearch("images", "lyx", "xpm");
0,
0,
0); // this leaks
- fl_set_form_icon(form_, lyx_p, lyx_mask);
+ fl_set_form_icon(getForm(), lyx_p, lyx_mask);
}
// set min size
- fl_set_form_minsize(form_, 50, 50);
+ fl_set_form_minsize(getForm(), 50, 50);
fl_end_form();
- minibuffer->dd_init();
+ minibuffer_->dd_init();
}
-void XFormsView::init()
+void XFormsView::setWindowTitle(string const & title, string const & icon_title)
{
- // Set the textclass choice
- invalidateLayoutChoice();
- updateLayoutChoice();
- updateMenubar();
-
- // Start autosave timer
- if (lyxrc.autosave) {
- autosave_timeout->setTimeout(lyxrc.autosave * 1000);
- autosave_timeout->start();
- }
+ fl_set_form_title(getForm(), title.c_str());
+ fl_winicontitle(form_->window, icon_title.c_str());
+}
+
- intl->InitKeyMapper(lyxrc.use_kbmap);
+void XFormsView::message(string const & str)
+{
+ minibuffer_->message(str);
}
-void XFormsView::setWindowTitle(string const & title, string const & icon_title)
+void XFormsView::show_view_state()
{
- fl_set_form_title(form_, title.c_str());
- fl_winicontitle(form_->window, icon_title.c_str());
+ message(getLyXFunc().view_status_message());
}
// 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
+// current LyXView that should be prohibited (Lgb) (This applies to
// "allowInput" as well.)
void XFormsView::prohibitInput() const
{