Blame SOURCES/0131-gtktiledviewer-allow-findbar-in-multiple-windows.patch

135360
From 1ce8cd9be395ac818a151a7618121e9b203bc159 Mon Sep 17 00:00:00 2001
135360
From: Miklos Vajna <vmiklos@collabora.co.uk>
135360
Date: Tue, 15 Sep 2015 12:53:24 +0200
135360
Subject: [PATCH 131/398] gtktiledviewer: allow findbar in multiple windows
135360
135360
With this, all previously global data is now stored per-window in the
135360
g_aWindows map.
135360
135360
Change-Id: I45b4449ee7d516106ea0b039d1af97db49edf759
135360
(cherry picked from commit d51e3f7877afe62b68071a694438d2d6722bb406)
135360
---
135360
 .../qa/gtktiledviewer/gtktiledviewer.cxx           | 67 ++++++++++++----------
135360
 1 file changed, 36 insertions(+), 31 deletions(-)
135360
135360
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
index 3e72c13470a8..efbb90800301 100644
135360
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
@@ -30,10 +30,6 @@ static int help()
135360
     return 1;
135360
 }
135360
 
135360
-static GtkWidget* pFindbar;
135360
-static GtkWidget* pFindbarEntry;
135360
-static GtkWidget* pFindbarLabel;
135360
-
135360
 /// Represents all the state that is specific to one GtkWindow of this app.
135360
 class TiledWindow
135360
 {
135360
@@ -54,6 +50,9 @@ public:
135360
     GtkWidget* m_pPartModeComboBox;
135360
     /// Should the part selector avoid calling lok::Document::setPart()?
135360
     bool m_bPartSelectorBroadcast;
135360
+    GtkWidget* m_pFindbar;
135360
+    GtkWidget* m_pFindbarEntry;
135360
+    GtkWidget* m_pFindbarLabel;
135360
 
135360
     TiledWindow()
135360
         : m_pDocView(0),
135360
@@ -68,7 +67,10 @@ public:
135360
         m_pVBox(0),
135360
         m_pPartSelector(0),
135360
         m_pPartModeComboBox(0),
135360
-        m_bPartSelectorBroadcast(true)
135360
+        m_bPartSelectorBroadcast(true),
135360
+        m_pFindbar(0),
135360
+        m_pFindbarEntry(0),
135360
+        m_pFindbarLabel(0)
135360
     {
135360
     }
135360
 };
135360
@@ -173,16 +175,17 @@ static void toggleEditing(GtkWidget* pButton, gpointer /*pItem*/)
135360
 }
135360
 
135360
 /// Toggle the visibility of the findbar.
135360
-static void toggleFindbar(GtkWidget* /*pButton*/, gpointer /*pItem*/)
135360
+static void toggleFindbar(GtkWidget* pButton, gpointer /*pItem*/)
135360
 {
135360
-    if (gtk_widget_get_visible(pFindbar))
135360
+    TiledWindow& rWindow = lcl_getTiledWindow(pButton);
135360
+    if (gtk_widget_get_visible(rWindow.m_pFindbar))
135360
     {
135360
-        gtk_widget_hide(pFindbar);
135360
+        gtk_widget_hide(rWindow.m_pFindbar);
135360
     }
135360
     else
135360
     {
135360
-        gtk_widget_show_all(pFindbar);
135360
-        gtk_widget_grab_focus(pFindbarEntry);
135360
+        gtk_widget_show_all(rWindow.m_pFindbar);
135360
+        gtk_widget_grab_focus(rWindow.m_pFindbarEntry);
135360
     }
135360
 }
135360
 
135360
@@ -244,10 +247,11 @@ static void doCopy(GtkWidget* pButton, gpointer /*pItem*/)
135360
 }
135360
 
135360
 
135360
-/// Searches for the next or previous text of pFindbarEntry.
135360
+/// Searches for the next or previous text of TiledWindow::m_pFindbarEntry.
135360
 static void doSearch(GtkWidget* pButton, bool bBackwards)
