X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.C;h=5b41de1b1e806d0e0f6edd6d98c72e69c91aad2a;hb=27290f151b160dd4763a41976af3451755cd03cf;hp=e4c70906e48c2c9b14ffed83dfbe54bf46800ba6;hpb=c04225fdf19f00c1cc91255073ad1a8fcd76675b;p=lyx.git

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index e4c70906e4..5b41de1b1e 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -176,7 +176,9 @@ void BufferView::Pimpl::buffer(Buffer * b)
 	lyxerr[Debug::INFO] << "Setting buffer in BufferView ("
 			    << b << ")" << endl;
 	if (buffer_) {
+#if 0
 		insetSleep();
+#endif
 		buffer_->delUser(bv_);
 
 		// Put the old text into the TextCache, but
@@ -222,7 +224,9 @@ void BufferView::Pimpl::buffer(Buffer * b)
 		// require bv_->text.
 		owner_->getDialogs()->updateBufferDependent(true);
 		redraw();
+#if 0
 		insetWakeup();
+#endif
 	} else {
 		lyxerr[Debug::INFO] << "  No Buffer!" << endl;
 		owner_->updateMenubar();
@@ -326,10 +330,12 @@ int BufferView::Pimpl::resizeCurrentBuffer()
 		selection = bv_->text->selection.set();
 		mark_set = bv_->text->selection.mark();
 		the_locking_inset = bv_->theLockingInset();
+		buffer_->resizeInsets(bv_);
+		// I don't think the delete and new are necessary here we just could
+		// call only init! (Jug 20020419)
 		delete bv_->text;
 		bv_->text = new LyXText(bv_);
 		bv_->text->init(bv_);
-		buffer_->resizeInsets(bv_);
 	} else {
 		// See if we have a text in TextCache that fits
 		// the new buffer_ with the correct width.
@@ -412,7 +418,7 @@ void BufferView::Pimpl::updateScrollbar()
 
 	lyxerr[Debug::GUI] << "text_height now " << text_height << endl;
 	lyxerr[Debug::GUI] << "work_height " << work_height << endl;
- 
+
 	/* If the text is smaller than the working area, the scrollbar
 	 * maximum must be the working area height. No scrolling will
 	 * be possible */
@@ -435,7 +441,7 @@ void BufferView::Pimpl::updateScrollbar()
 void BufferView::Pimpl::scrollCB(double value)
 {
 	lyxerr[Debug::GUI] << "scrollCB of " << value << endl;
- 
+
 	if (!buffer_) return;
 
 	current_scrollbar_value = long(value);
@@ -470,19 +476,24 @@ void BufferView::Pimpl::scrollCB(double value)
 
 int BufferView::Pimpl::scrollUp(long time)
 {
-	if (!buffer_) return 0;
-	if (!screen_.get()) return 0;
+	if (!buffer_ || !screen_.get())
+		return 0;
 
 	double value = workarea_.getScrollbarValue();
 
-	if (value == 0) return 0;
+	if (value == 0)
+		return 0;
 
+#if 1
 	float add_value =  (bv_->text->defaultHeight()
 			    + float(time) * float(time) * 0.125);
 
 	if (add_value > workarea_.height())
 		add_value = float(workarea_.height() -
 				  bv_->text->defaultHeight());
+#else
+	float add_value =  float(workarea_.height()) * float(time) / 100;
+#endif
 
 	value -= add_value;
 
@@ -498,21 +509,26 @@ int BufferView::Pimpl::scrollUp(long time)
 
 int BufferView::Pimpl::scrollDown(long time)
 {
-	if (!buffer_) return 0;
-	if (!screen_.get()) return 0;
+	if (!buffer_ || !screen_.get())
+		return 0;
 
 	double value = workarea_.getScrollbarValue();
 	pair<float, float> p = workarea_.getScrollbarBounds();
 	double const max = p.second;
 
-	if (value == max) return 0;
+	if (value == max)
+		return 0;
 
+#if 1
 	float add_value =  (bv_->text->defaultHeight()
 			    + float(time) * float(time) * 0.125);
 
 	if (add_value > workarea_.height())
 		add_value = float(workarea_.height() -
 				  bv_->text->defaultHeight());
+#else
+	float add_value =  float(workarea_.height()) * float(time) / 100;
+#endif
 
 	value += add_value;
 
@@ -547,12 +563,12 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 						  cursor.par(), cursor.pos());
 		int width = bv_->theLockingInset()->width(bv_, font);
 		int inset_x = font.isVisibleRightToLeft()
-			? cursor.x() - width : cursor.x();
+			? cursor.ix() - width : cursor.ix();
 		int start_x = inset_x + bv_->theLockingInset()->scroll();
 		bv_->theLockingInset()->
 			insetMotionNotify(bv_,
 					  x - start_x,
-					  y - cursor.y() + bv_->text->first_y,
+					  y - cursor.iy() + bv_->text->first_y,
 					  state);
 		return;
 	}
@@ -564,8 +580,27 @@ void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
 		return;
 
 	screen_->hideCursor();
-
+#if 0
+	int y_before = bv_->text->cursor.y();
+#endif
+	Row * cursorrow = bv_->text->cursor.row();
 	bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first_y);
+#if 0
+	// sorry for this but I have a strange error that the y value jumps at
+	// a certain point. This seems like an error in my xforms library or
+	// in some other local environment, but I would like to leave this here
+	// for the moment until I can remove this (Jug 20020418)
+	if (y_before < bv_->text->cursor.y())
+		lyxerr << y_before << ":" << bv_->text->cursor.y() << endl;
+#endif
+	// This is to allow jumping over large insets
+	if (cursorrow == bv_->text->cursor.row()) {
+		if (y >= int(workarea_.height())) {
+			bv_->text->cursorDown(bv_, false);
+		} else if (y < 0) {
+			bv_->text->cursorUp(bv_, false);
+		}
+	}
 
 	if (!bv_->text->selection.set())
 		update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
@@ -584,9 +619,8 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 	if (!buffer_ || !screen_.get())
 		return;
 
-	Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos);
-
 	// ok ok, this is a hack.
