From 90cd5fdf14031c259ddc4f9ecf9ada7c37fcf421 Mon Sep 17 00:00:00 2001

From: Pranav Kant <pranavk@gnome.org>

Date: Thu, 11 Jun 2015 22:00:11 +0530

Subject: [PATCH 050/398] lokdocview: Restructure this GObject class

This is a big messy commit restructuring the whole class to follow most

common practices followed by standard GObject classes, so that it can

keep gobject-introspection happy; hence, allowing this widget to be used

from other languages.

(cherry picked from commit 3061e486f9f9313c15cba6782edfaee96fe4f83d)

Change-Id: I10c34dad402d1ec586958b2db21ff44412c36cea

---

 include/LibreOfficeKit/LibreOfficeKitGtk.h         |   17 +-

 .../qa/gtktiledviewer/gtktiledviewer.cxx           |    4 +-

 libreofficekit/source/gtk/lokdocview.cxx           | 1856 +++++++++++---------

 3 files changed, 1041 insertions(+), 836 deletions(-)

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h

index bdd2e9ab90e3..7048dbefc0a1 100644

--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h

+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h

@@ -25,23 +25,19 @@ G_BEGIN_DECLS

 #define LOK_IS_DOC_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  LOK_TYPE_DOC_VIEW))

 #define LOK_DOC_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  LOK_TYPE_DOC_VIEW, LOKDocViewClass))

-

-typedef struct _LOKDocView       LOKDocView;

-typedef struct _LOKDocViewClass  LOKDocViewClass;

+typedef struct _LOKDocView        LOKDocView;

+typedef struct _LOKDocViewClass   LOKDocViewClass;

+typedef struct _LOKDocViewPrivate LOKDocViewPrivate;

 struct _LOKDocView

 {

     GtkDrawingArea aDrawingArea;

-    struct LOKDocView_Impl* m_pImpl;

+    LOKDocViewPrivate* priv;

 };

 struct _LOKDocViewClass

 {

     GtkDrawingAreaClass parent_class;

-    void (* edit_changed)  (LOKDocView* pView, gboolean was_edit);

-    void (* command_changed) (LOKDocView* pView, char* new_state);

-    void (* search_not_found) (LOKDocView* pView, char* new_state);

-    void (* part_changed) (LOKDocView* pView, int new_part);

 };

 GType                          lok_doc_view_get_type               (void) G_GNUC_CONST;

@@ -78,9 +74,8 @@ void                           lok_doc_view_post_command           (LOKDocView*

                                                                     const char* pArguments);

 /// Posts a keyboard event to LibreOfficeKit.

-void                           lok_doc_view_post_key               (GtkWidget* pWidget,

-                                                                    GdkEventKey* pEvent,

-                                                                    gpointer pData);

+void                           lok_doc_view_post_key               (LOKDocView* pDocView,

+                                                                    GdkEvent* pEvent);

 float                          lok_doc_view_pixel_to_twip          (LOKDocView* pDocView,

                                                                     float fInput);

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx

index 580d5f66f683..8b006797c226 100644

--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx

+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx

@@ -145,12 +145,12 @@ static void getVisibleAreaTwips(GdkRectangle* pArea)

 /// Handles the key-press-event of the window.

-static gboolean signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointer pData)

