X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxcursor.h;h=8cbea6ce3d223b5c0e61dc5e41316bb0b7eb687d;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=c36812befd3ac70d82f49f08ab19a6df233d88ab;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/lyxcursor.h b/src/lyxcursor.h
index c36812befd..8cbea6ce3d 100644
--- a/src/lyxcursor.h
+++ b/src/lyxcursor.h
@@ -1,121 +1,119 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxcursor.h
+ * Copyright 1995-2001 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * \author Matthias Ettrich
+ */
 
 #ifndef LYXCURSOR_H
 #define LYXCURSOR_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
+#include "ParagraphList.h"
 #include "support/types.h"
 
-class Paragraph;
-class Row;
-
-/** All these variables should be explained. Matthias?
+/**
+ * The cursor class describes the position of a cursor within a document.
+ * Several cursors exist within LyX; for example, when locking an inset,
+ * the position of the cursor in the containing inset is stored.
+ *
+ * FIXME: true ?
  */
 class LyXCursor {
 public:
-	///
 	LyXCursor();
-	///
-	void par(Paragraph * p);
-	///
-	Paragraph * par() const;
-	///
+	/// set the paragraph that contains this cursor
+	void par(ParagraphList::iterator pit);
+	/// return the paragraph this cursor is in
+	ParagraphList::iterator par() const;
+	/// set the position within the paragraph
 	void pos(lyx::pos_type p);
-	///
+	/// return the position within the paragraph
 	lyx::pos_type pos() const;
-	///
+	/// FIXME
 	void boundary(bool b);
-	///
+	/// FIXME
 	bool boundary() const;
-	///
+	/// set the x position in pixels
 	void x(int i);
-	///
+	/// return the x position in pixels
 	int x() const;
-	///
+	/// set the stored next-line position when at the end of a row
+	void ix(int i);
+	/**
+	 * Return the x position of the start of the next row, when this
+	 * cursor is at the end of the previous row, for insets that take
+	 * a full row.
+	 *
+	 * FIXME: explain why we need this ?
+	 */
+	int ix() const;
+	/// set the cached x position
 	void x_fix(int i);
-	///
+	/**
+	 * Return the cached x position of the cursor. This is used for when
+	 * we have text like :
+	 *
+	 * blah blah blah blah| blah blah blah
+	 * blah blah blah
+	 * blah blah blah blah blah blah
+	 *
+	 * When we move onto row 3, we would like to be vertically aligned
+	 * with where we were in row 1, despite the fact that row 2 is
+	 * shorter than x()
+	 */
 	int x_fix() const;
-	///
+	/// set the y position in pixels
 	void y(int i);
-	///
+	/// return the y position in pixels
 	int y() const;
-	///
-	void row(Row * r);
-	///
-	Row * row() const;
+	/// set the stored next-line y position when at the end of a row
+	void iy(int i);
+	/**
+	 * Return the y position of the start of the next row, when this
+	 * cursor is at the end of the previous row, for insets that take
+	 * a full row.
+	 *
+	 * FIXME: explain why we need this ? especially for y...
+	 */
+	int iy() const;
 private:
 	/// The paragraph the cursor is in.
-	Paragraph * par_;
+	ParagraphList::iterator par_;
 	/// The position inside the paragraph
 	lyx::pos_type pos_;
-	///
+	/**
+	 * When the cursor position is i, is the cursor is after the i-th char
+	 * or before the i+1-th char ? Normally, these two interpretations are
+	 * equivalent, except when the fonts of the i-th and i+1-th char
+	 * differ.
+	 * We use boundary_ to distinguish between the two options:
+	 * If boundary_=true, then the cursor is after the i-th char
+	 * and if boundary_=false, then the cursor is before the i+1-th char.
+	 *
+	 * We currently use the boundary only when the language direction of
+	 * the i-th char is different than the one of the i+1-th char.
+	 * In this case it is important to distinguish between the two
+	 * cursor interpretations, in order to give a reasonable behavior to
+	 * the user.
+	 */
 	bool boundary_;
-	///
+	/// the pixel x position
 	int x_;
-	///
+	/// the stored next-row x position
+	int ix_;
+	/// the cached x position
 	int x_fix_;
-	///
+	/// the pixel y position
 	int y_;
-	///
-	Row * row_;
+	/// the stored next-row y position
+	int iy_;
 };
 
+/// 
+bool operator==(LyXCursor const & a, LyXCursor const & b);
 ///
-inline
-bool operator==(LyXCursor const & a, LyXCursor const & b)
-{
-	return (a.par() == b.par())
-		&& (a.pos() == b.pos())
-		&& a.boundary() == b.boundary();
-}
-
-///
-inline
-bool operator!=(LyXCursor const & a, LyXCursor const & b)
-{
-	return !(a == b);
-}
-
-///
-inline
-bool operator<(LyXCursor const & a, LyXCursor const & b)
-{
-	// Can this be done in a nother way?
-	return (a.y() < b.y() && a.pos() < b.pos());
-}
-
-///
-inline
-bool operator>(LyXCursor const & a, LyXCursor const & b)
-{
-	return b < a;
-}
-
-///
-inline
-bool operator>=(LyXCursor const & a, LyXCursor const & b)
-{
-	return !(a < b);
-}
-
-
-///
-inline
-bool operator<=(LyXCursor const & a, LyXCursor const & b)
-{
-	return !(a > b);
-}
+bool operator!=(LyXCursor const & a, LyXCursor const & b);
 
-#endif
+#endif // LYXCURSOR_H