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

diff --git a/src/LyXView.C b/src/LyXView.C
index b22acf6a7e..f11ddce950 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -1,11 +1,10 @@
-// -*- C++ -*-
 /* 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.
  *
  * ====================================================== */
 
@@ -20,27 +19,29 @@
 
 #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 "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 "menus.h"
 #include "frontends/Dialogs.h"
-#include "lyx_gui_misc.h"	// [update,Close]AllBufferRelatedDialogs
+#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"
 
 using std::endl;
 
-extern FD_form_document * fd_form_document;
-
 extern void AutoSave(BufferView *);
 extern void QuitLyX();
 LyXTextClass::size_type current_layout = 0;
@@ -50,10 +51,6 @@ BufferView * current_view;
 
 extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *);
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-using SigC::slot;
-#endif
 
 LyXView::LyXView(int width, int height)
 {
@@ -61,23 +58,33 @@ LyXView::LyXView(int width, int 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(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));
 }
 
 
 LyXView::~LyXView()
 {
-	delete menus;
+	delete menubar;
 	delete toolbar;
 	delete bufferview;
 	delete minibuffer;
@@ -91,7 +98,7 @@ LyXView::~LyXView()
 void LyXView::redraw() {
 	lyxerr[Debug::INFO] << "LyXView::redraw()" << endl;
 	fl_redraw_form(form_);
-	minibuffer->Activate();
+	minibuffer->redraw();
 }
 
 
@@ -120,6 +127,19 @@ Toolbar * LyXView::getToolbar() const
 }
 
 
+void LyXView::setLayout(LyXTextClass::size_type layout)
+{
+	toolbar->setLayout(layout);
+}
+
+
+void LyXView::updateToolbar()
+{
+	toolbar->update();
+	menubar->update();
+}
+
+
 LyXFunc * LyXView::getLyXFunc() const
 {
 	return lyxfunc;
@@ -132,9 +152,37 @@ MiniBuffer * LyXView::getMiniBuffer() const
 }
 
 
-Menus * LyXView::getMenus() const
+void LyXView::message(string const & str)
 {
-	return menus;
+	minibuffer->message(str);
+}
+
+
+void LyXView::messagePush(string const & str)
+{
+	minibuffer->messagePush(str);
+}
+
+
+void LyXView::messagePop()
+{
+	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");
 }
 
 
@@ -170,7 +218,8 @@ int LyXView::atCloseMainFormCB(FL_FORM *, void *)
 
 
 // Wrapper for the above
-extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p)
+extern "C"
+int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p)
 {
 	return LyXView::atCloseMainFormCB(form, p);
 }
@@ -182,11 +231,13 @@ void LyXView::setPosition(int x, int 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
 }
 
 
@@ -212,14 +263,13 @@ void LyXView::create_form_form_main(int width, int height)
 	//
 	// THE MENUBAR
 	//
-
-	menus = new Menus(this, air);
+	menubar = new Menubar(this, menubackend);
 
 	//
 	// TOOLBAR
 	//
 
-	toolbar = new Toolbar(this, air, 30 + air + bw);
+	toolbar = new Toolbar(this, air, 30 + air + bw, toolbardefaults);
 
 	// Setup the toolbar
 	toolbar->set(true);
@@ -246,7 +296,7 @@ void LyXView::create_form_form_main(int width, int height)
 	// TIMERS
 	//
 
-	autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave));
+	autosave_timeout.timeout.connect(SigC::slot(this, &LyXView::AutoSave));
 	
 	//
 	// Misc
@@ -275,26 +325,19 @@ void LyXView::create_form_form_main(int width, int height)
 }
 
 
-extern "C"
-int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev);
-
 void LyXView::init()
 {
 	// Set the textclass choice
 	invalidateLayoutChoice();
 	updateLayoutChoice();
-	UpdateDocumentClassChoice();
+	updateMenubar();
 	
 	// Start autosave timer
 	if (lyxrc.autosave) {
 		autosave_timeout.setTimeout(lyxrc.autosave * 1000);
 		autosave_timeout.start();
 	}
-	
-	// Install the raw callback for keyboard events 
-	fl_register_raw_callback(form_,
-				 KeyPressMask,
-				 C_LyXView_KeyPressMask_raw_callback);
+
         intl->InitKeyMapper(lyxrc.use_kbmap);
 }
 
@@ -307,123 +350,33 @@ void LyXView::invalidateLayoutChoice()
 
 void LyXView::updateLayoutChoice()
 {
-	// Update the layout display
-	if (!toolbar->combox) return;
-
 	// 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();
-		LyXTextClass const & tc =
-			textclasslist.TextClass(buffer()->params.textclass);
-		for (LyXTextClass::const_iterator cit = tc.begin();
-		     cit != tc.end(); ++cit) {
-			if ((*cit).obsoleted_by().empty())
-				toolbar->combox->addline((*cit).name().c_str());
-			else
-				toolbar->combox->addline(("@N" + (*cit).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;
-	}
-	// we need to do this.
-	toolbar->combox->Redraw();
+	} else
+		toolbar->updateLayoutList(false);
+
+	
 
 	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
-	if (fd_form_document) {
-		fl_clear_choice(fd_form_document->choice_class);
-		for (LyXTextClassList::const_iterator cit = textclasslist.begin();
-		     cit != textclasslist.end(); ++cit) {
-			fl_addto_choice(fd_form_document->choice_class,
-					(*cit).description().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
-
-	XKeyEvent * xke = static_cast<XKeyEvent*>(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<XEvent*>(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<XEvent*>(xev));
-	}
-	else if (static_cast<XEvent*>(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 << "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);
-}
-
-
 // Updates the title of the window with the filename of the current document
 void LyXView::updateWindowTitle()
 {
@@ -431,9 +384,9 @@ 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 += ": " + OnlyFilename(cur_title);
+			title += ": " + MakeDisplayPath(cur_title, 30);
 			if (!buffer()->isLyxClean())
 				title += _(" (Changed)");
 			if (buffer()->isReadonly())
@@ -450,6 +403,7 @@ void LyXView::updateWindowTitle()
 
 void LyXView::showState()
 {
-	getMiniBuffer()->Set(CurrentState(view()));
+	message(CurrentState(view()));
 	getToolbar()->update();
+	menubar->update();
 }