+	// Why??? (Jug20020424)
 	if (button == 4 || button == 5) {
 		switch (button) {
 		case 4:
@@ -596,8 +630,14 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 			scrollDown(lyxrc.wheel_jump);
 			break;
 		}
+		// We shouldn't go further down as we really should only do the
+		// scrolling and be done with this. Otherwise we may open some
+		// dialogs (Jug 20020424).
+		return;
 	}
 
+	Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos);
+
 	// Middle button press pastes if we have a selection
 	// We do this here as if the selection was inside an inset
 	// it could get cleared on the unlocking of the inset so
@@ -801,7 +841,9 @@ void BufferView::Pimpl::leaveView()
 void BufferView::Pimpl::workAreaButtonRelease(int x, int y,
 					      unsigned int button)
 {
-	if (!buffer_ || !screen_.get()) return;
+	// do nothing if we used the mouse wheel
+	if (!buffer_ || !screen_.get() || button == 4 || button == 5)
+		return;
 
 	// If we hit an inset, we have the inset coordinates in these
 	// and inset_hit points to the inset.  If we do not hit an
@@ -912,13 +954,13 @@ Box BufferView::Pimpl::insetDimensions(LyXText const & text,
 
 	int const width = inset.width(bv_, font);
 	int const inset_x = font.isVisibleRightToLeft()
-		? (cursor.x() - width) : cursor.x();
+		? (cursor.ix() - width) : cursor.ix();
 
 	return Box(
 		inset_x + inset.scroll(),
 		inset_x + width,
-		cursor.y() - inset.ascent(bv_, font),
-		cursor.y() + inset.descent(bv_, font));
+		cursor.iy() - inset.ascent(bv_, font),
+		cursor.iy() + inset.descent(bv_, font));
 }
 
 
@@ -951,7 +993,7 @@ Inset * BufferView::Pimpl::checkInset(LyXText const & text,
 
 	x -= b.x1;
 	// The origin of an inset is on the baseline
-	y -= (text.cursor.y());
+	y -= text.cursor.iy();
 
 	return inset;
 }
