#include "BufferView.h"
#include "UpdateInset.h"
-#include "BackStack.h"
-#include "Timeout.h"
+#include "commandtags.h"
+#include "frontends/Timeout.h"
#ifdef __GNUG__
#pragma interface
class WorkArea;
class LyXScreen;
-struct BufferView::Pimpl {
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
+
+///
+struct BufferView::Pimpl : public Object {
+ ///
Pimpl(BufferView * i, LyXView * o,
int xpos, int ypos, int width, int height);
///
///
void redraw();
/// Return true if the cursor was fitted.
- bool fitCursor();
+ bool fitCursor(LyXText *);
///
void redoCurrentBuffer();
///
int resizeCurrentBuffer();
///
void update();
- ///
- void update(signed char f);
- ///
- void gotoError();
+ //
+ void update(LyXText *, BufferView::UpdateCodes);
/// Update pixmap of screen
void updateScreen();
///
void updateScrollbar();
///
void scrollCB(double value);
-#if 0
- ///
- void create_view();
-#endif
///
- Inset * checkInsetHit(int & x, int & y, unsigned int button);
+ Inset * checkInsetHit(LyXText *, int & x, int & y,
+ unsigned int button);
///
int scrollUp(long time);
///
int scrollDown(long time);
///
+ void workAreaKeyPress(KeySym, unsigned int state);
+ ///
void workAreaMotionNotify(int x, int y, unsigned int state);
///
void workAreaButtonPress(int x, int y, unsigned int button);
///
void cursorToggle();
///
- void cursorPrevious();
+ void cursorPrevious(LyXText *);
///
- void cursorNext();
+ void cursorNext(LyXText *);
///
bool available() const;
///
- void beforeChange();
+ void beforeChange(LyXText *);
///
- void savePosition();
+ void savePosition(unsigned int i);
///
- void restorePosition();
+ void restorePosition(unsigned int i);
///
- bool NoSavedPositions();
+ bool isSavedPosition(unsigned int i);
///
void setState();
///
///
void center();
///
+ bool Dispatch(kb_action action, string const & argument);
+ ///
BufferView * bv_;
///
LyXView * owner_;
///
Buffer * buffer_;
///
- LyXScreen * screen;
+ LyXScreen * screen_;
///
long current_scrollbar_value;
///
- bool lyx_focus;
- ///
- bool work_area_focus;
- ///
FL_OBJECT * figinset_canvas;
-#if 0
///
- FL_OBJECT * timer_cursor;
-#else
Timeout cursor_timeout;
-#endif
///
- BackStack backstack;
+ int last_click_x;
///
- int last_click_x, last_click_y;
+ int last_click_y;
///
- WorkArea * workarea;
+ WorkArea * workarea_;
///
UpdateInset updatelist;
///
///
void stuffClipboard(string const &) const;
private:
+ ///
bool using_xterm_cursor;
+
+ struct Position {
+ /// Filename
+ string filename;
+ /// Cursor paragraph Id
+ int par_id;
+ /// Cursor position
+ LyXParagraph::size_type par_pos;
+ ///
+ Position() : par_id(0), par_pos(0) {}
+ ///
+ Position(string const & f, int id, LyXParagraph::size_type pos)
+ : filename(f), par_id(id), par_pos(pos) {}
+ };
+ std::vector<Position> saved_positions;
+
+ void moveCursorUpdate(bool selecting);
+ /// Get next inset of this class from current cursor position
+ Inset * getInsetByCode(Inset::Code code);
+ void MenuInsertLyXFile(string const & filen);
};
#endif