* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include "LyXView.h"
#include "lyx_main.h"
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
#include "lyxlookup.h"
+#endif
#include "minibuffer.h"
-#include "lyxfunc.h"
#include "debug.h"
-#include "layout_forms.h"
#include "intl.h"
#include "lyxrc.h"
#include "support/filetools.h" // OnlyFilename()
#include "frontends/Menubar.h"
#include "MenuBackend.h"
#include "ToolbarDefaults.h"
-#include "lyx_gui_misc.h" // [update,Close]AllBufferRelatedDialogs
+#include "lyx_gui_misc.h" // [update,Close,Redraw]AllBufferRelatedDialogs
#include "bufferview_funcs.h" // CurrentState()
+#include "gettext.h"
+#include "lyxfunc.h"
using std::endl;
extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *);
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-using SigC::slot;
-#endif
LyXView::LyXView(int width, int height)
{
fl_set_form_atclose(form_, C_LyXView_atCloseMainFormCB, 0);
lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
lyxfunc = new LyXFunc(this);
+
+ // Connect the minibuffer signals
+ minibuffer->stringReady.connect(SigC::slot(lyxfunc,
+ &LyXFunc::miniDispatch));
+ minibuffer->timeout.connect(SigC::slot(lyxfunc,
+ &LyXFunc::initMiniBuffer));
+
intl = new Intl;
// Make sure the buttons are disabled if needed.
dialogs_ = new Dialogs(this);
// temporary until all dialogs moved into Dialogs.
dialogs_->updateBufferDependent
- .connect(slot(&updateAllVisibleBufferRelatedDialogs));
+ .connect(SigC::slot(&updateAllVisibleBufferRelatedDialogs));
dialogs_->hideBufferDependent
- .connect(slot(&CloseAllBufferRelatedDialogs));
+ .connect(SigC::slot(&CloseAllBufferRelatedDialogs));
+ Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
+ Dialogs::redrawGUI.connect(SigC::slot(&RedrawAllBufferRelatedDialogs));
}
void LyXView::redraw() {
lyxerr[Debug::INFO] << "LyXView::redraw()" << endl;
fl_redraw_form(form_);
- minibuffer->Activate();
+ minibuffer->redraw();
}
}
+void LyXView::message(string const & str)
+{
+ minibuffer->message(str);
+}
+
+
+void LyXView::messagePush(string const & str)
+{
+ minibuffer->messagePush(str);
+}
+
+
+void LyXView::messagePop()
+{
+ minibuffer->messagePop();
+}
+
+
Menubar * LyXView::getMenubar() const
{
return menubar;
void LyXView::show(int place, int border, string const & title)
{
fl_show_form(form_, place, border, title.c_str());
- minibuffer->Init();
+ lyxfunc->initMiniBuffer();
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
InitLyXLookup(fl_get_display(), form_->window);
+#endif
}
// TIMERS
//
- autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave));
+ autosave_timeout.timeout.connect(SigC::slot(this, &LyXView::AutoSave));
//
// Misc
}
-#if 0
-extern "C"
-int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev);
-#endif
-
-
void LyXView::init()
{
// Set the textclass choice
autosave_timeout.start();
}
-#if 0
- // Install the raw callback for keyboard events
- fl_register_raw_callback(form_,
- KeyPressMask,
- C_LyXView_KeyPressMask_raw_callback);
-#endif
intl->InitKeyMapper(lyxrc.use_kbmap);
}
}
-#if 0
-// This is necessary, since FL_FREE-Objects doesn't get all keypress events
-// as FL_KEYBOARD events :-( Matthias 280596
-int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
-{
- LyXView * view = static_cast<LyXView*>(fl->u_vdata);
- int retval = 0; // 0 means XForms should have a look at this event
-
- XKeyEvent * xke = static_cast<XKeyEvent*>(xev);
- static Time last_time_pressed = 0;
- static Time last_time_released = 0;
- static unsigned int last_key_pressed = 0;
- static unsigned int last_key_released = 0;
- static unsigned int last_state_pressed = 0;
- static unsigned int last_state_released = 0;
-
- // funny. Even though the raw_callback is registered with KeyPressMask,
- // also KeyRelease-events are passed through:-(
- // [It seems that XForms puts them in pairs... (JMarc)]
- if (static_cast<XEvent*>(xev)->type == KeyPress
- && view->bufferview->focus()
- && view->bufferview->active())
- {
- last_time_pressed = xke->time;
- last_key_pressed = xke->keycode;
- last_state_pressed = xke->state;
- retval = view->getLyXFunc()
- ->processKeyEvent(static_cast<XEvent*>(xev));
- }
- else if (static_cast<XEvent*>(xev)->type == KeyRelease
- && view->bufferview->focus()
- && view->bufferview->active())
-{
- last_time_released = xke->time;
- last_key_released = xke->keycode;
- last_state_released = xke->state;
- }
-
- if (last_key_released == last_key_pressed
- && last_state_released == last_state_pressed
- && last_time_released == last_time_pressed) {
- // When the diff between last_time_released and
- // last_time_pressed is 0, that sinifies an autoreapeat
- // at least on my system. It like some feedback from
- // others, especially from user running LyX remote.
- lyxerr[Debug::KEY] << "Syncing - purging X events." << endl;
- XSync(fl_get_display(), 1);
- // This purge make f.ex. scrolling stop imidiatly when
- // releaseing the PageDown button. The question is if this
- // purging of XEvents can cause any harm...after some testing
- // I can see no problems, but I'd like other reports too.
- }
- return retval;
-}
-
-
-// wrapper for the above
-extern "C"
-int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
-{
- return LyXView::KeyPressMask_raw_callback(fl, xev);
-}
-#endif
-
-
// Updates the title of the window with the filename of the current document
void LyXView::updateWindowTitle()
{
string title = "LyX";
if (view()->available()) {
- string cur_title = buffer()->fileName();
+ string const cur_title = buffer()->fileName();
if (!cur_title.empty()){
title += ": " + MakeDisplayPath(cur_title, 30);
if (!buffer()->isLyxClean())
void LyXView::showState()
{
- getMiniBuffer()->Set(CurrentState(view()));
+ message(CurrentState(view()));
getToolbar()->update();
menubar->update();
}
projects / lyx.git / blobdiff