@@ -1050,12 +1092,19 @@ void BufferView::Pimpl::update()
 		screen_->update(bv_->text, bv_);
 		bool fitc = false;
 		while (bv_->text->status() == LyXText::CHANGED_IN_DRAW) {
-			if (bv_->text->fullRebreak(bv_)) {
-				st = LyXText::NEED_MORE_REFRESH;
-				bv_->text->setCursor(bv_, bv_->text->cursor.par(),
-									 bv_->text->cursor.pos());
-				fitc = true;
+			bv_->text->fullRebreak(bv_);
+			st = LyXText::NEED_MORE_REFRESH;
+			bv_->text->setCursor(bv_, bv_->text->cursor.par(),
+					     bv_->text->cursor.pos());
+			if (bv_->text->selection.set()) {
+				bv_->text->setCursor(bv_, bv_->text->selection.start,
+						     bv_->text->selection.start.par(),
+						     bv_->text->selection.start.pos());
+				bv_->text->setCursor(bv_, bv_->text->selection.end,
+						     bv_->text->selection.end.par(),
+						     bv_->text->selection.end.pos());
 			}
+			fitc = true;
 			bv_->text->status(bv_, st);
 			screen_->update(bv_->text, bv_);
 		}
@@ -1161,50 +1210,105 @@ void BufferView::Pimpl::cursorToggle()
 
 void BufferView::Pimpl::cursorPrevious(LyXText * text)
 {
-	if (!text->cursor.row()->previous())
+	if (!text->cursor.row()->previous()) {
+		if (text->first_y > 0) {
+			int new_y = bv_->text->first_y - workarea_.height();
+			screen_->draw(bv_->text, bv_, new_y < 0 ? 0 : new_y);
+			updateScrollbar();
+		}
 		return;
+	}
 
 	int y = text->first_y;
 	Row * cursorrow = text->cursor.row();
 
-	text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
+	text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y);
 	finishUndo();
-	// This is to allow jumping over large insets
-	if ((cursorrow == text->cursor.row()))
-		text->cursorUp(bv_);
-
-	if (text->inset_owner ||
-	    text->cursor.row()->height() < workarea_.height())
-		screen_->draw(bv_->text, bv_,
-			      text->cursor.y()
-			      - text->cursor.row()->baseline()
-			      + text->cursor.row()->height()
-			      - workarea_.height() + 1);
+
+	int new_y;
+	if (cursorrow == bv_->text->cursor.row()) {
+		// we have a row which is higher than the workarea so we leave the
+		// cursor on the start of the row and move only the draw up as soon
+		// as we move the cursor or do something while inside the row (it may
+		// span several workarea-heights) we'll move to the top again, but this
+		// is better than just jump down and only display part of the row.
+		new_y = bv_->text->first_y - workarea_.height();
+	} else {
+		if (text->inset_owner) {
+			new_y = bv_->text->cursor.iy()
+				+ bv_->theLockingInset()->insetInInsetY() + y
+				+ text->cursor.row()->height()
+				- workarea_.height() + 1;
+		} else {
+			new_y = text->cursor.y()
+				- text->cursor.row()->baseline()
+				+ text->cursor.row()->height()
+				- workarea_.height() + 1;
+		}
+	}
+	screen_->draw(bv_->text, bv_,  new_y < 0 ? 0 : new_y);
+	if (text->cursor.row()->previous()) {
+		LyXCursor cur;
+		text->setCursor(bv_, cur, text->cursor.row()->previous()->par(),
+						text->cursor.row()->previous()->pos(), false);
+		if (cur.y() > text->first_y) {
+			text->cursorUp(bv_, true);
+		}
+	}
 	updateScrollbar();
 }
 
 
 void BufferView::Pimpl::cursorNext(LyXText * text)
 {
-	if (!text->cursor.row()->next())
+	if (!text->cursor.row()->next()) {
+		int y = text->cursor.y() - text->cursor.row()->baseline() +
+			text->cursor.row()->height();
+		if (y > int(text->first_y + workarea_.height())) {
+			screen_->draw(bv_->text, bv_,
+						  bv_->text->first_y + workarea_.height());
+			updateScrollbar();
+		}
 		return;
+	}
 
 	int y = text->first_y + workarea_.height();
-//	if (text->inset_owner)
-//		y += bv_->text->first;
+	if (text->inset_owner && !text->first_y) {
+		y -= (bv_->text->cursor.iy()
+			  - bv_->text->first_y
+			  + bv_->theLockingInset()->insetInInsetY());
+	}
 	text->getRowNearY(y);
 
 	Row * cursorrow = text->cursor.row();
 	text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
 	finishUndo();
-	// This is to allow jumping over large insets
-	if ((cursorrow == bv_->text->cursor.row()))
-		text->cursorDown(bv_);
-
-	if (text->inset_owner ||
-	    text->cursor.row()->height() < workarea_.height())
-		screen_->draw(bv_->text, bv_, text->cursor.y() -
-			      text->cursor.row()->baseline());
+	int new_y;
+	if (cursorrow == bv_->text->cursor.row()) {
+		// we have a row which is higher than the workarea so we leave the
+		// cursor on the start of the row and move only the draw down as soon
+		// as we move the cursor or do something while inside the row (it may
+		// span several workarea-heights) we'll move to the top again, but this
+		// is better than just jump down and only display part of the row.
+		new_y = bv_->text->first_y + workarea_.height();
+	} else {
+		if (text->inset_owner) {
+			new_y = bv_->text->cursor.iy()
+				+ bv_->theLockingInset()->insetInInsetY()
+				+ y - text->cursor.row()->baseline();
+		} else {
+			new_y =  text->cursor.y() - text->cursor.row()->baseline();
+		}
+	}
+	screen_->draw(bv_->text, bv_, new_y);
+	if (text->cursor.row()->next()) {
+		LyXCursor cur;
+		text->setCursor(bv_, cur, text->cursor.row()->next()->par(),
+						text->cursor.row()->next()->pos(), false);
+		if (cur.y() < int(text->first_y + workarea_.height())) {
+			text->cursorDown(bv_, true);
+		}
+	}
 	updateScrollbar();
 }
 
