X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=100eb409d634ad0b1a9275c8ee8fff3d8459d6fb;hb=d597ece5e7efac2a25251034d89fa761759d28f7;hp=44121b1f255f5e6b3efd129f9ede9bfa361ed0cb;hpb=0eccdd1c3613e5170deb77b22174dd0afde833e9;p=lyx.git diff --git a/src/LyXView.C b/src/LyXView.C index 44121b1f25..100eb409d6 100644 --- a/src/LyXView.C +++ b/src/LyXView.C @@ -1,13 +1,12 @@ -// -*- C++ -*- /* This file is part of - * ====================================================== + * ====================================================== * * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2000 The LyX Team. * - * ======================================================*/ + * ====================================================== */ #include @@ -15,96 +14,173 @@ #pragma implementation #endif +#include +#include + #include "LyXView.h" #include "lyx_main.h" #include "lyxlookup.h" -#include "toolbar.h" #include "minibuffer.h" #include "lyxfunc.h" -#include "lyx.xpm" -#include "error.h" +#include "debug.h" #include "layout_forms.h" #include "intl.h" #include "lyxrc.h" -#include "lyxscreen.h" #include "support/filetools.h" // OnlyFilename() #include "layout.h" #include "lyxtext.h" - -extern FD_form_document *fd_form_document; -FD_form_main *fd_form_main; /* a pointer to the one in LyXView - should be removed as soon as possible */ - -MiniBuffer *minibuffer;/* a pointer to the one in LyXView - should be removed as soon as possible */ - -extern void AutoSave(); -extern char updatetimer; +#include "buffer.h" +#include "frontends/Dialogs.h" +#include "frontends/Toolbar.h" +#include "frontends/Menubar.h" +#include "MenuBackend.h" +#include "ToolbarDefaults.h" +#include "lyx_gui_misc.h" // [update,Close]AllBufferRelatedDialogs +#include "bufferview_funcs.h" // CurrentState() + +using std::endl; + +extern void AutoSave(BufferView *); extern void QuitLyX(); -int current_layout = 0; +LyXTextClass::size_type current_layout = 0; // This is very temporary -BufferView *current_view; +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) { - fd_form_main = create_form_form_main(width,height); - fl_set_form_atclose(_form, atCloseMainFormCB, 0); - lyxerr.debug("Initializing LyXFunc"); + create_form_form_main(width, height); + fl_set_form_atclose(form_, C_LyXView_atCloseMainFormCB, 0); + lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl; lyxfunc = new LyXFunc(this); intl = new Intl; + + // Make sure the buttons are disabled if needed. + toolbar->update(); + menubar->update(); + + dialogs_ = new Dialogs(this); + // temporary until all dialogs moved into Dialogs. + dialogs_->updateBufferDependent + .connect(slot(&updateAllVisibleBufferRelatedDialogs)); + dialogs_->hideBufferDependent + .connect(slot(&CloseAllBufferRelatedDialogs)); } LyXView::~LyXView() { - delete menus; + delete menubar; delete toolbar; delete bufferview; delete minibuffer; delete lyxfunc; delete intl; + delete dialogs_; } + /// Redraw the main form. void LyXView::redraw() { - lyxerr.debug("LyXView::redraw()"); - fl_redraw_form(_form); + lyxerr[Debug::INFO] << "LyXView::redraw()" << endl; + fl_redraw_form(form_); minibuffer->Activate(); } -// Callback for update timer -void LyXView::UpdateTimerCB(FL_OBJECT *ob, long) +/// returns the buffer currently shown in the main form. +Buffer * LyXView::buffer() const +{ + return bufferview->buffer(); +} + + +BufferView * LyXView::view() const +{ + return bufferview; +} + + +FL_FORM * LyXView::getForm() const +{ + return form_; +} + + +Toolbar * LyXView::getToolbar() const +{ + return toolbar; +} + + +void LyXView::setLayout(LyXTextClass::size_type layout) +{ + toolbar->setLayout(layout); +} + + +void LyXView::updateToolbar() +{ + toolbar->update(); + menubar->update(); +} + + +LyXFunc * LyXView::getLyXFunc() const +{ + return lyxfunc; +} + + +MiniBuffer * LyXView::getMiniBuffer() const +{ + return minibuffer; +} + + +Menubar * LyXView::getMenubar() const +{ + return menubar; +} + + +void LyXView::updateMenubar() +{ + if ((!view() || !view()->buffer()) + && menubackend.hasMenu("main_nobuffer")) + menubar->set("main_nobuffer"); + else + menubar->set("main"); +} + + +Intl * LyXView::getIntl() const { - LyXView *view = (LyXView*) ob->u_vdata; - if (!view->currentView()->available()) - return; - if (!view->currentView()->getScreen() || !updatetimer) - return; - - view->currentView()->getScreen()->HideCursor(); - view->currentBuffer()->update(-2); - /* This update can happen, even when the work area has lost - * the focus. So suppress the cursor in that case */ - updatetimer = 0; + return intl; } // Callback for autosave timer -void LyXView::AutosaveTimerCB(FL_OBJECT *, long) +void LyXView::AutoSave() { - lyxerr.debug("Running AutoSave()"); - AutoSave(); + lyxerr[Debug::INFO] << "Running AutoSave()" << endl; + if (view()->available()) + ::AutoSave(view()); } /// Reset autosave timer void LyXView::resetAutosaveTimer() { - if (lyxrc->autosave) - fl_set_timer(_form_main->timer_autosave, lyxrc->autosave); + if (lyxrc.autosave) + autosave_timeout.restart(); } @@ -116,21 +192,29 @@ int LyXView::atCloseMainFormCB(FL_FORM *, void *) } +// Wrapper for the above +extern "C" +int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p) +{ + return LyXView::atCloseMainFormCB(form, p); +} + + void LyXView::setPosition(int x, int y) { - fl_set_form_position(_form, x, y); + fl_set_form_position(form_, x, 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); + fl_show_form(form_, place, border, title.c_str()); minibuffer->Init(); - InitLyXLookup(fl_display, _form->window); + InitLyXLookup(fl_get_display(), form_->window); } -FD_form_main *LyXView::create_form_form_main(int width, int height) +void LyXView::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. @@ -139,34 +223,26 @@ FD_form_main *LyXView::create_form_form_main(int width, int height) * are presented (and rightly so) in GUI popups. Asger. */ { - FL_OBJECT *obj; - - FD_form_main *fdui = (FD_form_main *) - fl_calloc(1, sizeof(FD_form_main)); - - _form_main = fdui; - // the main form - _form = fdui->form_main = fl_bgn_form(FL_NO_BOX, width, height); - fdui->form_main->u_vdata = (void*) this; - obj = fl_add_box(FL_FLAT_BOX,0,0,width,height,""); - fl_set_object_color(obj,FL_MCOL,FL_MCOL); + form_ = fl_bgn_form(FL_NO_BOX, width, height); + form_->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); // Parameters for the appearance of the main form - const int air = 2; - const int bw = abs(fl_get_border_width()); + int const air = 2; + int const bw = abs(fl_get_border_width()); // // THE MENUBAR // - - menus = new Menus(this, air); + menubar = new Menubar(this, menubackend); // // TOOLBAR // - toolbar = new Toolbar(lyxrc->toolbar, this, air, 30 + air + bw); + toolbar = new Toolbar(this, air, 30 + air + bw, toolbardefaults); // Setup the toolbar toolbar->set(true); @@ -175,80 +251,79 @@ FD_form_main *LyXView::create_form_form_main(int width, int height) // WORKAREA // - const int ywork = 60 + 2*air + bw; - const int workheight = height - ywork - (25 + 2*air); + 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, + width - 3 * air, workheight); // // MINIBUFFER // - minibuffer = new MiniBuffer(this, air, height-(25+air), - width-(2*air), 25); - ::minibuffer = minibuffer; // to be removed later - + minibuffer = new MiniBuffer(this, air, height - (25 + air), + width - (2 * air), 25); // // TIMERS // - - // timer_autosave - fdui->timer_autosave = obj = fl_add_timer(FL_HIDDEN_TIMER, - 0,0,0,0,"Timer"); - fl_set_object_callback(obj,AutosaveTimerCB,0); - - // timer_update - fdui->timer_update = obj = fl_add_timer(FL_HIDDEN_TIMER, - 0,0,0,0,"Timer"); - fl_set_object_callback(obj,UpdateTimerCB,0); - obj->u_vdata = (void*) this; + autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave)); + // // Misc // // assign an icon to main form - unsigned int w, h; - Pixmap lyx_p, lyx_mask; - lyx_p = fl_create_from_pixmapdata(fl_root, - lyx_xpm, - &w, - &h, - &lyx_mask, - 0, - 0, - 0); // this leaks - fl_set_form_icon(fdui->form_main, lyx_p, lyx_mask); + string iconname = LibFileSearch("images", "lyx", "xpm"); + if (!iconname.empty()) { + unsigned int w, h; + Pixmap lyx_p, lyx_mask; + lyx_p = fl_read_pixmapfile(fl_root, + iconname.c_str(), + &w, + &h, + &lyx_mask, + 0, + 0, + 0); // this leaks + fl_set_form_icon(form_, lyx_p, lyx_mask); + } // set min size - fl_set_form_minsize(fdui->form_main, 50, 50); + fl_set_form_minsize(form_, 50, 50); fl_end_form(); - - return fdui; } +#if 0 +extern "C" +int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev); +#endif + + void LyXView::init() { // Set the textclass choice invalidateLayoutChoice(); updateLayoutChoice(); - UpdateDocumentClassChoice(); + updateMenubar(); // Start autosave timer - if (lyxrc->autosave) - fl_set_timer(_form_main->timer_autosave, lyxrc->autosave); - - + if (lyxrc.autosave) { + autosave_timeout.setTimeout(lyxrc.autosave * 1000); + autosave_timeout.start(); + } + +#if 0 // Install the raw callback for keyboard events - fl_register_raw_callback(_form, + fl_register_raw_callback(form_, KeyPressMask, - KeyPressMask_raw_callback); - intl->InitKeyMapper(lyxrc->use_kbmap); + C_LyXView_KeyPressMask_raw_callback); +#endif + intl->InitKeyMapper(lyxrc.use_kbmap); } @@ -260,98 +335,125 @@ void LyXView::invalidateLayoutChoice() void LyXView::updateLayoutChoice() { - /* update the layout display */ - if (!toolbar->combox) return; - - // this has a bi-effect that the layouts are not showed when no + // This has a side-effect that the layouts are not showed when no // document is loaded. - if (bufferview==0 || bufferview->currentBuffer()==0) { - toolbar->combox->clear(); - toolbar->combox->Redraw(); + if (!view() || !view()->buffer()) { + toolbar->clearLayoutList(); return; } - // If textclass is different, we need to update the list - if (toolbar->combox->empty() || - (last_textclass != currentBuffer()->params.textclass)) { - toolbar->combox->clear(); - for (int i = 0; - lyxstyle.NameOfLayout(currentBuffer()-> - params.textclass, i) !="@@end@@"; - i++) { - LyXLayout *layout = lyxstyle. - Style(currentBuffer()->params.textclass, i); - if (layout->obsoleted_by.empty()) - toolbar->combox->addline(layout->name.c_str()); - else - toolbar->combox->addline(("@N"+layout->name).c_str()); - } - last_textclass = currentBuffer()->params.textclass; + // Update the layout display + if (last_textclass != int(buffer()->params.textclass)) { + toolbar->updateLayoutList(true); + last_textclass = int(buffer()->params.textclass); current_layout = 0; - } - // we need to do this. - toolbar->combox->Redraw(); + } else + toolbar->updateLayoutList(false); + - char layout = currentBuffer()->text->cursor.par->GetLayout(); + + LyXTextClass::size_type layout = + bufferview->text->cursor.par()->GetLayout(); if (layout != current_layout){ - toolbar->combox->select(layout + 1); + toolbar->setLayout(layout); current_layout = layout; } } -void LyXView::UpdateDocumentClassChoice() -{ - /* update the document class display in the document form */ - int i; - if (fd_form_document) { - fl_clear_choice(fd_form_document->choice_class); - for (i = 0; lyxstyle.DescOfClass (i)!="@@end@@"; i++) { - fl_addto_choice(fd_form_document->choice_class, - lyxstyle.DescOfClass(i).c_str()); - } - } -} - - +#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) +int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev) { - LyXView *view = (LyXView*) fl->u_vdata; + 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 (((XEvent*)xev)->type == KeyPress - && view->bufferview->getWorkArea()->focus - && view->bufferview->getWorkArea()->active) - retval = view->getLyXFunc()->processKeyEvent((XEvent*)xev); + // [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() { - static string last_title="LyX"; +void LyXView::updateWindowTitle() +{ + static string last_title = "LyX"; string title = "LyX"; - if (currentView()->available()) { - string cur_title = currentBuffer()->getFileName(); + if (view()->available()) { + string cur_title = buffer()->fileName(); if (!cur_title.empty()){ - title += ": " + OnlyFilename(cur_title); - if (!currentBuffer()->isLyxClean()) + title += ": " + MakeDisplayPath(cur_title, 30); + if (!buffer()->isLyxClean()) title += _(" (Changed)"); - if (currentBuffer()->isReadonly()) + if (buffer()->isReadonly()) title += _(" (read only)"); } } // Don't update title if it's the same as last time if (title != last_title) { - fl_set_form_title(_form, title.c_str()); + fl_set_form_title(form_, title.c_str()); last_title = title; } } + + +void LyXView::showState() +{ + getMiniBuffer()->Set(CurrentState(view())); + getToolbar()->update(); + menubar->update(); +}