X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=22780d0629fd3504a3c8c589b45737a7e9b5e890;hb=ebfcf1c0e72288b7131607af0330500c8739cead;hp=f50a1206efe6188e8b012fd87270219455fafe70;hpb=08c732ecfad8cb933399b31f5591373fe8195f3a;p=lyx.git

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index f50a1206ef..22780d0629 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -21,7 +21,6 @@
 #include "TextCache.h"
 #include "bufferlist.h"
 #include "insets/insetbib.h"
-#include "menus.h"
 #include "lyx_gui_misc.h"
 #include "lyxrc.h"
 #include "intl.h"
@@ -44,6 +43,7 @@ bool selection_possible = false;
 extern BufferList bufferlist;
 extern char ascii_type;
 
+extern "C" void TimerCB(FL_OBJECT *, long); 
 extern void sigchldhandler(pid_t pid, int * status);
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 
@@ -76,6 +76,27 @@ BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
 {
 	buffer_ = 0;
 	workarea_ = new WorkArea(bv_, xpos, ypos, width, height);
+	// Setup the signals
+	workarea_->workAreaExpose
+		.connect(slot(this, &BufferView::Pimpl::workAreaExpose));
+	workarea_->workAreaEnter
+		.connect(slot(this, &BufferView::Pimpl::enterView));
+	workarea_->workAreaLeave
+		.connect(slot(this, &BufferView::Pimpl::leaveView));
+	workarea_->workAreaButtonPress
+		.connect(slot(this, &BufferView::Pimpl::workAreaButtonPress));
+	workarea_->workAreaButtonRelease
+		.connect(slot(this,
+			      &BufferView::Pimpl::workAreaButtonRelease));
+	workarea_->workAreaMotionNotify
+		.connect(slot(this, &BufferView::Pimpl::workAreaMotionNotify));
+	workarea_->workAreaDoubleClick
+		.connect(slot(this, &BufferView::Pimpl::doubleClick));
+	workarea_->workAreaTripleClick
+		.connect(slot(this, &BufferView::Pimpl::tripleClick));
+	workarea_->workAreaKeyPress
+		.connect(slot(this, &BufferView::Pimpl::workAreaKeyPress));
+	
 	screen_ = 0;
 
 	cursor_timeout.timeout.connect(slot(this,
@@ -130,7 +151,6 @@ void BufferView::Pimpl::buffer(Buffer * b)
 	if (buffer_) {
 		lyxerr[Debug::INFO] << "Buffer addr: " << buffer_ << endl;
 		buffer_->addUser(bv_);
-		owner_->getMenus()->showMenus();
 		// If we don't have a text object for this, we make one
 		if (bv_->text == 0) {
 			resizeCurrentBuffer();
@@ -139,12 +159,15 @@ void BufferView::Pimpl::buffer(Buffer * b)
 			updateScrollbar();
 		}
 		bv_->text->first = screen_->TopCursorVisible(bv_->text);
+		owner_->updateMenubar();
+		owner_->updateToolbar();
 		redraw();
 		owner_->getDialogs()->updateBufferDependent();
 		bv_->insetWakeup();
 	} else {
 		lyxerr[Debug::INFO] << "  No Buffer!" << endl;
-		owner_->getMenus()->hideMenus();
+		owner_->updateMenubar();
+		owner_->updateToolbar();
 		updateScrollbar();
 		workarea_->redraw();
 
@@ -185,12 +208,13 @@ void BufferView::Pimpl::redraw()
 }
 
 
-bool BufferView::Pimpl::fitCursor()
+bool BufferView::Pimpl::fitCursor(LyXText * text)
 {
 	Assert(screen_); // it is a programming error to call fitCursor
 	// without a valid screen.
-	bool ret = screen_->FitCursor(bv_->text);
-	if (ret) updateScrollbar();
+	bool ret = screen_->FitCursor(text);
+	if (ret)
+	    updateScrollbar();
 	return ret;
 }
 
@@ -404,14 +428,15 @@ void BufferView::Pimpl::scrollCB(double value)
 
 	if (cursor_follows_scrollbar) {
 		LyXText * vbt = bv_->text;
-		unsigned int height = vbt->DefaultHeight();
+		int height = vbt->DefaultHeight();
 		
-		if (vbt->cursor.y() < bv_->text->first + height) {
+		if (vbt->cursor.y() < (int)(bv_->text->first + height)) {
 			vbt->SetCursorFromCoordinates(bv_, 0,
 						      bv_->text->first +
 						      height);
 		} else if (vbt->cursor.y() >
-			   bv_->text->first + workarea_->height() - height) {
+			   (int)(bv_->text->first+workarea_->height()-height))
+		{
 			vbt->SetCursorFromCoordinates(bv_, 0,
 						      bv_->text->first +
 						      workarea_->height()  -
@@ -480,6 +505,12 @@ int BufferView::Pimpl::scrollDown(long time)
 }
 
 
+void BufferView::Pimpl::workAreaKeyPress(KeySym keysym, unsigned int state)
+{
+	bv_->owner()->getLyXFunc()->processKeySym(keysym, state);
+}
+
+
 void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 {
 	// Only use motion with button 1
@@ -489,11 +520,12 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 	if (buffer_ == 0 || !screen_) return;
 
 	// Check for inset locking
-	if (bv_->the_locking_inset) {
+	if (bv_->theLockingInset()) {
 		LyXCursor cursor = bv_->text->cursor;
-		bv_->the_locking_inset->
+		bv_->theLockingInset()->
 			InsetMotionNotify(bv_,
-					  x - cursor.x(),
+					  x - cursor.x() -
+					  bv_->theLockingInset()->scroll(),
 					  y - cursor.y() + bv_->text->first,
 					  state);
 		return;
@@ -511,7 +543,7 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
       
 		bv_->text->SetSelection();
 		screen_->ToggleToggle(bv_->text);
-		fitCursor();
+		fitCursor(bv_->text);
 		screen_->ShowCursor(bv_->text);
 	}
 	return;
@@ -541,19 +573,19 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 		}
 	}
 	
-	if (bv_->the_locking_inset) {
+	if (bv_->theLockingInset()) {
 		// We are in inset locking mode
 		
 		/* Check whether the inset was hit. If not reset mode,
 		   otherwise give the event to the inset */
-		if (inset_hit == bv_->the_locking_inset) {
-			bv_->the_locking_inset->
+		if (inset_hit == bv_->theLockingInset()) {
+			bv_->theLockingInset()->
 				InsetButtonPress(bv_,
 						 xpos, ypos,
 						 button);
 			return;
 		} else {
-			bv_->unlockInset(bv_->the_locking_inset);
+			bv_->unlockInset(bv_->theLockingInset());
 		}
 	}
 	
@@ -561,46 +593,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 		selection_possible = true;
 	screen_->HideCursor();
 
-#ifndef NEW_TABULAR
-	// Right button mouse click on a table
-	if (button == 3 &&
-	    (bv_->text->cursor.par()->table ||
-	     bv_->text->MouseHitInTable(bv_, xpos, ypos + bv_->text->first))) {
-		// Set the cursor to the press-position
-		bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + bv_->text->first);
-		bool doit = true;
-		
-		// Only show the table popup if the hit is in
-		// the table, too
-		if (!bv_->text->HitInTable(bv_,
-					   bv_->text->cursor.row(), xpos))
-			doit = false;
-		
-		// Hit above or below the table?
-		if (doit) {
-			if (!bv_->text->selection) {
-				screen_->ToggleSelection(bv_->text);
-				bv_->text->ClearSelection();
-				bv_->text->FullRebreak(bv_);
-				screen_->Update(bv_->text);
-				updateScrollbar();
-			}
-			// Popup table popup when on a table.
-			// This is obviously temporary, since we
-			// should be able to popup various
-			// context-sensitive-menus with the
-			// the right mouse. So this should be done more
-			// general in the future. Matthias.
-			selection_possible = false;
-			owner_->getLyXFunc()
-				->Dispatch(LFUN_LAYOUT_TABLE,
-					   "true");
-			return;
-		}
-	}
-#endif
-	
-	int screen_first = bv_->text->first;
+	int const screen_first = bv_->text->first;
 	
 	// Middle button press pastes if we have a selection
 	bool paste_internally = false;
@@ -643,7 +636,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 	bv_->text->cursor.x_fix(bv_->text->cursor.x());
 	
 	owner_->updateLayoutChoice();
-	if (fitCursor()) {
+	if (fitCursor(bv_->text)) {
 		selection_possible = false;
 	}
 	
@@ -665,7 +658,7 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button) 
 {
 	// select a word
-	if (buffer_ && !bv_->the_locking_inset) {
+	if (buffer_ && !bv_->theLockingInset()) {
 		if (screen_ && button == 1) {
 			screen_->HideCursor();
 			screen_->ToggleSelection(bv_->text);
@@ -675,14 +668,14 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
 			 * if necessary */
 			update(BufferView::SELECT|BufferView::FITCUR);
 		}
-	}            
+	}   
 }
 
 
 void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
 {
 	// select a line
-	if (buffer_ && screen_ && button == 1) {
+	if (buffer_ && screen_ && !bv_->theLockingInset() && (button == 1)) {
 		screen_->HideCursor();
 		screen_->ToggleSelection(bv_->text);
 		bv_->text->CursorHome(bv_);
@@ -725,36 +718,23 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 	// inset, inset_hit is 0, and inset_x == x, inset_y == y.
 	Inset * inset_hit = checkInsetHit(bv_->text, x, y, button);
 
-	if (bv_->the_locking_inset) {
+	if (bv_->theLockingInset()) {
 		// We are in inset locking mode.
 
 		/* LyX does a kind of work-area grabbing for insets.
 		   Only a ButtonPress Event outside the inset will 
 		   force a InsetUnlock. */
-		bv_->the_locking_inset->
+		bv_->theLockingInset()->
 			InsetButtonRelease(bv_, x, y, button);
 		return;
 	}
 	
 	selection_possible = false;
-#ifndef NEW_TABULAR
-	if (bv_->text->cursor.par()->table) {
-                int cell = bv_->text->
-                        NumberOfCell(bv_->text->cursor.par(),
-                                     bv_->text->cursor.pos());
-                if (bv_->text->cursor.par()->table->IsContRow(cell) &&
-                    bv_->text->cursor.par()->table->
-                    CellHasContRow(bv_->text->cursor.par()->table->
-                                   GetCellAbove(cell))<0) {
-                        bv_->text->CursorUp(bv_);
-                }
-        }
-#endif
 	
 	if (button >= 2) return;
 
 	bv_->setState();
-	owner_->getMiniBuffer()->Set(CurrentState(bv_));
+	owner_->showState();
 
 	// Did we hit an editable inset?
 	if (inset_hit != 0) {
@@ -801,6 +781,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 			c = bv_->text->cursor.par()->
 				GetChar(bv_->text->cursor.pos());
 		}
+#ifndef NEW_INSETS
 		if (c == LyXParagraph::META_FOOTNOTE
 		    || c == LyXParagraph::META_MARGIN
 		    || c == LyXParagraph::META_FIG
@@ -809,9 +790,12 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 		    || c == LyXParagraph::META_WIDE_TAB
                     || c == LyXParagraph::META_ALGORITHM){
 			hit = true;
-		} else if (bv_->text->cursor.pos() - 1 >= 0) {
+		} else
+#endif
+			if (bv_->text->cursor.pos() - 1 >= 0) {
 			c = bv_->text->cursor.par()->
 				GetChar(bv_->text->cursor.pos() - 1);
+#ifndef NEW_INSETS
 			if (c == LyXParagraph::META_FOOTNOTE
 			    || c == LyXParagraph::META_MARGIN
 			    || c == LyXParagraph::META_FIG
@@ -823,14 +807,18 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 				bv_->text->CursorLeft(bv_);
 				hit = true;
 			}
+#endif
 		}
 		if (hit == true) {
+#ifndef NEW_INSETS
 			bv_->toggleFloat();
+#endif
 			selection_possible = false;
 			return;
 		}
 	}
 
+#ifndef NEW_INSETS
 	// Do we want to close a float? (click on the float-label)
 	if (bv_->text->cursor.row()->par()->footnoteflag == 
 	    LyXParagraph::OPEN_FOOTNOTE
@@ -856,6 +844,7 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 			return;
 		}
 	}
+#endif
 
 	// Maybe we want to edit a bibitem ale970302
 	if (bv_->text->cursor.par()->bibkey && x < 20 + 
@@ -880,14 +869,11 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 	if (!screen_)
 		return 0;
   
-	unsigned int y_tmp = y + text->first;
+	int y_tmp = y + text->first;
   
 	LyXCursor cursor;
 	text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp);
-#if 0 // Are you planning to use this Jürgen? (Lgb)
-	bool move_cursor = ((cursor.par != text->cursor.par) ||
-			    (cursor.pos != text->cursor.pos()));
-#endif
+
 	if (cursor.pos() < cursor.par()->Last()
 	    && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
 	    && cursor.par()->GetInset(cursor.pos())
@@ -898,23 +884,21 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 		LyXFont font = text->GetFont(bv_->buffer(),
 						  cursor.par(), cursor.pos());
 		bool is_rtl = font.isVisibleRightToLeft();
-		int start_x, end_x;
+		int start_x;
+		int end_x;
 
 		if (is_rtl) {
-			start_x = cursor.x() - tmpinset->width(bv_, font);
-			end_x = cursor.x();
+			start_x = cursor.x() - tmpinset->width(bv_, font) + tmpinset->scroll();
+			end_x = cursor.x() + tmpinset->scroll();
 		} else {
-			start_x = cursor.x();
-			end_x = cursor.x() + tmpinset->width(bv_, font);
+			start_x = cursor.x() + tmpinset->scroll();
+			end_x = cursor.x() + tmpinset->width(bv_, font) + tmpinset->scroll();
 		}
 
 		if (x > start_x && x < end_x
 		    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
 		    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
-#if 0
-			if (move_cursor && (tmpinset != bv_->the_locking_inset))
-#endif
-				text->SetCursor(bv_, cursor.par(),cursor.pos(),true);
+			text->SetCursor(bv_, cursor.par(),cursor.pos(),true);
 			x = x - start_x;
 			// The origin of an inset is on the baseline
 			y = y_tmp - (text->cursor.y()); 
@@ -930,20 +914,23 @@ Inset * BufferView::Pimpl::checkInsetHit(LyXText * text, int & x, int & y,
 		LyXFont font = text->GetFont(bv_->buffer(), cursor.par(),
 						  cursor.pos()-1);
 		bool is_rtl = font.isVisibleRightToLeft();
-		int start_x, end_x;
+		int start_x;
+		int end_x;
 
 		if (!is_rtl) {
-			start_x = cursor.x() - tmpinset->width(bv_, font);
-			end_x = cursor.x();
+			start_x = cursor.x() - tmpinset->width(bv_, font) +
+			    tmpinset->scroll();
+			end_x = cursor.x() + tmpinset->scroll();
 		} else {
-			start_x = cursor.x();
-			end_x = cursor.x() + tmpinset->width(bv_, font);
+			start_x = cursor.x() + tmpinset->scroll();
+			end_x = cursor.x() + tmpinset->width(bv_, font) +
+			    tmpinset->scroll();
 		}
 		if (x > start_x && x < end_x
 		    && y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
 		    && y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
 #if 0
-			if (move_cursor && (tmpinset != bv_->the_locking_inset))
+			if (move_cursor && (tmpinset != bv_->theLockingInset()))
 #endif
 				text->SetCursor(bv_, cursor.par(),cursor.pos()-1,true);
 			x = x - start_x;
@@ -993,7 +980,7 @@ void BufferView::Pimpl::workAreaExpose()
 			// fitCursor() ensures we don't jump back
 			// to the start of the document on vertical
 			// resize
-			fitCursor();
+			fitCursor(bv_->text);
 
 			// The main window size has changed, repaint most stuff
 			redraw();
@@ -1069,7 +1056,7 @@ void BufferView::Pimpl::update(BufferView::UpdateCodes f)
 	update();
 
 	if ((f & FITCUR)) {
-		fitCursor();
+		fitCursor(bv_->text);
       	}
 
 	if ((f & CHANGE)) {
@@ -1135,11 +1122,10 @@ void BufferView::Pimpl::cursorToggle()
 		goto set_timer_and_return;
 	}
 
-	if (!bv_->the_locking_inset) {
+	if (!bv_->theLockingInset()) {
 		screen_->CursorToggle(bv_->text);
 	} else {
-		bv_->the_locking_inset->
-			ToggleInsetCursor(bv_);
+		bv_->theLockingInset()->ToggleInsetCursor(bv_);
 	}
 	
   set_timer_and_return:
@@ -1152,7 +1138,7 @@ void BufferView::Pimpl::cursorPrevious()
 {
 	if (!bv_->text->cursor.row()->previous()) return;
 	
-	long y = bv_->text->first;
+	int y = bv_->text->first;
 	Row * cursorrow = bv_->text->cursor.row();
 	bv_->text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
 	bv_->text->FinishUndo();
@@ -1174,7 +1160,7 @@ void BufferView::Pimpl::cursorNext()
 {
 	if (!bv_->text->cursor.row()->next()) return;
 	
-	long y = bv_->text->first;
+	int y = bv_->text->first;
 	bv_->text->GetRowNearY(y);
 	Row * cursorrow = bv_->text->cursor.row();
 	bv_->text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y
@@ -1222,15 +1208,19 @@ void BufferView::Pimpl::restorePosition()
 	
 	int  x, y;
 	string fname = backstack.pop(&x, &y);
-	
+
 	beforeChange();
-	Buffer * b = bufferlist.exists(fname) ?
-		bufferlist.getBuffer(fname) :
-		bufferlist.loadLyXFile(fname); // don't ask, just load it
-	buffer(b);
+
+	if( fname != buffer_->fileName() ) {
+		Buffer * b = bufferlist.exists(fname) ?
+	 		bufferlist.getBuffer(fname) :
+			bufferlist.loadLyXFile(fname); // don't ask, just load it
+		if( b != 0 ) buffer(b);
+	}
+
 	bv_->text->SetCursorFromCoordinates(bv_, x, y);
 	update(BufferView::SELECT|BufferView::FITCUR);
-} 
+}
 
 
 bool BufferView::Pimpl::NoSavedPositions()
@@ -1257,9 +1247,9 @@ void BufferView::Pimpl::setState()
 
 void BufferView::Pimpl::insetSleep()
 {
-	if (bv_->the_locking_inset && !bv_->inset_slept) {
-		bv_->the_locking_inset->GetCursorPos(bv_, bv_->slx, bv_->sly);
-		bv_->the_locking_inset->InsetUnlock(bv_);
+	if (bv_->theLockingInset() && !bv_->inset_slept) {
+		bv_->theLockingInset()->GetCursorPos(bv_, bv_->slx, bv_->sly);
+		bv_->theLockingInset()->InsetUnlock(bv_);
 		bv_->inset_slept = true;
 	}
 }
@@ -1267,8 +1257,8 @@ void BufferView::Pimpl::insetSleep()
 
 void BufferView::Pimpl::insetWakeup()
 {
-	if (bv_->the_locking_inset && bv_->inset_slept) {
-		bv_->the_locking_inset->Edit(bv_, bv_->slx, bv_->sly, 0);
+	if (bv_->theLockingInset() && bv_->inset_slept) {
+		bv_->theLockingInset()->Edit(bv_, bv_->slx, bv_->sly, 0);
 		bv_->inset_slept = false;
 	}
 }
@@ -1276,9 +1266,10 @@ void BufferView::Pimpl::insetWakeup()
 
 void BufferView::Pimpl::insetUnlock()
 {
-	if (bv_->the_locking_inset) {
-		if (!bv_->inset_slept) bv_->the_locking_inset->InsetUnlock(bv_);
-		bv_->the_locking_inset = 0;
+	if (bv_->theLockingInset()) {
+		if (!bv_->inset_slept)
+			bv_->theLockingInset()->InsetUnlock(bv_);
+		bv_->theLockingInset(0);
 		bv_->text->FinishUndo();
 		bv_->inset_slept = false;
 	}
@@ -1340,7 +1331,7 @@ void BufferView::Pimpl::toggleToggle()
 void BufferView::Pimpl::center() 
 {
 	beforeChange();
-	if (bv_->text->cursor.y() > workarea_->height() / 2) {
+	if (bv_->text->cursor.y() > (int)(workarea_->height() / 2)) {
 		screen_->Draw(bv_->text, bv_->text->cursor.y() - workarea_->height() / 2);
 	} else {
 		screen_->Draw(bv_->text, 0);