+static gboolean signalKey(GtkWidget* /*pWidget*/, GdkEvent* pEvent, gpointer/* pData*/)

 {

     LOKDocView* pLOKDocView = LOK_DOC_VIEW(pDocView);

     if (!gtk_widget_get_visible(pFindbar) && bool(lok_doc_view_get_edit(pLOKDocView)))

         {

-            lok_doc_view_post_key(pWidget, pEvent, pData);

+            lok_doc_view_post_key(pLOKDocView, pEvent);

             return TRUE;

         }

     return FALSE;

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx

index b00556620288..7031be9b6536 100644

--- a/libreofficekit/source/gtk/lokdocview.cxx

+++ b/libreofficekit/source/gtk/lokdocview.cxx

@@ -36,26 +36,30 @@

 // Number of handles around a graphic selection.

 #define GRAPHIC_HANDLE_COUNT 8

-/// Holds data used by LOKDocView only.

-struct LOKDocView_Impl

+struct _LOKDocViewPrivate

 {

-    LOKDocView* m_pDocView;

-    TileBuffer m_aTileBuffer;

-

-    float m_fZoom;

-

+    gchar* m_aLOPath;

+    gchar* m_aDocPath;

+    guint m_nLoadProgress;

+    gboolean m_bIsLoading;

+    gboolean m_bCanZoomIn;

+    gboolean m_bCanZoomOut;

     LibreOfficeKit* m_pOffice;

     LibreOfficeKitDocument* m_pDocument;

-    long m_nDocumentWidthTwips;

-    long m_nDocumentHeightTwips;

+

+    TileBuffer m_aTileBuffer;

+

+    gfloat m_fZoom;

+    glong m_nDocumentWidthTwips;

+    glong m_nDocumentHeightTwips;

     /// View or edit mode.

-    bool m_bEdit;

+    gboolean m_bEdit;

     /// Position and size of the visible cursor.

     GdkRectangle m_aVisibleCursor;

     /// Cursor overlay is visible or hidden (for blinking).

-    bool m_bCursorOverlayVisible;

+    gboolean m_bCursorOverlayVisible;

     /// Cursor is visible or hidden (e.g. for graphic selection).

-    bool m_bCursorVisible;

+    gboolean m_bCursorVisible;

     /// Time of the last button press.

     guint32 m_nLastButtonPressTime;

     /// Time of the last button release.

@@ -67,7 +71,7 @@ struct LOKDocView_Impl

     /// Position and size of the selection end.

     GdkRectangle m_aTextSelectionEnd;

     GdkRectangle m_aGraphicSelection;

-    bool m_bInDragGraphicSelection;

+    gboolean m_bInDragGraphicSelection;

     /// @name Start/middle/end handle.

     ///@{

@@ -76,19 +80,19 @@ struct LOKDocView_Impl

     /// Rectangle of the text selection start handle, to know if the user clicked on it or not

     GdkRectangle m_aHandleStartRect;

     /// If we are in the middle of a drag of the text selection end handle.

-    bool m_bInDragStartHandle;

+    gboolean m_bInDragStartHandle;

     /// Bitmap of the text selection middle handle.

     cairo_surface_t* m_pHandleMiddle;

     /// Rectangle of the text selection middle handle, to know if the user clicked on it or not

     GdkRectangle m_aHandleMiddleRect;

     /// If we are in the middle of a drag of the text selection middle handle.

-    bool m_bInDragMiddleHandle;

+    gboolean m_bInDragMiddleHandle;

     /// Bitmap of the text selection end handle.

     cairo_surface_t* m_pHandleEnd;

     /// Rectangle of the text selection end handle, to know if the user clicked on it or not

     GdkRectangle m_aHandleEndRect;

     /// If we are in the middle of a drag of the text selection end handle.

-    bool m_bInDragEndHandle;

+    gboolean m_bInDragEndHandle;

     ///@}

     /// @name Graphic handles.

@@ -98,103 +102,38 @@ struct LOKDocView_Impl

     /// Rectangle of a graphic selection handle, to know if the user clicked on it or not.

     GdkRectangle m_aGraphicHandleRects[8];

     /// If we are in the middle of a drag of a graphic selection handle.

-    bool m_bInDragGraphicHandles[8];

+    gboolean m_bInDragGraphicHandles[8];

     ///@}

-

-    /// Callback data, allocated in lok_doc_view_callback_worker(), released in lok_doc_view_callback().

-    struct CallbackData

-    {

-        int m_nType;

-        std::string m_aPayload;

-        LOKDocView* m_pDocView;

-

-        CallbackData(int nType, const std::string& rPayload, LOKDocView* pDocView);

-    };

-

-

-    LOKDocView_Impl(LOKDocView* pDocView);

-    ~LOKDocView_Impl();

-    /// Connected to the destroy signal of LOKDocView, deletes its LOKDocView_Impl.

-    static void destroy(LOKDocView* pDocView, gpointer pData);

-    /// Connected to the draw of the GtkDrawingArea

-    static gboolean renderDocument(GtkWidget *widget, cairo_t *cr, gpointer user_data);

-    /// Implementation of draw event handler, invoked by renderDocument().

-    gboolean renderDocumentImpl(cairo_t* cr);

-    /// Receives a key press or release event.

-    void signalKey(GdkEventKey* pEvent);

-    /*

-     * The user drags the handle, which is below the cursor, but wants to move the

-     * cursor accordingly.

-     *

-     * @param pHandle the rectangle of the handle

-     * @param pEvent the motion event

-     * @param pPoint the computed point (output parameter)

-     */

-    static void getDragPoint(GdkRectangle* pHandle, GdkEventButton* pEvent, GdkPoint* pPoint);

-    /// Receives a button press event.

-    static gboolean signalButton(GtkWidget* pEventBox, GdkEventButton* pEvent, LOKDocView* pDocView);

-    /// Implementation of button press event handler, invoked by signalButton().

-    gboolean signalButtonImpl(GdkEventButton* pEvent);

-    /// Receives a motion event.

-    static gboolean signalMotion(GtkWidget* pEventBox, GdkEventButton* pEvent, LOKDocView* pDocView);

-    /// Implementation of motion event handler, invoked by signalMotion().

-    gboolean signalMotionImpl(GdkEventButton* pEvent);

-    /// Receives an expose event.

-    static gboolean renderOverlay(GtkWidget* pWidget, cairo_t* cr, gpointer userdata);

-    /// Implementation of expose event handler (renders cursor and selection overlay), invoked by renderOverlay().

-    gboolean renderOverlayImpl(cairo_t *cr);

-    /// Is rRectangle empty?

-    static bool isEmptyRectangle(const GdkRectangle& rRectangle);

-    /*

-     * Renders pHandle below an rCursor rectangle on pCairo.

-     * @param rRectangle output parameter, the rectangle that contains the rendered handle.

-     */

-    void renderHandle(cairo_t* pCairo, const GdkRectangle& rCursor, cairo_surface_t* pHandle, GdkRectangle& rRectangle);

-    /// Renders pHandle around an rSelection rectangle on pCairo.

-    void renderGraphicHandle(cairo_t* pCairo, const GdkRectangle& rSelection, cairo_surface_t* pHandle);

-    /// Takes care of the blinking cursor.

-    static gboolean handleTimeout(gpointer pData);

-    /// Implementation of the timeout handler, invoked by handleTimeout().

-    gboolean handleTimeoutImpl();

-    /// Returns the GdkRectangle of a x,y,width,height string.

-    GdkRectangle payloadToRectangle(const char* pPayload);

-    /// Returns the GdkRectangles of a x1,y1,w1,h1;x2,y2,w2,h2;... string.

-    std::vector<GdkRectangle> payloadToRectangles(const char* pPayload);

-    /// Returns the string representation of a LibreOfficeKitCallbackType enumeration element.

-    static const char* callbackTypeToString(int nType);

-    /// Invoked on the main thread if callbackWorker() requests so.

-    static gboolean callback(gpointer pData);

-    /// Invoked on the main thread if globalCallbackWorker() requests so.

-    static gboolean globalCallback(gpointer pData);

-    /// Implementation of the callback handler, invoked by callback();

-    gboolean callbackImpl(CallbackData* pCallbackData);

-    /// Our LOK callback, runs on the LO thread.

-    static void callbackWorker(int nType, const char* pPayload, void* pData);

-    /// Implementation of the callback worder handler, invoked by callbackWorker().

-    void callbackWorkerImpl(int nType, const char* pPayload);

-    /// Our global LOK callback, runs on the LO thread.

-    static void globalCallbackWorker(int nType, const char* pPayload, void* pData);

-    /// Implementation of the global callback worder handler, invoked by globalCallbackWorker().

-    void globalCallbackWorkerImpl(int nType, const char* pPayload);

-    /// Command state (various buttons like bold are toggled or not) is changed.

-    void commandChanged(const std::string& rPayload);

-    /// Search did not find any matches.

-    void searchNotFound(const std::string& rPayload);

-    /// LOK decided to change parts, need to update UI.

-    void setPart(const std::string& rPayload);

-    /// Sets the tiles enclosed by rRectangle as invalid in m_aTileBuffer

-    void setTilesInvalid(const GdkRectangle& rRectangle);

 };

 enum

 {

+    LOAD_CHANGED,

+    LOAD_FAILED,

     EDIT_CHANGED,

     COMMAND_CHANGED,

     SEARCH_NOT_FOUND,

     PART_CHANGED,

+    HYPERLINK_CLICKED,

+

     LAST_SIGNAL

 };

+enum

+{

+    PROP_0,

+

+    PROP_LO_PATH,

+    PROP_DOC_PATH,

+    PROP_EDITABLE,

+    PROP_LOAD_PROGRESS,

+    PROP_ZOOM,

+    PROP_IS_LOADING,

+    PROP_DOC_WIDTH,

+    PROP_DOC_HEIGHT,

+    PROP_CAN_ZOOM_IN,

+    PROP_CAN_ZOOM_OUT

+};

 static guint doc_view_signals[LAST_SIGNAL] = { 0 };

@@ -203,15 +142,26 @@ SAL_DLLPUBLIC_EXPORT GType lok_doc_view_get_type();

 #pragma GCC diagnostic push

 #pragma GCC diagnostic ignored "-Wunused-function"

 #endif

-G_DEFINE_TYPE(LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA)

+G_DEFINE_TYPE_WITH_PRIVATE (LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA)

 #ifdef __GNUC__

 #pragma GCC diagnostic pop

 #endif

-namespace {

-/// Sets rWidth and rHeight from a "width, height" string.

-void payloadToSize(const char* pPayload, long& rWidth, long& rHeight)

+struct CallbackData

+{

+    int m_nType;

+    std::string m_aPayload;

+    LOKDocView* m_pDocView;

+

+    CallbackData(int nType, const std::string& rPayload, LOKDocView* pDocView)

+        : m_nType(nType),

+          m_aPayload(rPayload),

+          m_pDocView(pDocView) {}

+};

+

+static void

+payloadToSize(const char* pPayload, long& rWidth, long& rHeight)

 {

     rWidth = rHeight = 0;

     gchar** ppCoordinates = g_strsplit(pPayload, ", ", 2);

@@ -226,177 +176,70 @@ void payloadToSize(const char* pPayload, long& rWidth, long& rHeight)

     g_strfreev(ppCoordinates);

 }

-}

-

-

-

-namespace {

-

-/// Implementation of the global callback handler, invoked by globalCallback();

-gboolean globalCallbackImpl(LOKDocView_Impl::CallbackData* pCallback)

+/// Returns the string representation of a LibreOfficeKitCallbackType enumeration element.

+static const char*

+callbackTypeToString (int nType)

 {

-    switch (pCallback->m_nType)

+    switch (nType)

     {

+    case LOK_CALLBACK_INVALIDATE_TILES:

+        return "LOK_CALLBACK_INVALIDATE_TILES";

+    case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:

+        return "LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR";

+    case LOK_CALLBACK_TEXT_SELECTION:

+        return "LOK_CALLBACK_TEXT_SELECTION";

+    case LOK_CALLBACK_TEXT_SELECTION_START:

+        return "LOK_CALLBACK_TEXT_SELECTION_START";

+    case LOK_CALLBACK_TEXT_SELECTION_END:

+        return "LOK_CALLBACK_TEXT_SELECTION_END";

+    case LOK_CALLBACK_CURSOR_VISIBLE:

+        return "LOK_CALLBACK_CURSOR_VISIBLE";

+    case LOK_CALLBACK_GRAPHIC_SELECTION:

+        return "LOK_CALLBACK_GRAPHIC_SELECTION";

+    case LOK_CALLBACK_HYPERLINK_CLICKED:

+        return "LOK_CALLBACK_HYPERLINK_CLICKED";

+    case LOK_CALLBACK_STATE_CHANGED:

+        return "LOK_CALLBACK_STATE_CHANGED";

     case LOK_CALLBACK_STATUS_INDICATOR_START:

-    {

-    }

-    break;

+        return "LOK_CALLBACK_STATUS_INDICATOR_START";

     case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:

-    {

-    }

-    break;

+        return "LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE";

     case LOK_CALLBACK_STATUS_INDICATOR_FINISH:

-    {

-    }

-    break;

-    default:

-        g_assert(false);

-        break;

+        return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";

+    case LOK_CALLBACK_SEARCH_NOT_FOUND:

+        return "LOK_CALLBACK_SEARCH_NOT_FOUND";

+    case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:

+        return "LOK_CALLBACK_DOCUMENT_SIZE_CHANGED";

+    case LOK_CALLBACK_SET_PART:

+        return "LOK_CALLBACK_SET_PART";

     }

-    delete pCallback;

-

-    return G_SOURCE_REMOVE;

-}

-

-}

-

-LOKDocView_Impl::CallbackData::CallbackData(int nType, const std::string& rPayload, LOKDocView* pDocView)

-    : m_nType(nType),

-    m_aPayload(rPayload),

-    m_pDocView(pDocView)

-{

-}

-

-LOKDocView_Impl::LOKDocView_Impl(LOKDocView* pDocView)

-    : m_pDocView(pDocView),

-      m_aTileBuffer(TileBuffer(0,0)),

-      m_fZoom(1),

-      m_pOffice(0),

-      m_pDocument(0),

-      m_nDocumentWidthTwips(0),

-      m_nDocumentHeightTwips(0),

-      m_bEdit(false),

-      m_aVisibleCursor({0, 0, 0, 0}),

-      m_bCursorOverlayVisible(false),

-      m_bCursorVisible(true),

-      m_nLastButtonPressTime(0),

-      m_nLastButtonReleaseTime(0),

-      m_aTextSelectionStart({0, 0, 0, 0}),

-      m_aTextSelectionEnd({0, 0, 0, 0}),

-      m_aGraphicSelection({0, 0, 0, 0}),

-      m_bInDragGraphicSelection(false),

-

-      // Start/middle/end handle.

-      m_pHandleStart(0),

-      m_aHandleStartRect({0, 0, 0, 0}),

-      m_bInDragStartHandle(false),

-      m_pHandleMiddle(0),

-      m_aHandleMiddleRect({0, 0, 0, 0}),

-      m_bInDragMiddleHandle(false),

-      m_pHandleEnd(0),

-      m_aHandleEndRect({0, 0, 0, 0}),

-      m_bInDragEndHandle(false),

-

-      m_pGraphicHandle(0)

-{

-    memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects));

