X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffrontends%2Fxforms%2FXFormsView.C;h=e0b7208c1692f13299fc623ec013e5a9017436d6;hb=5ede7e4889b088219326a1d4a94a0a2a732a1379;hp=ea6a8929f96d5eff304fa7ce433dd3e7489b4c8e;hpb=7c98b3bd37f41ad05e9770d66774f999fbd17ff8;p=lyx.git diff --git a/src/frontends/xforms/XFormsView.C b/src/frontends/xforms/XFormsView.C index ea6a8929f9..e0b7208c16 100644 --- a/src/frontends/xforms/XFormsView.C +++ b/src/frontends/xforms/XFormsView.C @@ -1,50 +1,42 @@ -/* 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 -#ifdef __GNUG__ -#pragma implementation -#endif - #include "XFormsView.h" -#include FORMS_H_LOCATION -#if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)) -#include "frontends/xforms/lyxlookup.h" -#endif -#include "frontends/xforms/XMiniBuffer.h" + +#include "XFormsMenubar.h" +#include "XFormsToolbar.h" +#include "XMiniBuffer.h" + +#include "BufferView.h" #include "debug.h" -#include "intl.h" -#include "lyxrc.h" -#include "support/filetools.h" // OnlyFilename() -#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 "MenuBackend.h" + +#include "frontends/Dialogs.h" + +#include "support/filetools.h" // OnlyFilename() #include -#include + +using lyx::support::LibFileSearch; + using std::abs; using std::endl; +using std::string; + //extern void AutoSave(BufferView *); extern void QuitLyX(); -// This is very temporary -BufferView * current_view; - extern "C" { static @@ -57,22 +49,29 @@ int C_XFormsView_atCloseMainFormCB(FL_FORM * form, void * p) XFormsView::XFormsView(int width, int height) - : LyXView() + : LyXView(), + icon_pixmap_(0), icon_mask_(0) { - create_form_form_main(*getDialogs(), width, height); + create_form_form_main(width, height); fl_set_form_atclose(getForm(), C_XFormsView_atCloseMainFormCB, 0); - 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())); + 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)); + redraw_con = + getDialogs().redrawGUI().connect(boost::bind(&XFormsView::redraw, this)); } XFormsView::~XFormsView() { + if (icon_pixmap_) + XFreePixmap(fl_get_display(), icon_pixmap_); + minibuffer_->freeze(); fl_hide_form(form_); fl_free_form(form_); @@ -119,13 +118,10 @@ void XFormsView::show(int x, int y, string const & title) 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 } -void XFormsView::create_form_form_main(Dialogs & dia, int width, int height) +void XFormsView::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. @@ -144,43 +140,39 @@ void XFormsView::create_form_form_main(Dialogs & dia, int width, int height) int const air = 2; int const bw = abs(fl_get_border_width()); - menubar_.reset(new Menubar(this, menubackend)); + menubar_.reset(new XFormsMenubar(this, menubackend)); - toolbar_.reset(new Toolbar(this, dia, - air, 30 + air + bw, toolbardefaults)); + toolbar_.reset(new XFormsToolbar(this, air, 30 + air + bw)); + toolbar_->init(); int const ywork = 60 + 2 * air + bw; int const workheight = height - ywork - (25 + 2 * air); bufferview_.reset(new BufferView(this, air, ywork, width - 3 * air, workheight)); - ::current_view = bufferview_.get(); - minibuffer_.reset(new XMiniBuffer(this, *controlcommand_, + minibuffer_.reset(new XMiniBuffer(*controlcommand_, air, height - (25 + air), width - (2 * air), 25)); // assign an icon to main form - string iconname = LibFileSearch("images", "lyx", "xpm"); + string const iconname = LibFileSearch("images", "lyx", "xpm"); if (!iconname.empty()) { unsigned int w, h; - Pixmap lyx_p, lyx_mask; - lyx_p = fl_read_pixmapfile(fl_root, + icon_pixmap_ = fl_read_pixmapfile(fl_root, iconname.c_str(), &w, &h, - &lyx_mask, + &icon_mask_, 0, 0, - 0); // this leaks - fl_set_form_icon(getForm(), lyx_p, lyx_mask); + 0); + fl_set_form_icon(getForm(), icon_pixmap_, icon_mask_); } // set min size fl_set_form_minsize(getForm(), 50, 50); fl_end_form(); - - minibuffer_->dd_init(); } @@ -197,46 +189,46 @@ void XFormsView::message(string const & str) } -void XFormsView::show_view_state() +void XFormsView::clearMessage() { - message(getLyXFunc()->view_status_message()); + message(getLyXFunc().viewStatusMessage()); } -// How should this actually work? Should it prohibit input in all BufferViews, -// or just in the current one? If "just the current one", then it should be -// 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 -// "allowInput" as well.) -void XFormsView::prohibitInput() const +void XFormsView::show_view_state() { - view()->hideCursor(); + message(getLyXFunc().viewStatusMessage()); +} - static Cursor cursor; - static bool cursor_undefined = true; - if (cursor_undefined) { - cursor = XCreateFontCursor(fl_get_display(), XC_watch); - XFlush(fl_get_display()); - cursor_undefined = false; - } +void XFormsView::busy(bool yes) const +{ + if (yes) { + view()->hideCursor(); - /* set the cursor to the watch for all forms and the canvas */ - XDefineCursor(fl_get_display(), getForm()->window, cursor); + static Cursor cursor; + static bool cursor_undefined = true; - XFlush(fl_get_display()); - fl_deactivate_all_forms(); -} + if (cursor_undefined) { + cursor = XCreateFontCursor(fl_get_display(), XC_watch); + XFlush(fl_get_display()); + cursor_undefined = false; + } + /// set the cursor to the watch for all forms and the canvas + XDefineCursor(fl_get_display(), getForm()->window, cursor); -void XFormsView::allowInput() const -{ - /* reset the cursor from the watch for all forms and the canvas */ + XFlush(fl_get_display()); + + /// we only need to deactivate to prevent resetting the cursor + /// to I-beam over the workarea + fl_deactivate_all_forms(); + } else { + /// reset the cursor from the watch for all forms and the canvas - XUndefineCursor(fl_get_display(), getForm()->window); + XUndefineCursor(fl_get_display(), getForm()->window); - XFlush(fl_get_display()); - fl_activate_all_forms(); + XFlush(fl_get_display()); + fl_activate_all_forms(); + } }