X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=c5e3c53030edc39fa7802a352eb7885e994c0f01;hb=83e7c2cff73797fa8f22a8f2cabef003679da10e;hp=92655d1430e8c2d2fc690fefc7d844e638fabfe7;hpb=d6665cba427b04ae37f42c846398cad518d2be0f;p=lyx.git diff --git a/src/LyXView.C b/src/LyXView.C index 92655d1430..c5e3c53030 100644 --- a/src/LyXView.C +++ b/src/LyXView.C @@ -1,10 +1,11 @@ + /* This file is part of * ====================================================== * * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ @@ -18,60 +19,46 @@ #include #include "LyXView.h" -#include "lyx_main.h" -#include "lyxlookup.h" #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 "layout.h" #include "lyxtext.h" #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 "lyx_gui_misc.h" // [update,Close,Redraw]AllBufferRelatedDialogs #include "bufferview_funcs.h" // CurrentState() +#include "gettext.h" +#include "lyxfunc.h" +#include "BufferView.h" using std::endl; extern void AutoSave(BufferView *); extern void QuitLyX(); -LyXTextClass::size_type current_layout = 0; - -// This is very temporary -BufferView * current_view; -extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *); +LyXTextClass::size_type current_layout = 0; -#ifdef SIGC_CXX_NAMESPACES -using SigC::Connection; -using SigC::slot; -#endif -LyXView::LyXView(int width, int height) +LyXView::LyXView() { - 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(); + intl = new Intl; 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)); } @@ -87,11 +74,9 @@ LyXView::~LyXView() } -/// Redraw the main form. -void LyXView::redraw() { - lyxerr[Debug::INFO] << "LyXView::redraw()" << endl; - fl_redraw_form(form_); - minibuffer->Activate(); +void LyXView::resize() +{ + view()->resize(); } @@ -108,19 +93,13 @@ BufferView * LyXView::view() const } -FL_FORM * LyXView::getForm() const -{ - return form_; -} - - Toolbar * LyXView::getToolbar() const { return toolbar; } -void LyXView::setLayout(int layout) +void LyXView::setLayout(LyXTextClass::size_type layout) { toolbar->setLayout(layout); } @@ -145,6 +124,24 @@ MiniBuffer * LyXView::getMiniBuffer() const } +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; @@ -184,149 +181,6 @@ void LyXView::resetAutosaveTimer() } -// Callback for close main form from window manager -int LyXView::atCloseMainFormCB(FL_FORM *, void *) -{ - QuitLyX(); - return FL_IGNORE; -} - - -// 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); -} - - -void LyXView::show(int place, int border, string const & title) -{ - fl_show_form(form_, place, border, title.c_str()); - minibuffer->Init(); - InitLyXLookup(fl_display, form_->window); -} - - -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. - * We will probably not have lyxrc before the main form is - * initialized, because error messages from lyxrc parsing - * are presented (and rightly so) in GUI popups. Asger. - */ -{ - // the main form - 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 - 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); - - // - // WORKAREA - // - - 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); - - // - // MINIBUFFER - // - - minibuffer = new MiniBuffer(this, air, height - (25 + air), - width - (2 * air), 25); - - // - // TIMERS - // - - autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave)); - - // - // Misc - // - - // assign an icon to main form - 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(form_, 50, 50); - - fl_end_form(); -} - - -#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(); - updateMenubar(); - - // Start autosave timer - 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_, - KeyPressMask, - C_LyXView_KeyPressMask_raw_callback); -#endif - intl->InitKeyMapper(lyxrc.use_kbmap); -} - - void LyXView::invalidateLayoutChoice() { last_textclass = -1; @@ -347,13 +201,12 @@ void LyXView::updateLayoutChoice() toolbar->updateLayoutList(true); last_textclass = int(buffer()->params.textclass); current_layout = 0; - } else + } else { toolbar->updateLayoutList(false); - + } - LyXTextClass::size_type layout = - bufferview->text->cursor.par()->GetLayout(); + bufferview->text->cursor.par()->getLayout(); if (layout != current_layout){ toolbar->setLayout(layout); @@ -362,71 +215,6 @@ void LyXView::updateLayoutChoice() } -#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(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() { @@ -434,7 +222,7 @@ 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()) @@ -443,17 +231,17 @@ void LyXView::updateWindowTitle() 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()); + setWindowTitle(title); last_title = title; } + last_title = title; } void LyXView::showState() { - getMiniBuffer()->Set(CurrentState(view())); + message(currentState(view())); getToolbar()->update(); menubar->update(); }