-    memset(&m_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles));

-}

-

-LOKDocView_Impl::~LOKDocView_Impl()

-{

-    if (m_pDocument)

-        m_pDocument->pClass->destroy(m_pDocument);

-    if (m_pOffice)

-        m_pOffice->pClass->destroy(m_pOffice);

-    m_pDocument = 0;

-    m_pOffice = 0;

-}

-

-void LOKDocView_Impl::destroy(LOKDocView* pDocView, gpointer /*pData*/)

-{

-    // We specifically need to destroy the document when closing in order to ensure

-    // that lock files etc. are cleaned up.

-    delete pDocView->m_pImpl;

-}

-

-gboolean LOKDocView_Impl::renderDocument(GtkWidget* /*widget*/, cairo_t *cr, gpointer userdata)

-{

-    LOKDocView *pDocView = LOK_DOC_VIEW (userdata);

-    return pDocView->m_pImpl->renderDocumentImpl(cr);

+    return 0;

 }

-gboolean LOKDocView_Impl::renderDocumentImpl(cairo_t *pCairo)

+static bool

+isEmptyRectangle(const GdkRectangle& rRectangle)

 {

-    long nDocumentWidthPixels = twipToPixel(m_nDocumentWidthTwips, m_fZoom);

-    long nDocumentHeightPixels = twipToPixel(m_nDocumentHeightTwips, m_fZoom);

-    // Total number of rows / columns in this document.

-    guint nRows = ceil((double)nDocumentHeightPixels / nTileSizePixels);

-    guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);

