X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=f11ddce9504487ad5a81c32ee7d631547fd2b62f;hb=31b56dac8042735f75229ad480b3e98531c181ff;hp=a32725d0b01e30ccca8e57ced25c29faf0356c3b;hpb=9062ce972e562477eb64c294769747ebf386fa6c;p=lyx.git diff --git a/src/LyXView.C b/src/LyXView.C index a32725d0b0..f11ddce950 100644 --- a/src/LyXView.C +++ b/src/LyXView.C @@ -4,7 +4,7 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ @@ -19,11 +19,11 @@ #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() @@ -32,20 +32,16 @@ #include "buffer.h" #include "frontends/Dialogs.h" #include "frontends/Toolbar.h" -#ifdef NEW_MENUBAR -# include "frontends/Menubar.h" -# include "MenuBackend.h" -#else -# include "menus.h" -#endif +#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 FD_form_document * fd_form_document; - extern void AutoSave(BufferView *); extern void QuitLyX(); LyXTextClass::size_type current_layout = 0; @@ -55,10 +51,6 @@ BufferView * current_view; 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) { @@ -66,6 +58,13 @@ 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. @@ -75,19 +74,17 @@ LyXView::LyXView(int width, int height) 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)); } LyXView::~LyXView() { -#ifdef NEW_MENUBAR delete menubar; -#else - delete menus; -#endif delete toolbar; delete bufferview; delete minibuffer; @@ -101,7 +98,7 @@ LyXView::~LyXView() void LyXView::redraw() { lyxerr[Debug::INFO] << "LyXView::redraw()" << endl; fl_redraw_form(form_); - minibuffer->Activate(); + minibuffer->redraw(); } @@ -130,7 +127,7 @@ Toolbar * LyXView::getToolbar() const } -void LyXView::setLayout(int layout) +void LyXView::setLayout(LyXTextClass::size_type layout) { toolbar->setLayout(layout); } @@ -155,7 +152,24 @@ MiniBuffer * LyXView::getMiniBuffer() const } -#ifdef NEW_MENUBAR +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; @@ -171,13 +185,6 @@ void LyXView::updateMenubar() menubar->set("main"); } -#else -Menus * LyXView::getMenus() const -{ - return menus; -} -#endif - Intl * LyXView::getIntl() const { @@ -211,7 +218,8 @@ int LyXView::atCloseMainFormCB(FL_FORM *, void *) // Wrapper for the above -extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p) +extern "C" +int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p) { return LyXView::atCloseMainFormCB(form, p); } @@ -223,11 +231,13 @@ void LyXView::setPosition(int x, int y) } -void LyXView::show(int place, int border, char const * title) +void LyXView::show(int place, int border, string const & title) { - fl_show_form(form_, place, border, title); - minibuffer->Init(); - InitLyXLookup(fl_display, form_->window); + fl_show_form(form_, place, border, title.c_str()); + lyxfunc->initMiniBuffer(); +#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) + InitLyXLookup(fl_get_display(), form_->window); +#endif } @@ -253,11 +263,7 @@ void LyXView::create_form_form_main(int width, int height) // // THE MENUBAR // -#ifdef NEW_MENUBAR menubar = new Menubar(this, menubackend); -#else - menus = new Menus(this, air); -#endif // // TOOLBAR @@ -290,7 +296,7 @@ void LyXView::create_form_form_main(int width, int height) // TIMERS // - autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave)); + autosave_timeout.timeout.connect(SigC::slot(this, &LyXView::AutoSave)); // // Misc @@ -319,21 +325,12 @@ void LyXView::create_form_form_main(int width, int height) } -#if FL_REVISION < 89 -extern "C" -int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev); -#endif - - void LyXView::init() { // Set the textclass choice invalidateLayoutChoice(); updateLayoutChoice(); - UpdateDocumentClassChoice(); -#ifdef NEW_MENUBAR updateMenubar(); -#endif // Start autosave timer if (lyxrc.autosave) { @@ -341,12 +338,6 @@ void LyXView::init() autosave_timeout.start(); } -#if FL_REVISION < 89 - // Install the raw callback for keyboard events - fl_register_raw_callback(form_, - KeyPressMask, - C_LyXView_KeyPressMask_raw_callback); -#endif intl->InitKeyMapper(lyxrc.use_kbmap); } @@ -386,85 +377,6 @@ void LyXView::updateLayoutChoice() } -void LyXView::UpdateDocumentClassChoice() -{ - // Update the document class display in the document form - if (fd_form_document) { - fl_clear_choice(fd_form_document->choice_class); - for (LyXTextClassList::const_iterator cit = textclasslist.begin(); - cit != textclasslist.end(); ++cit) { - fl_addto_choice(fd_form_document->choice_class, - (*cit).description().c_str()); - } - } -} - - -#if FL_REVISION < 89 -// 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(fl->u_vdata); - int retval = 0; // 0 means XForms should have a look at this event - - XKeyEvent * xke = static_cast(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(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(xev)); - } - else if (static_cast(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() { @@ -472,9 +384,9 @@ 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 += ": " + OnlyFilename(cur_title); + title += ": " + MakeDisplayPath(cur_title, 30); if (!buffer()->isLyxClean()) title += _(" (Changed)"); if (buffer()->isReadonly()) @@ -491,7 +403,7 @@ void LyXView::updateWindowTitle() void LyXView::showState() { - getMiniBuffer()->Set(CurrentState(view())); + message(CurrentState(view())); getToolbar()->update(); menubar->update(); }