135360
 {
135360
-    GtkEntry* pEntry = GTK_ENTRY(pFindbarEntry);
135360
+    TiledWindow& rWindow = lcl_getTiledWindow(pButton);
135360
+    GtkEntry* pEntry = GTK_ENTRY(rWindow.m_pFindbarEntry);
135360
     const char* pText = gtk_entry_get_text(pEntry);
135360
     boost::property_tree::ptree aTree;
135360
     aTree.put(boost::property_tree::ptree::path_type("SearchItem.SearchString/type", '/'), "string");
135360
@@ -255,7 +259,6 @@ static void doSearch(GtkWidget* pButton, bool bBackwards)
135360
     aTree.put(boost::property_tree::ptree::path_type("SearchItem.Backward/type", '/'), "boolean");
135360
     aTree.put(boost::property_tree::ptree::path_type("SearchItem.Backward/value", '/'), bBackwards);
135360
 
135360
-    TiledWindow& rWindow = lcl_getTiledWindow(pButton);
135360
     LOKDocView* pLOKDocView = LOK_DOC_VIEW(rWindow.m_pDocView);
135360
     GdkRectangle aArea;
135360
     getVisibleAreaTwips(rWindow.m_pDocView, &aArea);
135360
@@ -285,7 +288,8 @@ static void signalSearchPrev(GtkWidget* pButton, gpointer /*pItem*/)
135360
 /// Handles the key-press-event of the search entry widget.
135360
 static gboolean signalFindbar(GtkWidget* pWidget, GdkEventKey* pEvent, gpointer /*pData*/)
135360
 {
135360
-    gtk_label_set_text(GTK_LABEL(pFindbarLabel), "");
135360
+    TiledWindow& rWindow = lcl_getTiledWindow(pWidget);
135360
+    gtk_label_set_text(GTK_LABEL(rWindow.m_pFindbarLabel), "");
135360
     switch(pEvent->keyval)
135360
     {
135360
         case GDK_KEY_Return:
135360
@@ -297,7 +301,7 @@ static gboolean signalFindbar(GtkWidget* pWidget, GdkEventKey* pEvent, gpointer
135360
         case GDK_KEY_Escape:
135360
         {
135360
             // Hide the findbar.
135360
-            gtk_widget_hide(pFindbar);
135360
+            gtk_widget_hide(rWindow.m_pFindbar);
135360
             return TRUE;
135360
         }
135360
     }
135360
@@ -350,9 +354,10 @@ static void loadChanged(LOKDocView* /*pLOKDocView*/, gdouble fValue, gpointer pD
135360
 }
135360
 
135360
 /// LOKDocView found no search matches -> set the search label accordingly.
135360
-static void signalSearch(LOKDocView* /*pLOKDocView*/, char* /*pPayload*/, gpointer /*pData*/)
135360
+static void signalSearch(LOKDocView* pLOKDocView, char* /*pPayload*/, gpointer /*pData*/)
135360
 {
135360
-    gtk_label_set_text(GTK_LABEL(pFindbarLabel), "Search key not found");
135360
+    TiledWindow& rWindow = lcl_getTiledWindow(GTK_WIDGET(pLOKDocView));
135360
+    gtk_label_set_text(GTK_LABEL(rWindow.m_pFindbarLabel), "Search key not found");
135360
 }
135360
 
135360
 
135360
@@ -666,36 +671,36 @@ int main( int argc, char* argv[] )
135360
     gtk_box_pack_start( GTK_BOX(aWindow.m_pVBox), pToolbar, FALSE, FALSE, 0 ); // Adds to top.
135360
 
135360
     // Findbar
135360
-    pFindbar = gtk_toolbar_new();
135360
-    gtk_toolbar_set_style(GTK_TOOLBAR(pFindbar), GTK_TOOLBAR_ICONS);
135360
+    aWindow.m_pFindbar = gtk_toolbar_new();
135360
+    gtk_toolbar_set_style(GTK_TOOLBAR(aWindow.m_pFindbar), GTK_TOOLBAR_ICONS);
135360
 
135360
     GtkToolItem* pFindbarClose = gtk_tool_button_new( NULL, NULL);
135360
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarClose), "window-close-symbolic");
135360
-    gtk_toolbar_insert(GTK_TOOLBAR(pFindbar), pFindbarClose, -1);
135360
+    gtk_toolbar_insert(GTK_TOOLBAR(aWindow.m_pFindbar), pFindbarClose, -1);
135360
     g_signal_connect(G_OBJECT(pFindbarClose), "clicked", G_CALLBACK(toggleFindbar), NULL);
135360
 
135360
     GtkToolItem* pEntryContainer = gtk_tool_item_new();
135360
-    pFindbarEntry = gtk_entry_new();
135360
-    gtk_container_add(GTK_CONTAINER(pEntryContainer), pFindbarEntry);
135360
-    g_signal_connect(pFindbarEntry, "key-press-event", G_CALLBACK(signalFindbar), 0);
135360
-    gtk_toolbar_insert(GTK_TOOLBAR(pFindbar), pEntryContainer, -1);
135360
+    aWindow.m_pFindbarEntry = gtk_entry_new();
135360
+    gtk_container_add(GTK_CONTAINER(pEntryContainer), aWindow.m_pFindbarEntry);
135360
+    g_signal_connect(aWindow.m_pFindbarEntry, "key-press-event", G_CALLBACK(signalFindbar), 0);
135360
+    gtk_toolbar_insert(GTK_TOOLBAR(aWindow.m_pFindbar), pEntryContainer, -1);
135360
 
135360
     GtkToolItem* pFindbarNext = gtk_tool_button_new( NULL, NULL);
135360
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarNext), "go-down-symbolic");
135360
-    gtk_toolbar_insert(GTK_TOOLBAR(pFindbar), pFindbarNext, -1);
135360
+    gtk_toolbar_insert(GTK_TOOLBAR(aWindow.m_pFindbar), pFindbarNext, -1);
135360
     g_signal_connect(G_OBJECT(pFindbarNext), "clicked", G_CALLBACK(signalSearchNext), NULL);