-    GdkRectangle aVisibleArea;

-

-    gdk_cairo_get_clip_rectangle (pCairo, &aVisibleArea);

-

-    aVisibleArea.x = pixelToTwip (aVisibleArea.x, m_fZoom);

-    aVisibleArea.y = pixelToTwip (aVisibleArea.y, m_fZoom);

-    aVisibleArea.width = pixelToTwip (aVisibleArea.width, m_fZoom);

-    aVisibleArea.height = pixelToTwip (aVisibleArea.height, m_fZoom);

-

-    // Render the tiles.

-    for (guint nRow = 0; nRow < nRows; ++nRow)

-    {

-        for (guint nColumn = 0; nColumn < nColumns; ++nColumn)

-        {

-            GdkRectangle aTileRectangleTwips, aTileRectanglePixels;

-            bool bPaint = true;

-

-            // Determine size of the tile: the rightmost/bottommost tiles may

-            // be smaller, and we need the size to decide if we need to repaint.

-            if (nColumn == nColumns - 1)

-                aTileRectanglePixels.width = nDocumentWidthPixels - nColumn * nTileSizePixels;

-            else

-                aTileRectanglePixels.width = nTileSizePixels;

-            if (nRow == nRows - 1)

-                aTileRectanglePixels.height = nDocumentHeightPixels - nRow * nTileSizePixels;

-            else

-                aTileRectanglePixels.height = nTileSizePixels;

-

-            // Determine size and position of the tile in document coordinates,

-            // so we can decide if we can skip painting for partial rendering.

-            aTileRectangleTwips.x = pixelToTwip(nTileSizePixels, m_fZoom) * nColumn;

-            aTileRectangleTwips.y = pixelToTwip(nTileSizePixels, m_fZoom) * nRow;

-            aTileRectangleTwips.width = pixelToTwip(aTileRectanglePixels.width, m_fZoom);

-            aTileRectangleTwips.height = pixelToTwip(aTileRectanglePixels.height, m_fZoom);

-

-            if (!gdk_rectangle_intersect(&aVisibleArea, &aTileRectangleTwips, 0))

-                bPaint = false;

-

-            if (bPaint)

-            {

-                Tile& currentTile = m_aTileBuffer.getTile(nRow, nColumn, m_fZoom);

-                GdkPixbuf* pPixBuf = currentTile.getBuffer();

-                gdk_cairo_set_source_pixbuf (pCairo, pPixBuf,

-                                             twipToPixel(aTileRectangleTwips.x, m_fZoom),

-                                             twipToPixel(aTileRectangleTwips.y, m_fZoom));

-                cairo_paint(pCairo);

-            }

-        }

-    }

