X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=e011a08990783a5bcca3d6c504d0e3e83dc12e17;hb=5d3718cad2a2ef6a4d6a495054ab0705ba27b6b5;hp=7fbc00a2f74f943cff7f64736e26dc725bbb5f79;hpb=1e394731004491d04abe436112b5a89521bbd19a;p=lyx.git diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index 7fbc00a2f7..e011a08990 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -1,29 +1,30 @@ // -*- 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 "commandtags.h" -#include "frontends/mouse_state.h" -#include "frontends/key_state.h" #include "frontends/Timeout.h" -// FIXME remove me -#include "frontends/WorkArea.h" -#include "box.h" -#include "insets/insetspecialchar.h" +#include "frontends/key_state.h" +#include "frontends/LyXKeySym.h" #include "support/types.h" #include #include -#ifdef __GNUG__ -#pragma interface -#endif +class Change; class LyXView; class WorkArea; class LyXScreen; +class FuncRequest; /// struct BufferView::Pimpl : public boost::signals::trackable { @@ -31,15 +32,11 @@ 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 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(); /// @@ -50,52 +47,33 @@ struct BufferView::Pimpl : public boost::signals::trackable { void update(); // void update(LyXText *, BufferView::UpdateCodes); - /// Update pixmap of screen - void updateScreen(); + /** + * 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); + 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. + * Wheel mouse scroll, move by multiples of text->defaultRowHeight(). */ - Inset * checkInsetHit(LyXText *, int & x, int & y); - /// - int scrollUp(long time); - /// - int scrollDown(long time); - /// - void workAreaKeyPress(KeySym, key_modifier::state state); - /// - void workAreaMotionNotify(int x, int y, mouse_button::state state); + void scroll(int lines); /// - void workAreaButtonPress(int x, int y, mouse_button::state button); - /// - void workAreaButtonRelease(int x, int y, mouse_button::state button); - /// - void doubleClick(int x, int y, mouse_button::state button); - /// - void tripleClick(int x, int y, mouse_button::state button); + void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state); /// void selectionRequested(); /// void selectionLost(); /// - void enterView(); - /// - void leaveView(); - /// void cursorToggle(); /// - void cursorPrevious(LyXText *); - /// - void cursorNext(LyXText *); - /// bool available() const; + /// get the change at the cursor position + Change const getCurrentChange(); /// void beforeChange(LyXText *); /// @@ -105,24 +83,10 @@ struct BufferView::Pimpl : public boost::signals::trackable { /// bool isSavedPosition(unsigned int i); /// - void setState(); -#if 0 - /// - void insetSleep(); - /// - void insetWakeup(); -#endif + void switchKeyMap(); /// void insetUnlock(); /// - bool focus() const; - /// - void focus(bool); - /// - bool active() const; - /// - bool belowMouse() const; - /// void showCursor(); /// void hideCursor(); @@ -137,38 +101,14 @@ struct BufferView::Pimpl : public boost::signals::trackable { /// void updateInset(Inset * inset, bool mark_dirty); /// - bool Dispatch(kb_action action, string const & argument); + 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; + /// track changes for the document + void trackChanges(); + /// friend class BufferView; - /// open and lock an updatable inset - bool open_new_inset(UpdatableInset * new_inset, bool behind = false); - /// - void specialChar(InsetSpecialChar::Kind); - /// - void newline(); - /// - void hfill(); - /// - void smartQuote(); - /// - void insertAndEditInset(Inset *); - /// - void gotoInset(std::vector const & codes, - bool same_content); - /// - void gotoInset(Inset::Code codes, bool same_content); + /// BufferView * bv_; /// @@ -178,14 +118,10 @@ private: /// boost::scoped_ptr screen_; /// - long current_scrollbar_value; + boost::scoped_ptr workarea_; /// Timeout cursor_timeout; /// - WorkArea workarea_; - /// - void pasteClipboard(bool asPara); - /// void stuffClipboard(string const &) const; /// bool using_xterm_cursor; @@ -205,13 +141,11 @@ private: }; /// 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); - /// - bool inset_slept; + /// our workarea + WorkArea & workarea() const; }; -#endif +#endif // BUFFERVIEW_PIMPL_H