135360
 
135360
     GtkToolItem* pFindbarPrev = gtk_tool_button_new( NULL, NULL);
135360
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarPrev), "go-up-symbolic");
135360
-    gtk_toolbar_insert(GTK_TOOLBAR(pFindbar), pFindbarPrev, -1);
135360
+    gtk_toolbar_insert(GTK_TOOLBAR(aWindow.m_pFindbar), pFindbarPrev, -1);
135360
     g_signal_connect(G_OBJECT(pFindbarPrev), "clicked", G_CALLBACK(signalSearchPrev), NULL);
135360
 
135360
     GtkToolItem* pFindbarLabelContainer = gtk_tool_item_new();
135360
-    pFindbarLabel = gtk_label_new("");
135360
-    gtk_container_add(GTK_CONTAINER(pFindbarLabelContainer), pFindbarLabel);
135360
-    gtk_toolbar_insert(GTK_TOOLBAR(pFindbar), pFindbarLabelContainer, -1);
135360
+    aWindow.m_pFindbarLabel = gtk_label_new("");
135360
+    gtk_container_add(GTK_CONTAINER(pFindbarLabelContainer), aWindow.m_pFindbarLabel);
135360
+    gtk_toolbar_insert(GTK_TOOLBAR(aWindow.m_pFindbar), pFindbarLabelContainer, -1);
135360
 
135360
-    gtk_box_pack_end(GTK_BOX(aWindow.m_pVBox), pFindbar, FALSE, FALSE, 0);
135360
+    gtk_box_pack_end(GTK_BOX(aWindow.m_pVBox), aWindow.m_pFindbar, FALSE, FALSE, 0);
135360
 
135360
     // Docview
135360
     GtkWidget* pDocView = lok_doc_view_new (argv[1], NULL, NULL);
135360
@@ -733,7 +738,7 @@ int main( int argc, char* argv[] )
135360
 
135360
     gtk_widget_show_all( pWindow );
135360
     // Hide the findbar by default.
135360
-    gtk_widget_hide(pFindbar);
135360
+    gtk_widget_hide(aWindow.m_pFindbar);
135360
 
135360
     g_aWindows[pWindow] = aWindow;
135360
 
135360
-- 
135360
2.12.0
135360