-    return FALSE;

+    return rRectangle.x == 0 && rRectangle.y == 0 && rRectangle.width == 0 && rRectangle.height == 0;

 }

-void LOKDocView_Impl::signalKey(GdkEventKey* pEvent)

+static void

+signalKey (LOKDocView* pDocView, const GdkEvent* pEvent)

 {

+    LOKDocViewPrivate* priv = pDocView->priv;

     int nCharCode = 0;

     int nKeyCode = 0;

+    guint keyval;

+    GdkModifierType state;

+    gdk_event_get_keyval (pEvent, &keyval);

+    gdk_event_get_state (pEvent, &state);

-    if (!m_bEdit)

+    if (!priv->m_bEdit)

     {

         g_info("signalKey: not in edit mode, ignore");

         return;

     }

-    switch (pEvent->keyval)

+    switch (keyval)

     {

     case GDK_KEY_BackSpace:

         nKeyCode = com::sun::star::awt::Key::BACKSPACE;

@@ -423,325 +266,300 @@ void LOKDocView_Impl::signalKey(GdkEventKey* pEvent)

         nKeyCode = com::sun::star::awt::Key::RIGHT;

         break;

     default:

-        if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26)

-            nKeyCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1);

+        if (keyval >= GDK_KEY_F1 && keyval <= GDK_KEY_F26)

