rpms/openoffice.org/F-11 workspace.vcl101.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue Apr 21 20:10:31 UTC 2009
- Previous message: rpms/python-hash_ring/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/openoffice.org/devel openoffice.org.spec, 1.1889, 1.1890 workspace.vcl101.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15396/F-11
Modified Files:
workspace.vcl101.patch
Removed Files:
openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
Log Message:
merge patch into accepted upstream workspace
workspace.vcl101.patch:
Index: workspace.vcl101.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.vcl101.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl101.patch 20 Apr 2009 21:38:11 -0000 1.1
+++ workspace.vcl101.patch 21 Apr 2009 20:10:00 -0000 1.2
@@ -36,3 +36,86 @@
}
nMaxRequestSize_ = XExtendedMaxRequestSize( pDisp_ ) * 4;
+diff -ru vcl/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
+--- openoffice.org.orig/vcl/unx/gtk/app/gtkdata.cxx 2009-04-18 14:24:28.000000000 +0100
++++ openoffice.org/vcl/unx/gtk/app/gtkdata.cxx 2009-04-18 15:37:36.000000000 +0100
+@@ -126,8 +126,14 @@
+ pDisp->screenSizeChanged( pScreen );
+ }
+
++void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
++{
++ GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
++ pDisp->monitorsChanged( pScreen );
+ }
+
++}
++
+ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
+ GdkEvent*,
+ gpointer data )
+@@ -192,6 +198,8 @@
+ {
+ rSD.m_aSize = Size( gdk_screen_get_width( pScreen ),
+ gdk_screen_get_height( pScreen ) );
++ if( ! m_aFrames.empty() )
++ m_aFrames.front()->CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
+ }
+ }
+ else
+@@ -201,6 +209,33 @@
+ }
+ }
+
++void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen )
++{
++ if( pScreen )
++ {
++ int nScreen = gdk_screen_get_number( pScreen );
++ if( nScreen == m_nDefaultScreen ) //To-Do, make m_aXineramaScreens a per-screen thing ?
++ {
++ gint nMonitors = gdk_screen_get_n_monitors(pScreen);
++ m_aXineramaScreens = std::vector<Rectangle>();
++ for (gint i = 0; i < nMonitors; ++i)
++ {
++ GdkRectangle dest;
++ gdk_screen_get_monitor_geometry(pScreen, i, &dest);
++ m_aXineramaScreens.push_back( Rectangle( Point(dest.x,
++ dest.y ), Size( dest.width, dest.height ) ) );
++ }
++ m_bXinerama = m_aXineramaScreens.size() > 1;
++ if( ! m_aFrames.empty() )
++ m_aFrames.front()->CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
++ }
++ else
++ {
++ DBG_ERROR( "monitors for non-default screen changed, extend-me" );
++ }
++ }
++}
++
+ void GtkSalDisplay::initScreen( int nScreen ) const
+ {
+ if( nScreen < 0 || nScreen >= static_cast<int>(m_aScreens.size()) )
+@@ -626,7 +661,10 @@
+ {
+ GdkScreen *pScreen = gdk_display_get_screen( pGdkDisp, n );
+ if( pScreen )
++ {
+ g_signal_connect( G_OBJECT(pScreen), "size-changed", G_CALLBACK(signalScreenSizeChanged), m_pGtkSalDisplay );
++ g_signal_connect( G_OBJECT(pScreen), "monitors-changed", G_CALLBACK(signalMonitorsChanged), m_pGtkSalDisplay );
++ }
+ }
+ }
+
+diff -ru vcl/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx
+--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkdata.hxx 2009-04-18 14:24:28.000000000 +0100
++++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkdata.hxx 2009-04-18 14:32:42.000000000 +0100
+@@ -85,6 +85,7 @@
+ void startupNotificationCompleted() { m_bStartupCompleted = true; }
+
+ void screenSizeChanged( GdkScreen* );
++ void monitorsChanged( GdkScreen* );
+ };
+
+
--- openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch DELETED ---
- Previous message: rpms/python-hash_ring/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/openoffice.org/devel openoffice.org.spec, 1.1889, 1.1890 workspace.vcl101.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list