ooo-build r13231 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Jul 15 16:46:10 2008
New Revision: 13231
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13231&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/vcl-linking-randr.diff: corrected issue id,
	stripped part of the patch that landed upstream.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/vcl-linking-randr.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 15 16:46:10 2008
@@ -2484,7 +2484,7 @@
 vcl-linking-randr-m21.diff, i#89718, n#398244, thorsten
 
 [ Fixes >= dev300-m22 < beb300-m0 ]
-vcl-linking-randr.diff, i#89718, n#398244, thorsten
+vcl-linking-randr.diff, i#90809, n#398244, thorsten
 
 [ Fixes ]
 vcl-png-import-fix.diff, n#397128, i#90913, thorsten

Modified: trunk/patches/dev300/vcl-linking-randr.diff
==============================================================================
--- trunk/patches/dev300/vcl-linking-randr.diff	(original)
+++ trunk/patches/dev300/vcl-linking-randr.diff	Tue Jul 15 16:46:10 2008
@@ -98,263 +98,3 @@
  ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
  ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
  ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );
---- ./vcl/unx/source/app/makefile.mk.randr~	2008-05-14 11:51:43.000000000 +0200
-+++ ./vcl/unx/source/app/makefile.mk	2008-07-07 23:01:37.988847544 +0200
-@@ -79,8 +79,11 @@ EXCEPTIONSFILES=\
- 
- 
- .IF "$(ENABLE_RANDR)" != ""
--.IF "$(OS)" != "SOLARIS"
- CDEFS+=-DUSE_RANDR
-+.IF "$(XRANDR_DLOPEN)" == "FALSE"
-+CDEFS+=$(XRANDR_CFLAGS)
-+.ELSE
-+CDEFS+=-DXRANDR_DLOPEN
- .ENDIF
- .ENDIF
- 
---- ./vcl/unx/source/app/randrwrapper.cxx.randr~	2008-06-25 16:36:16.000000000 +0200
-+++ ./vcl/unx/source/app/randrwrapper.cxx	2008-07-07 23:04:15.639870370 +0200
-@@ -40,6 +40,9 @@
- 
- namespace
- {
-+
-+# ifdef XRANDR_DLOPEN
-+
- class RandRWrapper
- {
-     oslModule m_pRandRLib;
-@@ -54,6 +57,7 @@ class RandRWrapper
-     XRRScreenSize*(*m_pXRRSizes)(Display*,int,int*);
-     XRRScreenSize*(*m_pXRRConfigSizes)(XRRScreenConfiguration*,int*);
-     SizeID(*m_pXRRConfigCurrentConfiguration)(XRRScreenConfiguration*,Rotation*);
-+    int(*m_pXRRRootToScreen)(Display*, XLIB_Window);
-     
-     bool m_bValid;
-     
-@@ -106,8 +110,11 @@ public:
-     {
-         return m_bValid ? m_pXRRConfigCurrentConfiguration( i_pConfig, o_pRot ) : 0;
-     }
-+    int XRRRootToScreen( Display *dpy, XLIB_Window root )
-+    {
-+        return m_bValid ? m_pXRRRootToScreen( dpy, root ) : -1;
-+    }
- };
--}
- 
- void RandRWrapper::initFromModule()
- {
-@@ -120,6 +127,7 @@ void RandRWrapper::initFromModule()
-     m_pXRRSizes = (XRRScreenSize*(*)(Display*,int,int*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRSizes" );
-     m_pXRRConfigSizes = (XRRScreenSize*(*)(XRRScreenConfiguration*,int*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRConfigSizes" );
-     m_pXRRConfigCurrentConfiguration = (SizeID(*)(XRRScreenConfiguration*,Rotation*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRConfigCurrentConfiguration" );
-+    m_pXRRRootToScreen = (int(*)(Display*,XLIB_Window))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRRootToScreen" );
-     
-     m_bValid = m_pXRRQueryExtension             &&
-                m_pXRRQueryVersion               &&
-@@ -129,7 +137,8 @@ void RandRWrapper::initFromModule()
-                m_pXRRUpdateConfiguration        &&
-                m_pXRRSizes                      &&
-                m_pXRRConfigSizes                &&
--               m_pXRRConfigCurrentConfiguration
-+               m_pXRRConfigCurrentConfiguration &&
-+               m_pXRRRootToScreen
-                ;
- }
- 
-@@ -144,6 +153,7 @@ RandRWrapper::RandRWrapper( Display* pDi
-         m_pXRRSizes( NULL ),
-         m_pXRRConfigSizes( NULL ),
-         m_pXRRConfigCurrentConfiguration( NULL ),
-+        m_pXRRRootToScreen( NULL ),
-         m_bValid( false )
- {
-     // first try in process space (e.g. gtk links that ?)
-@@ -183,8 +193,93 @@ void RandRWrapper::releaseWrapper()
-     pWrapper = NULL;
- }
- 
--#endif
-+# else
-+
-+class RandRWrapper
-+{
-+    bool m_bValid;
-+    
-+    RandRWrapper(Display*);
-+public:
-+    static RandRWrapper& get(Display*);
-+    static void releaseWrapper();
-+    
-+    Bool XRRQueryExtension(Display* i_pDisp, int* o_event_base, int* o_error_base )
-+    {
-+        Bool bRet = False;
-+        if( m_bValid )
-+            bRet = ::XRRQueryExtension( i_pDisp, o_event_base, o_error_base );
-+        return bRet;
-+    }
-+    Status XRRQueryVersion( Display* i_pDisp, int* o_major, int* o_minor )
-+    {
-+        return m_bValid ? ::XRRQueryVersion( i_pDisp, o_major, o_minor ) : 0;
-+    }
-+    XRRScreenConfiguration* XRRGetScreenInfo( Display* i_pDisp, Drawable i_aDrawable )
-+    {
-+        return m_bValid ? ::XRRGetScreenInfo( i_pDisp, i_aDrawable ) : NULL;
-+    }
-+    void XRRFreeScreenConfigInfo( XRRScreenConfiguration* i_pConfig )
-+    {
-+        if( m_bValid )
-+            ::XRRFreeScreenConfigInfo( i_pConfig );
-+    }
-+    void XRRSelectInput( Display* i_pDisp, XLIB_Window i_window, int i_nMask )
-+    {
-+        if( m_bValid )
-+            ::XRRSelectInput( i_pDisp, i_window, i_nMask );
-+    }
-+    int XRRUpdateConfiguration( XEvent* i_pEvent )
-+    {
-+        return m_bValid ? ::XRRUpdateConfiguration( i_pEvent ) : 0;
-+    }
-+    XRRScreenSize* XRRSizes( Display* i_pDisp, int i_screen, int* o_nscreens )
-+    {
-+        return m_bValid ? ::XRRSizes( i_pDisp, i_screen, o_nscreens ) : NULL;
-+    }
-+    XRRScreenSize* XRRConfigSizes( XRRScreenConfiguration* i_pConfig, int* o_nSizes )
-+    {
-+        return m_bValid ? ::XRRConfigSizes( i_pConfig, o_nSizes ) : NULL;
-+    }
-+    SizeID XRRConfigCurrentConfiguration( XRRScreenConfiguration* i_pConfig, Rotation* o_pRot )
-+    {
-+        return m_bValid ? ::XRRConfigCurrentConfiguration( i_pConfig, o_pRot ) : 0;
-+    }
-+    int XRRRootToScreen( Display *dpy, XLIB_Window root )
-+    {
-+        return m_bValid ? ::XRRRootToScreen( dpy, root ) : -1;
-+    }
-+};
- 
-+RandRWrapper::RandRWrapper( Display* pDisplay ) :
-+    m_bValid( true )
-+{
-+    int nEventBase = 0, nErrorBase = 0;
-+    if( !XRRQueryExtension( pDisplay, &nEventBase, &nErrorBase ) )
-+        m_bValid = false;
-+}
-+
-+static RandRWrapper* pWrapper = NULL;
-+
-+RandRWrapper& RandRWrapper::get( Display* i_pDisplay )
-+{
-+    if( ! pWrapper )
-+        pWrapper = new RandRWrapper( i_pDisplay );
-+    return *pWrapper;
-+}
-+
-+void RandRWrapper::releaseWrapper()
-+{
-+    delete pWrapper;
-+    pWrapper = NULL;
-+}
-+
-+ #endif
-+
-+} // namespace
-+
-+#endif
-+ 
- #include "saldisp.hxx"
- 
- void SalDisplay::InitRandR( XLIB_Window aRoot ) const
-@@ -202,6 +297,9 @@ void SalDisplay::DeInitRandR()
-     #ifdef USE_RANDR
-     if( m_bUseRandRWrapper )
-         RandRWrapper::releaseWrapper();
-+#if OSL_DEBUG_LEVEL > 1
-+    fprintf( stderr, "SalDisplay::DeInitRandR()\n" );
-+#endif
-     #endif
- }
- 
-@@ -209,7 +307,8 @@ int SalDisplay::processRandREvent( XEven
- {
-     int nRet = 0;
-     #ifdef USE_RANDR
--    if( m_bUseRandRWrapper && pWrapper )
-+    XConfigureEvent* pCnfEvent=(XConfigureEvent*)pEvent;
-+    if( m_bUseRandRWrapper && pWrapper && pWrapper->XRRRootToScreen(GetDisplay(),pCnfEvent->window) != -1 )
-     {
-         nRet = pWrapper->XRRUpdateConfiguration( pEvent );
-         if( nRet == 1 && pEvent->type != ConfigureNotify) // this should then be a XRRScreenChangeNotifyEvent
---- ./vcl/unx/source/app/saldisp.cxx.randr~	2008-07-07 22:59:22.882845455 +0200
-+++ ./vcl/unx/source/app/saldisp.cxx	2008-07-07 23:01:37.993846574 +0200
-@@ -557,6 +557,9 @@ SalDisplay::~SalDisplay( )
- #endif
-         pDisp_ = NULL;
-     }
-+    // don't do this in doDestruct since RandR extension adds hooks into Display
-+    // that is XCloseDisplay still needs the RandR library if it was used
-+    DeInitRandR();
- }
- 
- void SalDisplay::doDestruct()
-@@ -683,9 +686,6 @@ SalX11Display::~SalX11Display()
- 		XCloseDisplay( pDisp_ );
- 		pDisp_ = NULL;
- 	}
--    // don't do this in doDestruct since RandR extension adds hooks into Display
--    // that is XCloseDisplay still needs the RandR library if it was used
--    DeInitRandR();
- }
- 
- void SalDisplay::initScreen( int nScreen ) const
---- ./vcl/util/makefile.mk.randr~	2008-07-07 22:59:22.893845666 +0200
-+++ ./vcl/util/makefile.mk	2008-07-07 23:01:37.995846339 +0200
-@@ -301,12 +301,18 @@ SHL2STDLIBS+=`pkg-config --libs xrender`
- 
- .IF "$(GUIBASE)"=="unx"
- 
--SHL2STDLIBS += -lXext -lXtst -lSM -lICE -lX11
-+SHL2STDLIBS += -lXext -lXtst -lSM -lICE -lX11 
- .IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
- # needed by salprnpsp.cxx
- SHL2STDLIBS+= -ldl
- .ENDIF
- 
-+.IF "$(ENABLE_RANDR)" != ""
-+.IF "$(XRANDR_DLOPEN)" == "FALSE"
-+SHL2STDLIBS+= $(XRANDR_LIBS)
-+.ENDIF
-+.ENDIF
-+
- .ENDIF          # "$(GUIBASE)"=="unx"
- 
- # gtk plugin
-@@ -351,6 +357,12 @@ SHL4STDLIBS+=\
-             $(VOSLIB)           \
-             $(SALLIB)
- 
-+.IF "$(ENABLE_RANDR)" != ""
-+.IF "$(XRANDR_DLOPEN)" == "FALSE"
-+SHL4STDLIBS+= $(XRANDR_LIBS)
-+.ENDIF
-+.ENDIF
-+
- .ENDIF # "$(ENABLE_GTK)" != ""
- 
- # KDE plugin
-@@ -373,6 +385,13 @@ SHL5STDLIBS+=\
-         $(TOOLSLIB)     \
-         $(VOSLIB)       \
-         $(SALLIB)
-+
-+.IF "$(ENABLE_RANDR)" != ""
-+.IF "$(XRANDR_DLOPEN)" == "FALSE"
-+SHL5STDLIBS+= $(XRANDR_LIBS)
-+.ENDIF
-+.ENDIF
-+
- .ENDIF # "$(ENABLE_KDE)" != ""
- 
- .ENDIF # UNX