+            nKeyCode = com::sun::star::awt::Key::F1 + (keyval - GDK_KEY_F1);

         else

-            nCharCode = gdk_keyval_to_unicode(pEvent->keyval);

+            nCharCode = gdk_keyval_to_unicode(keyval);

     }

     // rsc is not public API, but should be good enough for debugging purposes.

     // If this is needed for real, then probably a new param of type

     // css::awt::KeyModifier is needed in postKeyEvent().

-    if (pEvent->state & GDK_SHIFT_MASK)

+    if (state & GDK_SHIFT_MASK)

         nKeyCode |= KEY_SHIFT;

     if (pEvent->type == GDK_KEY_RELEASE)

-        m_pDocument->pClass->postKeyEvent(m_pDocument, LOK_KEYEVENT_KEYUP, nCharCode, nKeyCode);

+        priv->m_pDocument->pClass->postKeyEvent(priv->m_pDocument, LOK_KEYEVENT_KEYUP, nCharCode, nKeyCode);

     else

-        m_pDocument->pClass->postKeyEvent(m_pDocument, LOK_KEYEVENT_KEYINPUT, nCharCode, nKeyCode);

-}

-

-gboolean LOKDocView_Impl::signalButton(GtkWidget* /*pEventBox*/, GdkEventButton* pEvent, LOKDocView* pDocView)

