From 6b4ba5f50c8670b2216e72c229d20580257948b1 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Oct 2008 08:57:52 +0000 Subject: CWS-TOOLING: integrate CWS fpicker8 --- fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 17 +++-- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 10 ++- fpicker/source/unx/gnome/SalGtkPicker.cxx | 89 +++++++++++++++++++++++-- fpicker/source/unx/gnome/SalGtkPicker.hxx | 47 ++++++++++--- 4 files changed, 141 insertions(+), 22 deletions(-) diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx index 3e30abca57..38c3bdddad 100644 --- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SalGtkFilePicker.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.42.1 $ * * This file is part of OpenOffice.org. * @@ -995,13 +995,17 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) 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::execute() throw( uno::RuntimeException ) 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 ); } diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx index 0ace894a26..0abce004f6 100644 --- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SalGtkFolderPicker.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.42.1 $ * * This file is part of OpenOffice.org. * @@ -173,8 +173,12 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException ) 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: diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx index 8387c0fcf1..3e5a437d95 100644 --- a/fpicker/source/unx/gnome/SalGtkPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SalGtkPicker.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.32.1 $ * * This file is part of OpenOffice.org. * @@ -37,16 +37,19 @@ #include #include #include +#include +#include +#include +#include #include #include +#include #include #include #include #include #include -#ifndef _SALGTKPICKER_HXX_ #include "SalGtkPicker.hxx" -#endif #include #include @@ -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 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; diff --git a/fpicker/source/unx/gnome/SalGtkPicker.hxx b/fpicker/source/unx/gnome/SalGtkPicker.hxx index 773eb409f3..8b74fc65bc 100644 --- a/fpicker/source/unx/gnome/SalGtkPicker.hxx +++ b/fpicker/source/unx/gnome/SalGtkPicker.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SalGtkPicker.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.42.1 $ * * This file is part of OpenOffice.org. * @@ -36,15 +36,16 @@ //_____________________________________________________________________________ #include +#include #include #include - -#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_ #include -#endif #include #include +#include +#include + #include #include @@ -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 -- cgit v1.2.3