ooo-build r13756 - in trunk: . patches/dev300
- From: thorstenb svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13756 - in trunk: . patches/dev300
- Date: Tue, 2 Sep 2008 09:52:29 +0000 (UTC)
Author: thorstenb
Date: Tue Sep 2 09:52:29 2008
New Revision: 13756
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13756&view=rev
Log:
* patches/dev300/apply:
* patches/dev300/gnome-fpicker-transient-win.diff:
* patches/dev300/gnome-fpicker-main-thread.diff: took two useful
fixes from Caolan (upstream 3.1 line), that avoid extra tab in the
task bar for gnome fpicker, and fixes a 100% cpu usage while
fpicker is open.
Added:
trunk/patches/dev300/gnome-fpicker-main-thread.diff
trunk/patches/dev300/gnome-fpicker-transient-win.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Tue Sep 2 09:52:29 2008
@@ -2597,3 +2597,5 @@
[ Fixes ]
sw-filter-import-TOX.diff ,n#40425, Amelia Wang
+gnome-fpicker-transient-win.diff, i#92878, cmc
+gnome-fpicker-main-thread.diff, i#93366, cmc
Added: trunk/patches/dev300/gnome-fpicker-main-thread.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/gnome-fpicker-main-thread.diff Tue Sep 2 09:52:29 2008
@@ -0,0 +1,152 @@
+--- sfx2/source/dialog/filedlghelper.cxx 4 Jun 2008 09:53:08 -0000 1.144
++++ sfx2/source/dialog/filedlghelper.cxx 2 Sep 2008 08:24:03 -0000
+@@ -1325,8 +1325,10 @@
+
+ sal_Int16 nRet = ExecutableDialogResults::CANCEL;
+
+-#if !(defined(MACOSX) && defined(QUARTZ))
+ //On MacOSX the native file picker has to run in the primordial thread because of drawing issues
++//On Linux the native gtk file picker, when backed by gnome-vfs2, needs to be run in the same
++//primordial thread as the ucb gnome-vfs2 provider was initialized in.
++#ifdef WNT
+ if ( mbSystemPicker )
+ {
+ PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg );
+diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2008-09-02 09:16:04.000000000 +0100
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2008-09-02 09:20:51.000000000 +0100
+@@ -999,13 +999,13 @@
+ uno::Reference< awt::XExtendedToolkit > xToolkit(
+ m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
+
+- RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
+- uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
++ RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
++ uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
+ while( GTK_RESPONSE_NO == btn )
+ {
+ btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save.
+
+- gint nStatus = pRunInMain->runandwaitforresult();
++ gint nStatus = pRunDialog->run();
+ switch( nStatus )
+ {
+ case GTK_RESPONSE_ACCEPT:
+@@ -1032,9 +1032,9 @@
+ OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
+ RTL_TEXTENCODING_UTF8 ).getStr() );
+
+- RunDialog* pAnotherRunInMain = new RunDialog(dlg, xToolkit);
+- uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherRunInMain);
+- btn = pAnotherRunInMain->runandwaitforresult();
++ RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit);
++ uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog);
++ btn = pAnotherDialog->run();
+
+ gtk_widget_destroy( dlg );
+ }
+diff -ru fpicker.orig/source/unx/gnome/SalGtkFolderPicker.cxx fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 2008-09-02 09:16:04.000000000 +0100
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 2008-09-02 09:20:53.000000000 +0100
+@@ -176,9 +176,9 @@
+ uno::Reference< awt::XExtendedToolkit > xToolkit(
+ m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
+
+- RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
+- uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
+- gint nStatus = pRunInMain->runandwaitforresult();
++ RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
++ uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
++ gint nStatus = pRunDialog->run();
+ switch( nStatus )
+ {
+ case GTK_RESPONSE_ACCEPT:
+diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx
+--- fpicker/source/unx/gnome/SalGtkPicker.cxx 2008-09-02 09:16:04.000000000 +0100
++++ fpicker/source/unx/gnome/SalGtkPicker.cxx 2008-09-02 09:20:22.000000000 +0100
+@@ -124,7 +124,7 @@
+
+ RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) :
+ cppu::WeakComponentImplHelper1< awt::XTopWindowListener >( maLock ),
+- mbFinished(false), mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
++ mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
+ {
+ awt::SystemDependentXWindow aWindowHandle;
+
+@@ -178,39 +178,20 @@
+ gtk_widget_hide( mpDialog );
+ }
+
+-void RunDialog::run()
++gint RunDialog::run()
+ {
+ if (mxToolkit.is())
+ mxToolkit->addTopWindowListener(this);
+
+- mnStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) );
++ gint nStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) );
+
+ if (mxToolkit.is())
+ mxToolkit->removeTopWindowListener(this);
+
+-
+- if (mnStatus != 1) //PLAY
++ if (nStatus != 1) //PLAY
+ gtk_widget_hide( mpDialog );
+
+- maLock.acquire();
+- mbFinished = true;
+- maLock.release();
+-
+- Application::EndYield();
+-}
+-
+-gint RunDialog::runandwaitforresult()
+-{
+- g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)rundialog, this, NULL);
+- while (1)
+- {
+- maLock.acquire();
+- if (mbFinished)
+- break;
+- maLock.release();
+- Application::Yield();
+- }
+- return mnStatus;
++ return nStatus;
+ }
+
+ SalGtkPicker::~SalGtkPicker()
+diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.hxx fpicker/source/unx/gnome/SalGtkPicker.hxx
+--- fpicker/source/unx/gnome/SalGtkPicker.hxx 2008-09-02 09:16:04.000000000 +0100
++++ fpicker/source/unx/gnome/SalGtkPicker.hxx 2008-09-02 09:16:49.000000000 +0100
+@@ -74,8 +74,7 @@
+ static rtl::OString unicodetouri(const rtl::OUString &rURL);
+ };
+
+-//Run the Gtk Dialog in the "Main Thread" for us to avoid threading conflict and
+-//report back to this thread. Watch for any "new windows" created while we're
++//Run the Gtk Dialog. Watch for any "new windows" created while we're
+ //executing and consider that a CANCEL event to avoid e.g. "file cannot be opened"
+ //modal dialogs and this one getting locked if some other API call causes this
+ //to happen while we're opened waiting for user input, e.g.
+@@ -84,9 +83,7 @@
+ public cppu::WeakComponentImplHelper1< ::com::sun::star::awt::XTopWindowListener >
+ {
+ private:
+- bool mbFinished;
+ osl::Mutex maLock;
+- gint mnStatus;
+ GtkWidget *mpDialog;
+ GdkWindow *mpCreatedParent;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit> mxToolkit;
+@@ -111,8 +108,7 @@
+ throw (::com::sun::star::uno::RuntimeException) {}
+ public:
+ RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit);
+- gint runandwaitforresult();
+- void run();
++ gint run();
+ void cancel();
+ ~RunDialog();
+ };
Added: trunk/patches/dev300/gnome-fpicker-transient-win.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/gnome-fpicker-transient-win.diff Tue Sep 2 09:52:29 2008
@@ -0,0 +1,240 @@
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 11 Apr 2008 09:28:01 -0000 1.28
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 18 Aug 2008 15:07:41 -0000 1.28.42.1
+@@ -995,13 +995,17 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
+ G_CALLBACK( selection_changed_cb ), ( gpointer )this );
+
+ int btn = GTK_RESPONSE_NO;
+-
++
++ uno::Reference< awt::XExtendedToolkit > xToolkit(
++ m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
++
++ RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
++ uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
+ while( GTK_RESPONSE_NO == btn )
+ {
+ btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save.
+
+- RunDialog aRunInMain(m_pDialog);
+- gint nStatus = aRunInMain.runandwaitforresult();
++ gint nStatus = pRunInMain->runandwaitforresult();
+ switch( nStatus )
+ {
+ case GTK_RESPONSE_ACCEPT:
+@@ -1028,8 +1032,9 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
+ OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
+ RTL_TEXTENCODING_UTF8 ).getStr() );
+
+- RunDialog aAnotherRunInMain(dlg);
+- btn = aAnotherRunInMain.runandwaitforresult();
++ RunDialog* pAnotherRunInMain = new RunDialog(dlg, xToolkit);
++ uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherRunInMain);
++ btn = pAnotherRunInMain->runandwaitforresult();
+
+ gtk_widget_destroy( dlg );
+ }
+--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 11 Apr 2008 09:28:32 -0000 1.11
++++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 18 Aug 2008 15:07:41 -0000 1.11.42.1
+@@ -173,8 +173,12 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::e
+
+ sal_Int16 retVal = 0;
+
+- RunDialog aRunInMain(m_pDialog);
+- gint nStatus = aRunInMain.runandwaitforresult();
++ uno::Reference< awt::XExtendedToolkit > xToolkit(
++ m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
++
++ RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
++ uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
++ gint nStatus = pRunInMain->runandwaitforresult();
+ switch( nStatus )
+ {
+ case GTK_RESPONSE_ACCEPT:
+--- fpicker/source/unx/gnome/SalGtkPicker.cxx 14 May 2008 09:41:16 -0000 1.17
++++ fpicker/source/unx/gnome/SalGtkPicker.cxx 18 Aug 2008 15:07:41 -0000 1.17.32.1
+@@ -37,16 +37,19 @@
+ #include <com/sun/star/lang/DisposedException.hpp>
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
++#include <com/sun/star/lang/SystemDependent.hpp>
++#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
++#include <com/sun/star/awt/SystemDependentXWindow.hpp>
++#include <com/sun/star/beans/NamedValue.hpp>
+ #include <comphelper/processfactory.hxx>
+ #include <cppuhelper/interfacecontainer.h>
++#include <rtl/process.h>
+ #include <osl/diagnose.h>
+ #include <com/sun/star/uno/Any.hxx>
+ #include <FPServiceInfo.hxx>
+ #include <vos/mutex.hxx>
+ #include <vcl/svapp.hxx>
+-#ifndef _SALGTKPICKER_HXX_
+ #include "SalGtkPicker.hxx"
+-#endif
+ #include <tools/urlobj.hxx>
+ #include <stdio.h>
+
+@@ -107,11 +110,87 @@ gboolean rundialog(RunDialog *pDialog)
+ return false;
+ }
+
++gboolean canceldialog(RunDialog *pDialog)
++{
++ pDialog->cancel();
++ return false;
++}
++
++extern "C"
++{
++ struct Display;
++ extern GdkDisplay* gdk_x11_lookup_xdisplay (void*xdisplay);
++}
++
++RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) :
++ cppu::WeakComponentImplHelper1< awt::XTopWindowListener >( maLock ),
++ mbFinished(false), mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
++{
++ awt::SystemDependentXWindow aWindowHandle;
++
++ if (mxToolkit.is())
++ {
++ uno::Reference< awt::XTopWindow > xWindow(mxToolkit->getActiveTopWindow());
++ if (xWindow.is())
++ {
++ uno::Reference< awt::XSystemDependentWindowPeer > xSystemDepParent(xWindow, uno::UNO_QUERY);
++ if (xSystemDepParent.is())
++ {
++
++ sal_Int8 processID[16];
++
++ rtl_getGlobalProcessId( (sal_uInt8*)processID );
++ uno::Sequence<sal_Int8> processIdSeq(processID, 16);
++ uno::Any anyHandle = xSystemDepParent->getWindowHandle(processIdSeq, SystemDependent::SYSTEM_XWINDOW);
++
++ anyHandle >>= aWindowHandle;
++ }
++ }
++ }
++
++ GdkDisplay *pDisplay = aWindowHandle.DisplayPointer ? gdk_x11_lookup_xdisplay((void*)aWindowHandle.DisplayPointer) : NULL;
++ GdkWindow* pParent = pDisplay ? gdk_window_lookup_for_display(pDisplay, aWindowHandle.WindowHandle) : NULL;
++ if (!pParent && pDisplay)
++ pParent = mpCreatedParent = gdk_window_foreign_new_for_display( pDisplay, aWindowHandle.WindowHandle);
++ if (pParent)
++ {
++ gtk_widget_realize(mpDialog);
++ gdk_window_set_transient_for(mpDialog->window, pParent);
++ }
++}
++
++
++RunDialog::~RunDialog()
++{
++ if (mpCreatedParent)
++ gdk_window_destroy (mpCreatedParent);
++}
++
++void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject& )
++ throw (::com::sun::star::uno::RuntimeException)
++{
++ g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)canceldialog, this, NULL);
++}
++
++void RunDialog::cancel()
++{
++ gtk_dialog_response( GTK_DIALOG( mpDialog ), GTK_RESPONSE_CANCEL );
++ gtk_widget_hide( mpDialog );
++}
++
+ void RunDialog::run()
+ {
+- mnStatus = gtk_dialog_run( GTK_DIALOG( m_pDialog ) );
++ if (mxToolkit.is())
++ mxToolkit->addTopWindowListener(this);
++
++ mnStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) );
++
++ if (mxToolkit.is())
++ mxToolkit->removeTopWindowListener(this);
++
++
+ if (mnStatus != 1) //PLAY
+- gtk_widget_hide( m_pDialog );
++ gtk_widget_hide( mpDialog );
+
+ maLock.acquire();
+ mbFinished = true;
+--- fpicker/source/unx/gnome/SalGtkPicker.hxx 11 Apr 2008 09:29:19 -0000 1.10
++++ fpicker/source/unx/gnome/SalGtkPicker.hxx 18 Aug 2008 15:07:41 -0000 1.10.42.1
+@@ -36,15 +36,16 @@
+ //_____________________________________________________________________________
+
+ #include <osl/mutex.hxx>
++#include <cppuhelper/compbase1.hxx>
+ #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
+ #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+-
+-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
+ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
+-#endif
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/util/XCancellable.hpp>
+
++#include <com/sun/star/awt/XTopWindowListener.hpp>
++#include <com/sun/star/awt/XExtendedToolkit.hpp>
++
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+
+@@ -73,17 +74,47 @@ class SalGtkPicker
+ static rtl::OString unicodetouri(const rtl::OUString &rURL);
+ };
+
+-class RunDialog
++//Run the Gtk Dialog in the "Main Thread" for us to avoid threading conflict and
++//report back to this thread. Watch for any "new windows" created while we're
++//executing and consider that a CANCEL event to avoid e.g. "file cannot be opened"
++//modal dialogs and this one getting locked if some other API call causes this
++//to happen while we're opened waiting for user input, e.g.
++//https://bugzilla.redhat.com/show_bug.cgi?id=441108
++class RunDialog :
++ public cppu::WeakComponentImplHelper1< ::com::sun::star::awt::XTopWindowListener >
+ {
+ private:
+ bool mbFinished;
+ osl::Mutex maLock;
+ gint mnStatus;
+- GtkWidget *m_pDialog;
++ GtkWidget *mpDialog;
++ GdkWindow *mpCreatedParent;
++ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit> mxToolkit;
+ public:
+- void run();
+- RunDialog(GtkWidget *pDialog) : mbFinished(false), m_pDialog(pDialog) { }
++
++ // XTopWindowListener
++ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& )
++ throw(::com::sun::star::uno::RuntimeException) {}
++ virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e )
++ throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& )
++ throw (::com::sun::star::uno::RuntimeException) {}
++ virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& )
++ throw (::com::sun::star::uno::RuntimeException) {}
++ virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& )
++ throw (::com::sun::star::uno::RuntimeException) {}
++ virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& )
++ throw (::com::sun::star::uno::RuntimeException) {}
++ virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& )
++ throw (::com::sun::star::uno::RuntimeException) {}
++ virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& )
++ throw (::com::sun::star::uno::RuntimeException) {}
++public:
++ RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit);
+ gint runandwaitforresult();
++ void run();
++ void cancel();
++ ~RunDialog();
+ };
+
+ #endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