-{

-    return pDocView->m_pImpl->signalButtonImpl(pEvent);

+        priv->m_pDocument->pClass->postKeyEvent(priv->m_pDocument, LOK_KEYEVENT_KEYINPUT, nCharCode, nKeyCode);

 }

-/// Receives a button press event.

-gboolean LOKDocView_Impl::signalButtonImpl(GdkEventButton* pEvent)

+static gboolean

+handleTimeout (gpointer pData)

 {

-    g_info("LOKDocView_Impl::signalButton: %d, %d (in twips: %d, %d)", (int)pEvent->x, (int)pEvent->y, (int)pixelToTwip(pEvent->x, m_fZoom), (int)pixelToTwip(pEvent->y, m_fZoom));

+    LOKDocView* pDocView = LOK_DOC_VIEW (pData);

+    LOKDocViewPrivate* priv = pDocView->priv;

-    if (pEvent->type == GDK_BUTTON_RELEASE)

+    if (priv->m_bEdit)

     {

-        if (m_bInDragStartHandle)

-        {

-            g_info("LOKDocView_Impl::signalButton: end of drag start handle");

-            m_bInDragStartHandle = false;

-            return FALSE;

-        }

-        else if (m_bInDragMiddleHandle)

-        {

-            g_info("LOKDocView_Impl::signalButton: end of drag middle handle");

-            m_bInDragMiddleHandle = false;

-            return FALSE;

-        }

-        else if (m_bInDragEndHandle)

-        {

-            g_info("LOKDocView_Impl::signalButton: end of drag end handle");

-            m_bInDragEndHandle = false;

-            return FALSE;

-        }

+        if (priv->m_bCursorOverlayVisible)

+            priv->m_bCursorOverlayVisible = false;

+        else

+            priv->m_bCursorOverlayVisible = true;

+        gtk_widget_queue_draw(GTK_WIDGET(pDocView));

+    }

-        for (int i = 0; i < GRAPHIC_HANDLE_COUNT; ++i)

-        {

-            if (m_bInDragGraphicHandles[i])

-            {

-                g_info("LOKDocView_Impl::signalButton: end of drag graphic handle #%d", i);

-                m_bInDragGraphicHandles[i] = false;

-                m_pDocument->pClass->setGraphicSelection(m_pDocument, LOK_SETGRAPHICSELECTION_END, pixelToTwip(pEvent->x, m_fZoom), pixelToTwip(pEvent->y, m_fZoom));

-                return FALSE;

-            }

-        }

+    return G_SOURCE_CONTINUE;

+}

-        if (m_bInDragGraphicSelection)

-        {

-            g_info("LOKDocView_Impl::signalButton: end of drag graphic selection");

-            m_bInDragGraphicSelection = false;

-            m_pDocument->pClass->setGraphicSelection(m_pDocument, LOK_SETGRAPHICSELECTION_END, pixelToTwip(pEvent->x, m_fZoom), pixelToTwip(pEvent->y, m_fZoom));

-            return FALSE;

-        }

-    }

+static void