@@ -1296,6 +1400,7 @@ void BufferView::Pimpl::setState()
 }
 
 
+#if 0
 void BufferView::Pimpl::insetSleep()
 {
 	if (bv_->theLockingInset() && !inset_slept) {
@@ -1313,6 +1418,7 @@ void BufferView::Pimpl::insetWakeup()
 		inset_slept = false;
 	}
 }
+#endif
 
 
 void BufferView::Pimpl::insetUnlock()
@@ -1438,7 +1544,7 @@ void BufferView::Pimpl::stuffClipboard(string const & stuff) const
 
 
 inline
-void BufferView::Pimpl::moveCursorUpdate(bool selecting)
+void BufferView::Pimpl::moveCursorUpdate(bool selecting, bool fitcur)
 {
 	LyXText * lt = bv_->getLyXText();
 
@@ -1450,7 +1556,10 @@ void BufferView::Pimpl::moveCursorUpdate(bool selecting)
 			updateInset(lt->inset_owner, false);
 	}
 	if (lt->bv_owner) {
-		update(lt, BufferView::SELECT|BufferView::FITCUR);
+		if (fitcur)
+			update(lt, BufferView::SELECT|BufferView::FITCUR);
+		else
+			update(lt, BufferView::SELECT);
 		showCursor();
 	}
 
@@ -1545,6 +1654,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	lyxerr[Debug::ACTION] << "BufferView::Pimpl::Dispatch: action["
 			      << action <<"] arg[" << argument << "]" << endl;
 
+	LyXTextClass const & tclass = textclasslist[buffer_->params.textclass];
+
 	switch (action) {
 		// --- Misc -------------------------------------------
 	case LFUN_APPENDIX:
@@ -1565,7 +1676,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		InsetCommandParams p;
 		p.setCmdName("tableofcontents");
 		Inset * inset = new InsetTOC(p);
-		if (!insertInset(inset, "Standard"))
+		if (!insertInset(inset, tclass.defaultLayoutName()))
 			delete inset;
 		break;
 	}
@@ -1692,15 +1803,12 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 
 		// Derive layout number from given argument (string)
 		// and current buffer's textclass (number). */
-		textclass_type tclass = buffer_->params.textclass;
-		bool hasLayout =
-			textclasslist[tclass].hasLayout(argument);
+		bool hasLayout = tclass.hasLayout(argument);
 		string layout = argument;
 
 		// If the entry is obsolete, use the new one instead.
 		if (hasLayout) {
-			string const & obs = textclasslist[tclass][layout]
-				.obsoleted_by();
+			string const & obs = tclass[layout].obsoleted_by();
 			if (!obs.empty())
 				layout = obs;
 		}
