X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=c5e3c53030edc39fa7802a352eb7885e994c0f01;hb=83e7c2cff73797fa8f22a8f2cabef003679da10e;hp=d6af100d47539dee499d006058a52a8182972afb;hpb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;p=lyx.git

diff --git a/src/LyXView.C b/src/LyXView.C
index d6af100d47..c5e3c53030 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -1,11 +1,11 @@
-// -*- C++ -*-
+
 /* This file is part of
  * ====================================================== 
  * 
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -15,259 +15,169 @@
 #pragma implementation
 #endif
 
+#include <sys/time.h>
+#include <unistd.h>
+
 #include "LyXView.h"
-#include "lyx_main.h"
-#include "lyxlookup.h"
-#include "toolbar.h"
 #include "minibuffer.h"
-#include "lyxfunc.h"
-#include "lyx.xpm"
 #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"
+#include "buffer.h"
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+#include "MenuBackend.h"
+#include "lyx_gui_misc.h"	// [update,Close,Redraw]AllBufferRelatedDialogs
+#include "bufferview_funcs.h" // CurrentState()
+#include "gettext.h"
+#include "lyxfunc.h"
+#include "BufferView.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 */
+using std::endl;
 
-extern void AutoSave();
-extern char updatetimer;
+extern void AutoSave(BufferView *);
 extern void QuitLyX();
-int current_layout = 0;
 
-// This is very temporary
-BufferView * current_view;
+LyXTextClass::size_type current_layout = 0;
 
-extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *);
 
-LyXView::LyXView(int width, int height)
+LyXView::LyXView()
 {
-	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;
+
+	dialogs_ = new Dialogs(this);
+	// temporary until all dialogs moved into Dialogs.
+	dialogs_->updateBufferDependent
+		.connect(SigC::slot(&updateAllVisibleBufferRelatedDialogs));
+	dialogs_->hideBufferDependent
+		.connect(SigC::slot(&CloseAllBufferRelatedDialogs));
+	Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
+	Dialogs::redrawGUI.connect(SigC::slot(&RedrawAllBufferRelatedDialogs));
 }
 
 
 LyXView::~LyXView()
 {
-	delete menus;
+	delete menubar;
 	delete toolbar;
 	delete bufferview;
 	delete minibuffer;
 	delete lyxfunc;
 	delete intl;
-}
-
-/// Redraw the main form.
-void LyXView::redraw() {
-	lyxerr[Debug::INFO] << "LyXView::redraw()" << endl;
-	fl_redraw_form(_form);
-	minibuffer->Activate();
+	delete dialogs_;
 }
 
 
-// Callback for update timer
-void LyXView::UpdateTimerCB(FL_OBJECT * ob, long)
+void LyXView::resize() 
 {
-	LyXView * view = static_cast<LyXView*>(ob->u_vdata);
-	if (!view->currentView()->available()) 
-		return;
-	if (!view->currentView()->getScreen() || !updatetimer)
-		return;
-
-	view->currentView()->getScreen()->HideCursor();
-	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);
+	view()->resize();
 }
 
 
-
-// Callback for autosave timer
-void LyXView::AutosaveTimerCB(FL_OBJECT *, long)
+/// returns the buffer currently shown in the main form.
+Buffer * LyXView::buffer() const
 {
-	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);
+	return bufferview->buffer();
 }
 
 
-/// Reset autosave timer
-void LyXView::resetAutosaveTimer()
+BufferView * LyXView::view() const
 {
-	if (lyxrc->autosave)
-		fl_set_timer(_form_main->timer_autosave, lyxrc->autosave);
+	return bufferview;
 }
 
 
-// Callback for close main form from window manager
-int LyXView::atCloseMainFormCB(FL_FORM *, void *)
+Toolbar * LyXView::getToolbar() const
 {
-	QuitLyX();
-	return FL_IGNORE;
+	return toolbar;
 }
 
 
