X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=d6af100d47539dee499d006058a52a8182972afb;hb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;hp=651a859f28d125b61be4a2e98bfb1d9a763da52f;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git diff --git a/src/LyXView.C b/src/LyXView.C index 651a859f28..d6af100d47 100644 --- a/src/LyXView.C +++ b/src/LyXView.C @@ -1,13 +1,13 @@ // -*- C++ -*- /* This file is part of -* ====================================================== -* -* LyX, The Document Processor -* -* Copyright (C) 1995 Matthias Ettrich -* Copyright (C) 1995-1998 The LyX Team. -* -*======================================================*/ + * ====================================================== + * + * LyX, The Document Processor + * + * Copyright 1995 Matthias Ettrich + * Copyright 1995-1999 The LyX Team. + * + * ====================================================== */ #include @@ -22,26 +22,20 @@ #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 "filetools.h" // OnlyFilename() +#include "support/filetools.h" // OnlyFilename() #include "layout.h" #include "lyxtext.h" -// $Id: LyXView.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $ - -#if !defined(lint) && !defined(WITH_WARNINGS) -static char vcid[] = "$Id: LyXView.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $"; -#endif /* lint */ - -extern FD_form_document *fd_form_document; -FD_form_main *fd_form_main; /* a pointer to the one in LyXView +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 +MiniBuffer * minibuffer;/* a pointer to the one in LyXView should be removed as soon as possible */ extern void AutoSave(); @@ -50,14 +44,15 @@ extern void QuitLyX(); int current_layout = 0; // This is very temporary -BufferView *current_view; +BufferView * current_view; +extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *); LyXView::LyXView(int width, int height) { - fd_form_main = create_form_form_main(width,height); - fl_set_form_atclose(_form, atCloseMainFormCB, NULL); - lyxerr.debug("Initializing LyXFunc"); + fd_form_main = 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; } @@ -75,36 +70,47 @@ LyXView::~LyXView() /// Redraw the main form. void LyXView::redraw() { - lyxerr.debug("LyXView::redraw()"); + lyxerr[Debug::INFO] << "LyXView::redraw()" << endl; fl_redraw_form(_form); minibuffer->Activate(); } // Callback for update timer -void LyXView::UpdateTimerCB(FL_OBJECT *ob, long) +void LyXView::UpdateTimerCB(FL_OBJECT * ob, long) { - LyXView *view = (LyXView*) ob->u_vdata; + LyXView * view = static_cast(ob->u_vdata); if (!view->currentView()->available()) return; if (!view->currentView()->getScreen() || !updatetimer) return; view->currentView()->getScreen()->HideCursor(); - view->currentBuffer()->update(-2); + view->buffer()->update(-2); /* This update can happen, even when the work area has lost * the focus. So suppress the cursor in that case */ updatetimer = 0; } +// Wrapper for the above +extern "C" void C_LyXView_UpdateTimerCB(FL_OBJECT * ob, long data) { + LyXView::UpdateTimerCB(ob, data); +} + + // Callback for autosave timer void LyXView::AutosaveTimerCB(FL_OBJECT *, long) { - lyxerr.debug("Running AutoSave()"); + lyxerr[Debug::INFO] << "Running AutoSave()" << endl; AutoSave(); } +// Wrapper for the above +extern "C" void C_LyXView_AutosaveTimerCB(FL_OBJECT * ob, long data) { + LyXView::AutosaveTimerCB(ob, data); +} + /// Reset autosave timer void LyXView::resetAutosaveTimer() @@ -122,13 +128,19 @@ 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); } -void LyXView::show(int place, int border, char const* title) +void LyXView::show(int place, int border, char const * title) { fl_show_form(_form, place, border, title); minibuffer->Init(); @@ -136,7 +148,7 @@ void LyXView::show(int place, int border, char const* title) } -FD_form_main *LyXView::create_form_form_main(int width, int height) +FD_form_main * 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. @@ -145,7 +157,7 @@ FD_form_main *LyXView::create_form_form_main(int width, int height) * are presented (and rightly so) in GUI popups. Asger. */ { - FL_OBJECT *obj; + FL_OBJECT * obj; FD_form_main *fdui = (FD_form_main *) fl_calloc(1, sizeof(FD_form_main)); @@ -154,9 +166,9 @@ FD_form_main *LyXView::create_form_form_main(int width, int height) // 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); + fdui->form_main->u_vdata = this; + 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; @@ -203,14 +215,14 @@ FD_form_main *LyXView::create_form_form_main(int width, int height) // timer_autosave fdui->timer_autosave = obj = fl_add_timer(FL_HIDDEN_TIMER, - 0,0,0,0,"Timer"); - fl_set_object_callback(obj,AutosaveTimerCB,0); + 0, 0, 0, 0, "Timer"); + fl_set_object_callback(obj, C_LyXView_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; + 0, 0, 0, 0, "Timer"); + fl_set_object_callback(obj, C_LyXView_UpdateTimerCB, 0); + obj->u_vdata = this; // // Misc @@ -237,6 +249,7 @@ FD_form_main *LyXView::create_form_form_main(int width, int height) return fdui; } +extern "C" int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev); void LyXView::init() { @@ -253,7 +266,7 @@ void LyXView::init() // Install the raw callback for keyboard events fl_register_raw_callback(_form, KeyPressMask, - KeyPressMask_raw_callback); + C_LyXView_KeyPressMask_raw_callback); intl->InitKeyMapper(lyxrc->use_kbmap); } @@ -271,7 +284,7 @@ void LyXView::updateLayoutChoice() // this has a bi-effect that the layouts are not showed when no // document is loaded. - if (bufferview==0 || bufferview->currentBuffer()==0) { + if (bufferview == 0 || bufferview->buffer() == 0) { toolbar->combox->clear(); toolbar->combox->Redraw(); return; @@ -279,26 +292,26 @@ void LyXView::updateLayoutChoice() // If textclass is different, we need to update the list if (toolbar->combox->empty() || - (last_textclass != currentBuffer()->params.textclass)) { + (last_textclass != int(buffer()->params.textclass))) { toolbar->combox->clear(); for (int i = 0; - lyxstyle.NameOfLayout(currentBuffer()-> - params.textclass, i) !="@@end@@"; + textclasslist.NameOfLayout(buffer()-> + 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()); + LyXLayout const & layout = textclasslist. + Style(buffer()->params.textclass, i); + if (layout.obsoleted_by().empty()) + toolbar->combox->addline(layout.name().c_str()); else - toolbar->combox->addline(("@N"+layout->name).c_str()); + toolbar->combox->addline(("@N"+layout.name()).c_str()); } - last_textclass = currentBuffer()->params.textclass; + last_textclass = int(buffer()->params.textclass); current_layout = 0; } // we need to do this. toolbar->combox->Redraw(); - char layout = currentBuffer()->text->cursor.par->GetLayout(); + char layout = buffer()->text->cursor.par->GetLayout(); if (layout != current_layout){ toolbar->combox->select(layout + 1); @@ -309,13 +322,13 @@ void LyXView::updateLayoutChoice() void LyXView::UpdateDocumentClassChoice() { - /* update the document class display in the document form */ + // 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++) { + for (i = 0; textclasslist.DescOfClass (i)!= "@@end@@"; i++) { fl_addto_choice(fd_form_document->choice_class, - lyxstyle.DescOfClass(i).c_str()); + textclasslist.DescOfClass(i).c_str()); } } } @@ -325,33 +338,38 @@ void LyXView::UpdateDocumentClassChoice() // as FL_KEYBOARD events :-( Matthias 280596 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 // 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 + if (static_cast(xev)->type == KeyPress && view->bufferview->getWorkArea()->focus && view->bufferview->getWorkArea()->active) - retval = view->getLyXFunc()->processKeyEvent((XEvent*)xev); - + retval = view->getLyXFunc() + ->processKeyEvent(static_cast(xev)); 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); +} // Updates the title of the window with the filename of the current document void LyXView::updateWindowTitle() { - static LString last_title="LyX"; - LString title = "LyX"; + static string last_title = "LyX"; + string title = "LyX"; if (currentView()->available()) { - LString cur_title = currentBuffer()->getFileName(); + string cur_title = buffer()->getFileName(); if (!cur_title.empty()){ title += ": " + OnlyFilename(cur_title); - if (!currentBuffer()->isLyxClean()) + if (!buffer()->isLyxClean()) title += _(" (Changed)"); - if (currentBuffer()->isReadonly()) + if (buffer()->isReadonly()) title += _(" (read only)"); } }