Attachment #8173 for issue #17668

View | Details | Raw Unified | Return to issue 17668
Collapse All | Expand All

Lines 62-68 Link Here

(-)unx/source/app/i18n_xkb.cxx (-1 / +1 lines)
62		62
63	#include <stdio.h>	63	#include <stdio.h>
64		64
65	#if defined(LINUX) \|\| defined(FREEBSD) // should really check for xfree86 or for X11R6.1 and higher	65	#if defined(LINUX) \|\| defined(FREEBSD) \|\| defined(MACOSX) // should really check for xfree86 or for X11R6.1 and higher
66	#define __XKeyboardExtension__ 1	66	#define __XKeyboardExtension__ 1
67	#else	67	#else
68	#define __XKeyboardExtension__ 0	68	#define __XKeyboardExtension__ 0




		{
			XkbDescPtr pXkbDesc = NULL;
			// try X keyboard extension
		#ifdef MACOSX
			// FIXME
			// XDarwin doesn't yet have very good support for the Xkeyboard extension.
			// When we call XkbGetKeyboard(), the XServer throws a message up in the
			// console about xkbcomp and files for geometry include.  The side effect of
			// this is _very_ noticable lag when drawing menus.  The file menu, for example,
			// takes about 1s to come down on my G4/450 DP and you can see it draw.  Therefore
			// we are disabling it for the moment until better XDarwin support exists.
			if ( 0 )
		#else
			if( pXkbDesc = XkbGetKeyboard( GetDisplay(), XkbAllComponentsMask, XkbUseCoreKbd ) )
		#endif
			{
                const char* pAtom = NULL;
                if( pXkbDesc->names->groups[0] )





#include <X11/Xatom.h>
#ifndef SOLARIS
#if defined(X86) || defined(MACOSX)
extern "C" {
#include <X11/extensions/Xinerama.h>
}

            sscanf( pProperties, "%li", &nProperties_ );
        else
        {
#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined IRIX || defined MACOSX
            nProperties_ |= PROPERTY_FEATURE_Maximize;
#endif
            // Server Bugs & Properties

#ifdef ARM32 // ??? Server! nicht Client ???
                nProperties_ &= ~PROPERTY_SUPPORT_XSetClipMask;
#endif
#if defined LINUX || defined FREEBSD || defined MACOSX
				// otherwm and olwm are a kind of default, which are not detected
				// carefully. if we are running linux (i.e. not netbsd) on an xfree 
				// display, fvwm is most probable the wm to choose, confusing with mwm


void SalDisplay::InitXinerama()
{
#if defined( SOLARIS )
    // do this load on call for benefit of Solaris < 8
    rtl::OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libXext.so" ) );
    rtl::OUString aSymb1( RTL_CONSTASCII_USTRINGPARAM( "XineramaGetState" ) );

    }
    osl_unloadModule( hModule );
#else
#if defined( X86 ) || defined( MACOSX )
    if( XineramaIsActive( pDisp_ ) )
    {
        int nFramebuffers = 1;

Lines 306-311 Link Here

(-)util/makefile.mk (+4 lines)
306	.ENDIF # "$(OS)"=="SOLARIS"	306	.ENDIF # "$(OS)"=="SOLARIS"
307	.ENDIF # "$(GUIBASE)"=="unx"	307	.ENDIF # "$(GUIBASE)"=="unx"
308		308
		309	.IF "$(OS)"=="MACOSX"
		310	SHL1STDLIBS += -lXinerama
		311	.ENDIF
		312
309	.IF "$(OS)"=="LINUX" \|\| "$(OS)"=="SOLARIS" \|\| "$(OS)"=="FREEBSD"	313	.IF "$(OS)"=="LINUX" \|\| "$(OS)"=="SOLARIS" \|\| "$(OS)"=="FREEBSD"
310	SHL1STDLIBS += -laudio	314	SHL1STDLIBS += -laudio
311	.IF "$(OS)"=="SOLARIS"	315	.IF "$(OS)"=="SOLARIS"

Return to issue 17668

Lines 608-614 Link Here

(-)unx/source/app/keysymnames.cxx (+11 lines)
608	{	608	{
609	XkbDescPtr pXkbDesc = NULL;	609	XkbDescPtr pXkbDesc = NULL;
610	// try X keyboard extension	610	// try X keyboard extension
		611	#ifdef MACOSX
		612	// FIXME
		613	// XDarwin doesn't yet have very good support for the Xkeyboard extension.
		614	// When we call XkbGetKeyboard(), the XServer throws a message up in the
		615	// console about xkbcomp and files for geometry include. The side effect of
		616	// this is _very_ noticable lag when drawing menus. The file menu, for example,
		617	// takes about 1s to come down on my G4/450 DP and you can see it draw. Therefore
		618	// we are disabling it for the moment until better XDarwin support exists.
		619	if ( 0 )
		620	#else
611	if( pXkbDesc = XkbGetKeyboard( GetDisplay(), XkbAllComponentsMask, XkbUseCoreKbd ) )	621	if( pXkbDesc = XkbGetKeyboard( GetDisplay(), XkbAllComponentsMask, XkbUseCoreKbd ) )
		622	#endif
612	{	623	{
613	const char* pAtom = NULL;	624	const char* pAtom = NULL;
614	if( pXkbDesc->names->groups[0] )	625	if( pXkbDesc->names->groups[0] )

Lines 232-238 Link Here

(-)unx/source/app/saldisp.cxx (-5 / +5 lines)
232		232
233	#include <X11/Xatom.h>	233	#include <X11/Xatom.h>
234	#ifndef SOLARIS	234	#ifndef SOLARIS
235	#ifdef X86	235	#if defined(X86) \|\| defined(MACOSX)
236	extern "C" {	236	extern "C" {
237	#include <X11/extensions/Xinerama.h>	237	#include <X11/extensions/Xinerama.h>
238	}	238	}
Lines 1190-1196 Link Here
1190	sscanf( pProperties, "%li", &nProperties_ );	1190	sscanf( pProperties, "%li", &nProperties_ );
1191	else	1191	else
1192	{	1192	{
1193	#if defined DBG_UTIL \|\| defined SUN \|\| defined LINUX \|\| defined FREEBSD \|\| defined IRIX	1193	#if defined DBG_UTIL \|\| defined SUN \|\| defined LINUX \|\| defined FREEBSD \|\| defined IRIX \|\| defined MACOSX
1194	nProperties_ \|= PROPERTY_FEATURE_Maximize;	1194	nProperties_ \|= PROPERTY_FEATURE_Maximize;
1195	#endif	1195	#endif
1196	// Server Bugs & Properties	1196	// Server Bugs & Properties
Lines 1219-1225 Link Here
1219	#ifdef ARM32 // ??? Server! nicht Client ???	1219	#ifdef ARM32 // ??? Server! nicht Client ???
1220	nProperties_ &= ~PROPERTY_SUPPORT_XSetClipMask;	1220	nProperties_ &= ~PROPERTY_SUPPORT_XSetClipMask;
1221	#endif	1221	#endif
1222	#if defined LINUX \|\| defined FREEBSD	1222	#if defined LINUX \|\| defined FREEBSD \|\| defined MACOSX
1223	// otherwm and olwm are a kind of default, which are not detected	1223	// otherwm and olwm are a kind of default, which are not detected
1224	// carefully. if we are running linux (i.e. not netbsd) on an xfree	1224	// carefully. if we are running linux (i.e. not netbsd) on an xfree
1225	// display, fvwm is most probable the wm to choose, confusing with mwm	1225	// display, fvwm is most probable the wm to choose, confusing with mwm
Lines 3033-3039 Link Here
3033		3033
3034	void SalDisplay::InitXinerama()	3034	void SalDisplay::InitXinerama()
3035	{	3035	{
3036	#ifdef SOLARIS	3036	#if defined( SOLARIS )
3037	// do this load on call for benefit of Solaris < 8	3037	// do this load on call for benefit of Solaris < 8
3038	rtl::OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libXext.so" ) );	3038	rtl::OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libXext.so" ) );
3039	rtl::OUString aSymb1( RTL_CONSTASCII_USTRINGPARAM( "XineramaGetState" ) );	3039	rtl::OUString aSymb1( RTL_CONSTASCII_USTRINGPARAM( "XineramaGetState" ) );
Lines 3071-3077 Link Here
3071	}	3071	}
3072	osl_unloadModule( hModule );	3072	osl_unloadModule( hModule );
3073	#else	3073	#else
3074	#ifdef X86	3074	#if defined( X86 ) \|\| defined( MACOSX )
3075	if( XineramaIsActive( pDisp_ ) )	3075	if( XineramaIsActive( pDisp_ ) )
3076	{	3076	{
3077	int nFramebuffers = 1;	3077	int nFramebuffers = 1;