X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=5522450a055e3f48dbaf4a2bde6cd87899801cda;hb=72f30959c17d06ed778f107f77c6357f1e4d3258;hp=e0a33d4aa415f5c2acb2b324fd53f0894dd3803f;hpb=9062ce972e562477eb64c294769747ebf386fa6c;p=lyx.git diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index e0a33d4aa4..5522450a05 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -1,12 +1,26 @@ // -*- C++ -*- +/** + * \file BufferView_pimpl.h + * Copyright 2002 the LyX Team + * Read the file COPYING + * + * \author various + */ #ifndef BUFFERVIEW_PIMPL_H #define BUFFERVIEW_PIMPL_H #include "BufferView.h" -#include "UpdateInset.h" -#include "BackStack.h" -#include "Timeout.h" +#include "frontends/Timeout.h" +#include "frontends/key_state.h" +#include "frontends/mouse_state.h" +#include "frontends/LyXKeySym.h" +#include "box.h" +#include "insets/insetspecialchar.h" +#include "support/types.h" + +#include +#include #ifdef __GNUG__ #pragma interface @@ -16,25 +30,19 @@ class LyXView; class WorkArea; class LyXScreen; -#ifdef SIGC_CXX_NAMESPACES -using SigC::Object; -#endif - /// -struct BufferView::Pimpl : public Object { +struct BufferView::Pimpl : public boost::signals::trackable { /// Pimpl(BufferView * i, LyXView * o, int xpos, int ypos, int width, int height); /// - Painter & painter(); + Painter & painter() const; + /// return the work area for this bview + WorkArea & workarea() const; + /// return the screen for this bview + LyXScreen & screen() const; /// void buffer(Buffer *); - /// - void resize(int xpos, int ypos, int width, int height); - /// - void resize(); - /// - void redraw(); /// Return true if the cursor was fitted. bool fitCursor(); /// @@ -44,73 +52,64 @@ struct BufferView::Pimpl : public Object { /// void update(); // - void update(BufferView::UpdateCodes); - /// - void gotoError(); - /// Update pixmap of screen - void updateScreen(); + void update(LyXText *, BufferView::UpdateCodes); + /** + * Repaint pixmap. Used for when we've made a visible + * change but don't need the full update() logic + */ + void repaint(); /// - void workAreaExpose(); + void workAreaResize(); /// void updateScrollbar(); /// - void scrollCB(double value); - /// - Inset * checkInsetHit(LyXText *, int & x, int & y, - unsigned int button); - /// - int scrollUp(long time); - /// - int scrollDown(long time); + void scrollDocView(int value); + /** + * Returns an inset if inset was hit, or 0 if not. + * + * If hit, the coordinates are changed relative to the inset. + */ + Inset * checkInsetHit(LyXText *, int & x, int & y); + /// wheel mouse scroll + int scroll(long time); /// - void workAreaKeyPress(KeySym, unsigned int state); + void workAreaKeyPress(LyXKeySymPtr key, + key_modifier::state state); /// - void workAreaMotionNotify(int x, int y, unsigned int state); + void workAreaMotionNotify(int x, int y, mouse_button::state state); /// - void workAreaButtonPress(int x, int y, unsigned int button); + void workAreaButtonPress(int x, int y, mouse_button::state button); /// - void workAreaButtonRelease(int x, int y, unsigned int button); + void workAreaButtonRelease(int x, int y, mouse_button::state button); /// - void doubleClick(int x, int y, unsigned int button); + void doubleClick(int x, int y, mouse_button::state button); /// - void tripleClick(int x, int y, unsigned int button); + void tripleClick(int x, int y, mouse_button::state button); /// - void enterView(); + void selectionRequested(); /// - void leaveView(); + void selectionLost(); /// 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 insetSleep(); - /// - void insetWakeup(); + void switchKeyMap(); /// void insetUnlock(); /// - bool focus() const; - /// - void focus(bool); - /// - bool active() const; - /// - bool belowMouse() const; - /// void showCursor(); /// void hideCursor(); @@ -121,33 +120,80 @@ struct BufferView::Pimpl : public Object { /// void center(); /// - BufferView * bv_; + bool insertInset(Inset * inset, string const & lout = string()); /// - LyXView * owner_; + void updateInset(Inset * inset, bool mark_dirty); /// - Buffer * buffer_; + bool dispatch(FuncRequest const & ev); +private: + /** + * Return the on-screen dimensions of the inset at the cursor. + * Pre-condition: the cursor must be at an inset. + */ + Box insetDimensions(LyXText const & text, LyXCursor const & cursor) const; + /** + * check if the given co-ordinates are inside an inset at the + * given cursor, if one exists. If so, the inset is returned, + * and the co-ordinates are made relative. Otherwise, 0 is returned. + */ + Inset * checkInset(LyXText const & text, LyXCursor const & cursor, + int & x, int & y) const; /// - LyXScreen * screen_; + friend class BufferView; + /// open and lock an updatable inset + bool open_new_inset(UpdatableInset * new_inset, bool behind = false); /// - long current_scrollbar_value; + void specialChar(InsetSpecialChar::Kind); /// - FL_OBJECT * figinset_canvas; + void hfill(); /// - Timeout cursor_timeout; - /// - BackStack backstack; + void smartQuote(); + /// + void insertAndEditInset(Inset *); + /// + void gotoInset(std::vector const & codes, + bool same_content); + /// + void gotoInset(Inset::Code codes, bool same_content); + /// + BufferView * bv_; /// - int last_click_x, last_click_y; + LyXView * owner_; + /// + Buffer * buffer_; + /// + boost::scoped_ptr screen_; /// - WorkArea * workarea_; + boost::scoped_ptr workarea_; /// - UpdateInset updatelist; + Timeout cursor_timeout; /// void pasteClipboard(bool asPara); /// void stuffClipboard(string const &) const; -private: /// bool using_xterm_cursor; + /// + struct Position { + /// Filename + string filename; + /// Cursor paragraph Id + int par_id; + /// Cursor position + lyx::pos_type par_pos; + /// + Position() : par_id(0), par_pos(0) {} + /// + Position(string const & f, int id, lyx::pos_type pos) + : filename(f), par_id(id), par_pos(pos) {} + }; + /// + std::vector saved_positions; + /// + void moveCursorUpdate(bool selecting, bool fitcur = true); + /// Get next inset of this class from current cursor position + Inset * getInsetByCode(Inset::Code code); + /// + void MenuInsertLyXFile(string const & filen); }; -#endif +#endif // BUFFERVIEW_PIMPL_H