+commandChanged(LOKDocView* pDocView, const std::string& rString)

+{

+    g_signal_emit(pDocView, doc_view_signals[COMMAND_CHANGED], 0, rString.c_str());

+}

-    if (m_bEdit)

-    {

-        GdkRectangle aClick;

-        aClick.x = pEvent->x;

-        aClick.y = pEvent->y;

-        aClick.width = 1;

-        aClick.height = 1;

-        if (pEvent->type == GDK_BUTTON_PRESS)

-        {

-            if (gdk_rectangle_intersect(&aClick, &m_aHandleStartRect, NULL))

-            {

-                g_info("LOKDocView_Impl::signalButton: start of drag start handle");

-                m_bInDragStartHandle = true;

-                return FALSE;

-            }

-            else if (gdk_rectangle_intersect(&aClick, &m_aHandleMiddleRect, NULL))

-            {

-                g_info("LOKDocView_Impl::signalButton: start of drag middle handle");

-                m_bInDragMiddleHandle = true;

-                return FALSE;

-            }

-            else if (gdk_rectangle_intersect(&aClick, &m_aHandleEndRect, NULL))

-            {

-                g_info("LOKDocView_Impl::signalButton: start of drag end handle");

-                m_bInDragEndHandle = true;

-                return FALSE;

-            }

+static void

+searchNotFound(LOKDocView* pDocView, const std::string& rString)

+{

+    g_signal_emit(pDocView, doc_view_signals[SEARCH_NOT_FOUND], 0, rString.c_str());

+}

-            for (int i = 0; i < GRAPHIC_HANDLE_COUNT; ++i)

-            {

-                if (gdk_rectangle_intersect(&aClick, &m_aGraphicHandleRects[i], NULL))

-                {

-                    g_info("LOKDocView_Impl::signalButton: start of drag graphic handle #%d", i);

-                    m_bInDragGraphicHandles[i] = true;

-                    m_pDocument->pClass->setGraphicSelection(m_pDocument,

-                                                             LOK_SETGRAPHICSELECTION_START,

-                                                             pixelToTwip(m_aGraphicHandleRects[i].x + m_aGraphicHandleRects[i].width / 2, m_fZoom),

-                                                             pixelToTwip(m_aGraphicHandleRects[i].y + m_aGraphicHandleRects[i].height / 2, m_fZoom));

-                    return FALSE;

-                }

-            }

-        }

-    }

+static void

+setPart(LOKDocView* pDocView, const std::string& rString)

+{

+    g_signal_emit(pDocView, doc_view_signals[PART_CHANGED], 0, std::stoi(rString));

+}

-    if (!m_bEdit)

-        lok_doc_view_set_edit(m_pDocView, TRUE);

+/// Implementation of the global callback handler, invoked by globalCallback();

+static gboolean

+globalCallback (gpointer pData)

+{

+    CallbackData* pCallback = static_cast<CallbackData*>(pData);

-    switch (pEvent->type)

+    switch (pCallback->m_nType)

     {

-    case GDK_BUTTON_PRESS:

+    case LOK_CALLBACK_STATUS_INDICATOR_START:

     {

-        int nCount = 1;

-        if ((pEvent->time - m_nLastButtonPressTime) < 250)

-            nCount++;

-        m_nLastButtonPressTime = pEvent->time;

-        m_pDocument->pClass->postMouseEvent(m_pDocument, LOK_MOUSEEVENT_MOUSEBUTTONDOWN, pixelToTwip(pEvent->x, m_fZoom), pixelToTwip(pEvent->y, m_fZoom), nCount);

-        break;

     }

-    case GDK_BUTTON_RELEASE:

+    break;

+    case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:

     {

-        int nCount = 1;

-        if ((pEvent->time - m_nLastButtonReleaseTime) < 250)

-            nCount++;

-        m_nLastButtonReleaseTime = pEvent->time;

-        m_pDocument->pClass->postMouseEvent(m_pDocument, LOK_MOUSEEVENT_MOUSEBUTTONUP, pixelToTwip(pEvent->x, m_fZoom), pixelToTwip(pEvent->y, m_fZoom), nCount);