X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView_pimpl.h;h=d98925866c443819e2cf567a3f3ba0053491e733;hb=5c00d0f48978964a576070d5950556787aa365bb;hp=b0a45d146183e3622bd5582ca3256659e27eca55;hpb=0db59752e20f06adcd14a4f235bf585c21fbcc34;p=lyx.git diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index b0a45d1461..d98925866c 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -1,95 +1,83 @@ // -*- C++ -*- /** * \file BufferView_pimpl.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author various + * \author Asger Alstrup + * \author Alfredo Braustein + * \author Lars Gullik Bjønnes + * \author John Levon + * \author André Pönitz + * \author Dekel Tsur + * \author Jürgen Vigna + * + * Full author contact details are available in file CREDITS. */ #ifndef BUFFERVIEW_PIMPL_H #define BUFFERVIEW_PIMPL_H #include "BufferView.h" -#include "commandtags.h" -#include "frontends/Timeout.h" +#include "cursor.h" +#include "errorlist.h" + +#include "insets/inset.h" + #include "frontends/key_state.h" -#include "frontends/mouse_state.h" -#include "box.h" -#include "insets/insetspecialchar.h" +#include "frontends/Timeout.h" + #include "support/types.h" #include +#include #include -#ifdef __GNUG__ -#pragma interface -#endif +class Change; +class LyXKeySym; class LyXView; class WorkArea; -class LScreen; +class LyXScreen; +class FuncRequest; +class FuncStatus; + -// FIXME: remove -#include - /// struct BufferView::Pimpl : public boost::signals::trackable { /// - Pimpl(BufferView * i, LyXView * o, + Pimpl(BufferView & bv, LyXView * owner, int xpos, int ypos, int width, int height); /// Painter & painter() const; - /// return the work area for this bview - WorkArea & workarea() const; /// return the screen for this bview - LScreen & screen() const; - /// - void buffer(Buffer *); - /// - void resize(int xpos, int ypos, int width, int height); - /// - void resize(); + LyXScreen & screen() const; /// - void redraw(); + void setBuffer(Buffer * buf); /// Return true if the cursor was fitted. bool fitCursor(); /// void redoCurrentBuffer(); /// - int resizeCurrentBuffer(); + void resizeCurrentBuffer(); /// void update(); - // - void update(LyXText *, BufferView::UpdateCodes); - /// Update pixmap of screen - void updateScreen(); /// - void workAreaExpose(); + void newFile(std::string const &, std::string const &, bool); /// - void updateScrollbar(); - /// - 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); + bool loadLyXFile(std::string const &, bool); /// - void workAreaKeyPress(KeySym key, key_modifier::state state); + void workAreaResize(); /// - void workAreaMotionNotify(int x, int y, mouse_button::state state); - /// - void workAreaButtonPress(int x, int y, mouse_button::state button); + void updateScrollbar(); /// - void workAreaButtonRelease(int x, int y, mouse_button::state button); + void scrollDocView(int value); + /// Wheel mouse scroll, move by multiples of text->defaultRowHeight(). + void scroll(int lines); /// - void doubleClick(int x, int y, mouse_button::state button); + typedef boost::shared_ptr LyXKeySymPtr; /// - void tripleClick(int x, int y, mouse_button::state button); + void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state); /// void selectionRequested(); /// @@ -97,13 +85,9 @@ struct BufferView::Pimpl : public boost::signals::trackable { /// void cursorToggle(); /// - void cursorPrevious(LyXText *); - /// - void cursorNext(LyXText *); - /// bool available() const; - /// - void beforeChange(LyXText *); + /// get the change at the cursor position + Change const getCurrentChange(); /// void savePosition(unsigned int i); /// @@ -111,60 +95,53 @@ struct BufferView::Pimpl : public boost::signals::trackable { /// bool isSavedPosition(unsigned int i); /// - void setState(); - /// - void insetUnlock(); - /// - bool focus() const; - /// - void focus(bool); - /// - void showCursor(); - /// - void hideCursor(); - /// - void toggleSelection(bool = true); - /// - void toggleToggle(); + void switchKeyMap(); /// void center(); + /// a function should be executed from the workarea + bool workAreaDispatch(FuncRequest const & ev); + /// return true for events that will handle + FuncStatus getStatus(FuncRequest const & cmd); + /// a function should be executed + bool dispatch(FuncRequest const & ev); /// - bool insertInset(Inset * inset, string const & lout = string()); - /// - void updateInset(Inset * inset, bool mark_dirty); + int top_y() const; /// - bool Dispatch(kb_action action, string const & argument); + void top_y(int y); 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; + /// the y coordinate of the top of the screen + int top_y_; + /// An error list (replaces the error insets) + ErrorList errorlist_; + /// add an error to the list + void addError(ErrorItem const &); + /// buffer errors signal connection + boost::signals::connection errorConnection_; + /// buffer messages signal connection + boost::signals::connection messageConnection_; + /// buffer busy status signal connection + boost::signals::connection busyConnection_; + /// buffer title changed signal connection + boost::signals::connection titleConnection_; + /// buffer reset timers signal connection + boost::signals::connection timerConnection_; + /// buffer readonly status changed signal connection + boost::signals::connection readonlyConnection_; + /// buffer closing signal connection + boost::signals::connection closingConnection_; + /// connect to signals in the given buffer + void connectBuffer(Buffer & buf); + /// disconnect from signals in the given buffer + void disconnectBuffer(); + /// track changes for the document + void trackChanges(); + /// notify readonly status + void showReadonly(bool); + + /// 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_; /// @@ -172,21 +149,19 @@ private: /// Buffer * buffer_; /// - boost::scoped_ptr screen_; + boost::scoped_ptr screen_; /// boost::scoped_ptr workarea_; /// Timeout cursor_timeout; /// - void pasteClipboard(bool asPara); - /// - void stuffClipboard(string const &) const; + void stuffClipboard(std::string const &) const; /// bool using_xterm_cursor; /// struct Position { /// Filename - string filename; + std::string filename; /// Cursor paragraph Id int par_id; /// Cursor position @@ -194,16 +169,24 @@ private: /// Position() : par_id(0), par_pos(0) {} /// - Position(string const & f, int id, lyx::pos_type pos) + Position(std::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); + InsetBase * getInsetByCode(InsetBase::Code code); /// - void MenuInsertLyXFile(string const & filen); + void MenuInsertLyXFile(std::string const & filen); + /// our workarea + WorkArea & workarea() const; + /// this is used to handle XSelection events in the right manner + struct { + CursorSlice cursor; + CursorSlice anchor; + bool set; + } xsel_cache_; + /// + LCursor cursor_; }; #endif // BUFFERVIEW_PIMPL_H