X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=f11ddce9504487ad5a81c32ee7d631547fd2b62f;hb=31b56dac8042735f75229ad480b3e98531c181ff;hp=651a859f28d125b61be4a2e98bfb1d9a763da52f;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/LyXView.C b/src/LyXView.C
index 651a859f28..f11ddce950 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -1,13 +1,12 @@
-// -*- 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-2001 The LyX Team.
+ *
+ * ====================================================== */
 
 #include <config.h>
 
@@ -15,102 +14,198 @@
 #pragma implementation
 #endif
 
+#include <sys/time.h>
+#include <unistd.h>
+
 #include "LyXView.h"
 #include "lyx_main.h"
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
-#include "toolbar.h"
+#endif
 #include "minibuffer.h"
-#include "lyxfunc.h"
-#include "lyx.xpm"
-#include "error.h"
-#include "layout_forms.h"
+#include "debug.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"
+#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,Redraw]AllBufferRelatedDialogs
+#include "bufferview_funcs.h" // CurrentState()
+#include "gettext.h"
+#include "lyxfunc.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
-			       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;
+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 *);
 
 
 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");
+	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);
+
+	// Connect the minibuffer signals
+	minibuffer->stringReady.connect(SigC::slot(lyxfunc,
+						   &LyXFunc::miniDispatch));
+	minibuffer->timeout.connect(SigC::slot(lyxfunc,
+					       &LyXFunc::initMiniBuffer));
+	
 	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(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;
+	delete dialogs_;
 }
 
+
 /// Redraw the main form.
 void LyXView::redraw() {
-	lyxerr.debug("LyXView::redraw()");
-	fl_redraw_form(_form);
-	minibuffer->Activate();
+	lyxerr[Debug::INFO] << "LyXView::redraw()" << endl;
+	fl_redraw_form(form_);
+	minibuffer->redraw();
+}
+
+
+/// 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;
+}
+
+
+void LyXView::message(string const & str)
+{
+	minibuffer->message(str);
+}
+
+
+void LyXView::messagePush(string const & str)
+{
+	minibuffer->messagePush(str);
 }
 
 
-// Callback for update timer
-void LyXView::UpdateTimerCB(FL_OBJECT *ob, long)
+void LyXView::messagePop()
 {
-	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;
+	minibuffer->messagePop();
+}
+
+
+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
+{
+	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();
 }
 
 
@@ -122,21 +217,31 @@ 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);
-	minibuffer->Init();
-	InitLyXLookup(fl_display, _form->window);
+	fl_show_form(form_, place, border, title.c_str());
+	lyxfunc->initMiniBuffer();
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+	InitLyXLookup(fl_get_display(), form_->window);
+#endif
 }
 
 
-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. 
@@ -145,34 +250,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);
@@ -181,60 +278,50 @@ 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(SigC::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;
 }
 
 
@@ -243,18 +330,15 @@ 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);
-	
-	
-	// Install the raw callback for keyboard events 
-	fl_register_raw_callback(_form,
-				 KeyPressMask,
-				 KeyPressMask_raw_callback);
-        intl->InitKeyMapper(lyxrc->use_kbmap);
+	if (lyxrc.autosave) {
+		autosave_timeout.setTimeout(lyxrc.autosave * 1000);
+		autosave_timeout.start();
+	}
+
+        intl->InitKeyMapper(lyxrc.use_kbmap);
 }
 
 
@@ -266,98 +350,60 @@ 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());
-		}
-	}
-}
-
-
-// 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 = (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 (((XEvent*)xev)->type == KeyPress
-	    && view->bufferview->getWorkArea()->focus
-	    && view->bufferview->getWorkArea()->active)
-		retval = view->getLyXFunc()->processKeyEvent((XEvent*)xev);
-
-	return retval;
-}
-
-
 // Updates the title of the window with the filename of the current document
-void LyXView::updateWindowTitle() {
-	static LString last_title="LyX";
-	LString title = "LyX";
+void LyXView::updateWindowTitle()
+{
+	static string last_title = "LyX";
+	string title = "LyX";
 
-	if (currentView()->available()) {
-		LString cur_title = currentBuffer()->getFileName();
+	if (view()->available()) {
+		string const 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()
+{
+	message(CurrentState(view()));
+	getToolbar()->update();
+	menubar->update();
+}