-// Wrapper for the above
-extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p) {
-	return LyXView::atCloseMainFormCB(form, p);
+void LyXView::setLayout(LyXTextClass::size_type layout)
+{
+	toolbar->setLayout(layout);
 }
 
 
-void LyXView::setPosition(int x, int y)
+void LyXView::updateToolbar()
 {
-	fl_set_form_position(_form, x, y);
+	toolbar->update();
+	menubar->update();
 }
 
 
-void LyXView::show(int place, int border, char const * title)
+LyXFunc * LyXView::getLyXFunc() const
 {
-	fl_show_form(_form, place, border, title);
-	minibuffer->Init();
-	InitLyXLookup(fl_display, _form->window);
+	return lyxfunc;
 }
 
 
-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. 
-	 * 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. 
-	 */
+MiniBuffer * LyXView::getMiniBuffer() const
 {
-	FL_OBJECT * obj;
-	
-	FD_form_main *fdui = (FD_form_main *)
-		fl_calloc(1, sizeof(FD_form_main));
-
-	_form_main = fdui;
+	return minibuffer;
+}
 
-	// the main form
-	_form = fdui->form_main = fl_bgn_form(FL_NO_BOX, width, height);
-	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;
-	const int bw = abs(fl_get_border_width());
-	
-	//
-	// THE MENUBAR
-	//
+void LyXView::message(string const & str)
+{
+	minibuffer->message(str);
+}
 
-	menus = new Menus(this, air);
 
-	//
-	// TOOLBAR
-	//
+void LyXView::messagePush(string const & str)
+{
+	minibuffer->messagePush(str);
+}
 
-	toolbar = new Toolbar(lyxrc->toolbar, this, air, 30 + air + bw);
 
-	// Setup the toolbar
-	toolbar->set(true);
+void LyXView::messagePop()
+{
+	minibuffer->messagePop();
+}
 
-	//
-	// WORKAREA
-	//
 
-	const int ywork = 60 + 2*air + bw;
-	const int workheight = height - ywork - (25 + 2*air);
+Menubar * LyXView::getMenubar() const
+{
+	return menubar;
+}
 
-	::current_view = bufferview = new BufferView(this, air, ywork,
-						     width - 3*air,
-						     workheight);
 
-	//
-	// MINIBUFFER
-	//
+void LyXView::updateMenubar() 
+{
+	if ((!view() || !view()->buffer())
+	    && menubackend.hasMenu("main_nobuffer"))
+		menubar->set("main_nobuffer");
+	else
+		menubar->set("main");
+}
 
-	minibuffer = new MiniBuffer(this, air, height-(25+air), 
-					  width-(2*air), 25);
-	::minibuffer = minibuffer; // to be removed later
 
+Intl * LyXView::getIntl() const
+{
+	return intl;
+}
 
-	//
-	// TIMERS
-	//
-	
-	// timer_autosave
-	fdui->timer_autosave = obj = fl_add_timer(FL_HIDDEN_TIMER,
-						  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, C_LyXView_UpdateTimerCB, 0);
-	obj->u_vdata = this;
-
-	//
-	// 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);
-
-	// set min size
-	fl_set_form_minsize(fdui->form_main, 50, 50);
-	
-	fl_end_form();
 
-	return fdui;
+// Callback for autosave timer
+void LyXView::AutoSave()
+{
+	lyxerr[Debug::INFO] << "Running AutoSave()" << endl;
+	if (view()->available())
+		::AutoSave(view());
 }
 
-extern "C" int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev);
 
-void LyXView::init()
+/// Reset autosave timer
+void LyXView::resetAutosaveTimer()
 {
-	// Set the textclass choice
-	invalidateLayoutChoice();
-	updateLayoutChoice();
-	UpdateDocumentClassChoice();
-	
-	// Start autosave timer
-	if (lyxrc->autosave)
-		fl_set_timer(_form_main->timer_autosave, lyxrc->autosave);
-	
-	
-	// Install the raw callback for keyboard events 
-	fl_register_raw_callback(_form,
-				 KeyPressMask,
-				 C_LyXView_KeyPressMask_raw_callback);
-        intl->InitKeyMapper(lyxrc->use_kbmap);
+	if (lyxrc.autosave)
+		autosave_timeout.restart();
 }
 
 
@@ -279,103 +189,59 @@ 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->buffer() == 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 != int(buffer()->params.textclass))) {
-		toolbar->combox->clear();
-		for (int i = 0;
-		     textclasslist.NameOfLayout(buffer()->
-					   params.textclass, i) != "@@end@@";
-		     i++) {
-			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());
-		}
+	// Update the layout display
+	if (last_textclass != int(buffer()->params.textclass)) {
+		toolbar->updateLayoutList(true);
 		last_textclass = int(buffer()->params.textclass);
 		current_layout = 0;
+	} else {
+		toolbar->updateLayoutList(false);
 	}
-	// we need to do this.
-	toolbar->combox->Redraw();
 	
-	char layout = buffer()->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; textclasslist.DescOfClass (i)!= "@@end@@"; i++) {
-			fl_addto_choice(fd_form_document->choice_class,
-					textclasslist.DescOfClass(i).c_str());
-		}
-	}
-}
-
-
-// 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<LyXView*>(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 (static_cast<XEvent*>(xev)->type == KeyPress
-	    && view->bufferview->getWorkArea()->focus
-	    && view->bufferview->getWorkArea()->active)
-		retval = view->getLyXFunc()
-			->processKeyEvent(static_cast<XEvent*>(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() {
+void LyXView::updateWindowTitle()
+{
 	static string last_title = "LyX";
 	string title = "LyX";
 
-	if (currentView()->available()) {
-		string cur_title = buffer()->getFileName();
+	if (view()->available()) {
+		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())
 				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()
+{
+	message(currentState(view()));
+	getToolbar()->update();
+	menubar->update();
 }