@@ -1712,8 +1820,21 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 			break;
 		}
 
-		if (current_layout != layout) {
-			LyXText * lt = bv_->getLyXText();
+		bool change_layout = (current_layout != layout);
+		LyXText * lt = bv_->getLyXText();
+		if (!change_layout && lt->selection.set() &&
+			lt->selection.start.par() != lt->selection.end.par())
+		{
+			Paragraph * spar = lt->selection.start.par();
+			Paragraph * epar = lt->selection.end.par()->next();
+			while(spar != epar) {
+				if (spar->layout() != current_layout) {
+					change_layout = true;
+					break;
+				}
+			}
+		}
+		if (change_layout) {
 			hideCursor();
 			current_layout = layout;
 			update(lt,
@@ -2026,7 +2147,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		update(lt, BufferView::UPDATE);
 		cursorPrevious(lt);
 		finishUndo();
-		moveCursorUpdate(false);
+		moveCursorUpdate(false, false);
 		owner_->showState();
 	}
 	break;
@@ -2040,7 +2161,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		update(lt, BufferView::UPDATE);
 		cursorNext(lt);
 		finishUndo();
-		moveCursorUpdate(false);
+		moveCursorUpdate(false, false);
 		owner_->showState();
 	}
 	break;
@@ -2193,7 +2314,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		lt->cursorUp(bv_);
+		lt->cursorUp(bv_, true);
 		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
@@ -2206,7 +2327,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 
 		update(lt,
 		       BufferView::SELECT|BufferView::FITCUR);
-		lt->cursorDown(bv_);
+		lt->cursorDown(bv_, true);
 		finishUndo();
 		moveCursorUpdate(true);
 		owner_->showState();
@@ -2365,7 +2486,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		LyXText * lt = bv_->getLyXText();
 
-		LyXLayout const & style = textclasslist[buffer_->params.textclass][lt->cursor.par()->layout()];
+		LyXLayout const & style = tclass[lt->cursor.par()->layout()];
 
 		if (style.free_spacing) {
 			lt->insertChar(bv_, ' ');
@@ -2805,23 +2926,17 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 		break;
 
 	case LFUN_INSET_WIDE_FLOAT:
-	{
 		// check if the float type exist
 		if (floatList.typeExist(argument)) {
 			InsetFloat * new_inset =
 				new InsetFloat(buffer_->params, argument);
 			new_inset->wide(true);
-			if (insertInset(new_inset))
-				new_inset->edit(bv_);
-			else
-				delete new_inset;
+			insertAndEditInset(new_inset);
 		} else {
 			lyxerr << "Non-existent float type: "
 			       << argument << endl;
 		}
-
-	}
-	break;
+		break;
 
 #if 0
 	case LFUN_INSET_LIST:
@@ -3092,7 +3207,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		InsetCommandParams p("printindex");
 		Inset * inset = new InsetPrintIndex(p);
-		if (!insertInset(inset, "Standard"))
+		if (!insertInset(inset, tclass.defaultLayoutName()))
 			delete inset;
 	}
 	break;
@@ -3101,7 +3216,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	{
 		InsetCommandParams p("lyxparent", argument);
 		Inset * inset = new InsetParent(p, *buffer_);
-		if (!insertInset(inset, "Standard"))
+		if (!insertInset(inset, tclass.defaultLayoutName()))
 			delete inset;
 	}
 
@@ -3124,13 +3239,15 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
 	break;
 
 	case LFUN_FLOAT_LIST:
-	{
-		// We should check the argument for validity. (Lgb)
-		Inset * inset = new InsetFloatList(argument);
-		if (!insertInset(inset, "Standard"))
-			delete inset;
-	}
-	break;
+		if (floatList.typeExist(argument)) {
+			Inset * inset = new InsetFloatList(argument);
+			if (!insertInset(inset, tclass.defaultLayoutName()))
+				delete inset;
+		} else {
+			lyxerr << "Non-existent float type: "
+			       << argument << endl;
+		}
+		break;
 
 	case LFUN_THESAURUS_ENTRY:
 	{