This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 484eac2b6d Replace nodrop -> notallow to unify cursor themes (#452)
484eac2b6d is described below
commit 484eac2b6dac9dbfaf9b9acec7b16bc664b5c216
Author: Matthias Seidel <[email protected]>
AuthorDate: Tue Dec 23 22:51:48 2025 +0100
Replace nodrop -> notallow to unify cursor themes (#452)
* Replace nodrop -> notallow to unify cursor themes
X11 cursors are the only that use "nodrop" instead of "notallow" cursor.
* Additional files
* Get rid of duplicated cursors
(cherry picked from commit 2fb96a1731e4dafc29c7e676cb968cf2a7ec09e7)
---
main/vcl/inc/unx/x11_cursors/nodrop_curs.h | 60 -------
main/vcl/inc/unx/x11_cursors/nodrop_mask.h | 60 -------
main/vcl/inc/unx/x11_cursors/notallow_curs.h | 59 +++++++
main/vcl/inc/unx/x11_cursors/notallow_mask.h | 59 +++++++
main/vcl/inc/unx/x11_cursors/salcursors.h | 6 +-
main/vcl/unx/generic/app/saldisp.cxx | 194 ++++++++++----------
main/vcl/unx/generic/dtrans/X11_selection.cxx | 18 +-
main/vcl/unx/generic/dtrans/copydata_curs.h | 38 ----
main/vcl/unx/generic/dtrans/copydata_mask.h | 38 ----
main/vcl/unx/generic/dtrans/linkdata_curs.h | 38 ----
main/vcl/unx/generic/dtrans/linkdata_mask.h | 38 ----
main/vcl/unx/generic/dtrans/movedata_curs.h | 38 ----
main/vcl/unx/generic/dtrans/movedata_mask.h | 38 ----
main/vcl/unx/generic/dtrans/nodrop_curs.h | 38 ----
main/vcl/unx/generic/dtrans/nodrop_mask.h | 38 ----
main/vcl/unx/gtk/app/gtkdata.cxx | 244 +++++++++++++-------------
16 files changed, 348 insertions(+), 656 deletions(-)
diff --git a/main/vcl/inc/unx/x11_cursors/nodrop_curs.h
b/main/vcl/inc/unx/x11_cursors/nodrop_curs.h
deleted file mode 100644
index 4b06de2de2..0000000000
--- a/main/vcl/inc/unx/x11_cursors/nodrop_curs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define nodrop_curs_width 32
-#define nodrop_curs_height 32
-#define nodrop_curs_x_hot 9
-#define nodrop_curs_y_hot 9
-
-static const unsigned char nodrop_curs_bits[] = {
- 0x00,0x00,0x00,0x00,
- 0xc0,0x0f,0x00,0x00,
- 0xf0,0x3f,0x00,0x00,
- 0xf8,0x7f,0x00,0x00,
- 0x7c,0xf8,0x00,0x00,
- 0x1c,0xfc,0x00,0x00,
- 0x1e,0xfe,0x01,0x00,
- 0x0e,0xdf,0x01,0x00,
- 0x8e,0xcf,0x01,0x00,
- 0xce,0xc7,0x01,0x00,
- 0xee,0xc3,0x01,0x00,
- 0xfe,0xe1,0x01,0x00,
- 0xfc,0xe0,0x00,0x00,
- 0x7c,0xf8,0x00,0x00,
- 0xf8,0x7f,0x00,0x00,
- 0xf0,0x3f,0x00,0x00,
- 0xc0,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00};
diff --git a/main/vcl/inc/unx/x11_cursors/nodrop_mask.h
b/main/vcl/inc/unx/x11_cursors/nodrop_mask.h
deleted file mode 100644
index a63408059b..0000000000
--- a/main/vcl/inc/unx/x11_cursors/nodrop_mask.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define nodrop_mask_width 32
-#define nodrop_mask_height 32
-#define nodrop_mask_x_hot 9
-#define nodrop_mask_y_hot 9
-
-static const unsigned char nodrop_mask_bits[] = {
- 0xc0,0x0f,0x00,0x00,
- 0xf0,0x3f,0x00,0x00,
- 0xf8,0x7f,0x00,0x00,
- 0xfc,0xff,0x00,0x00,
- 0xfe,0xff,0x01,0x00,
- 0x7e,0xfe,0x01,0x00,
- 0x3f,0xff,0x03,0x00,
- 0x9f,0xff,0x03,0x00,
- 0xdf,0xff,0x03,0x00,
- 0xff,0xef,0x03,0x00,
- 0xff,0xe7,0x03,0x00,
- 0xff,0xf3,0x03,0x00,
- 0xfe,0xf9,0x01,0x00,
- 0xfe,0xff,0x01,0x00,
- 0xfc,0xff,0x00,0x00,
- 0xf8,0x7f,0x00,0x00,
- 0xf0,0x3f,0x00,0x00,
- 0xc0,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00};
diff --git a/main/vcl/inc/unx/x11_cursors/notallow_curs.h
b/main/vcl/inc/unx/x11_cursors/notallow_curs.h
new file mode 100644
index 0000000000..b2965f94b7
--- /dev/null
+++ b/main/vcl/inc/unx/x11_cursors/notallow_curs.h
@@ -0,0 +1,59 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#define notallow_curs_width 32
+#define notallow_curs_height 32
+#define notallow_curs_x_hot 15
+#define notallow_curs_y_hot 15
+
+static const unsigned char notallow_curs_bits[] = {
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x07, 0x00,
+ 0x00, 0xf8, 0x1f, 0x00,
+ 0x00, 0x3c, 0x3c, 0x00,
+ 0x00, 0x0e, 0x70, 0x00,
+ 0x00, 0x1f, 0xe0, 0x00,
+ 0x00, 0x3b, 0xc0, 0x00,
+ 0x80, 0x73, 0xc0, 0x01,
+ 0x80, 0xe1, 0x80, 0x01,
+ 0x80, 0xc1, 0x81, 0x01,
+ 0x80, 0x81, 0x83, 0x01,
+ 0x80, 0x01, 0x87, 0x01,
+ 0x80, 0x03, 0xce, 0x01,
+ 0x00, 0x03, 0xdc, 0x00,
+ 0x00, 0x07, 0xf8, 0x00,
+ 0x00, 0x0e, 0x70, 0x00,
+ 0x00, 0x3c, 0x38, 0x00,
+ 0x00, 0xf8, 0x1f, 0x00,
+ 0x00, 0xe0, 0x07, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00 };
diff --git a/main/vcl/inc/unx/x11_cursors/notallow_mask.h
b/main/vcl/inc/unx/x11_cursors/notallow_mask.h
new file mode 100644
index 0000000000..ec458549ed
--- /dev/null
+++ b/main/vcl/inc/unx/x11_cursors/notallow_mask.h
@@ -0,0 +1,59 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#define notallow_mask_width 32
+#define notallow_mask_height 32
+#define notallow_mask_x_hot 15
+#define notallow_mask_y_hot 15
+
+static unsigned char notallow_mask_bits[] = {
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x07, 0x00,
+ 0x00, 0xf8, 0x1f, 0x00,
+ 0x00, 0xfc, 0x3f, 0x00,
+ 0x00, 0xfe, 0x7f, 0x00,
+ 0x00, 0x3f, 0xfc, 0x00,
+ 0x80, 0x3f, 0xf0, 0x01,
+ 0x80, 0x7f, 0xe0, 0x01,
+ 0xc0, 0xff, 0xe0, 0x03,
+ 0xc0, 0xf3, 0xc1, 0x03,
+ 0xc0, 0xe3, 0xc3, 0x03,
+ 0xc0, 0xc3, 0xc7, 0x03,
+ 0xc0, 0x83, 0xcf, 0x03,
+ 0xc0, 0x07, 0xff, 0x03,
+ 0x80, 0x07, 0xfe, 0x01,
+ 0x80, 0x0f, 0xfc, 0x01,
+ 0x00, 0x3f, 0xf8, 0x00,
+ 0x00, 0xfe, 0x7f, 0x00,
+ 0x00, 0xfc, 0x3f, 0x00,
+ 0x00, 0xf8, 0x1f, 0x00,
+ 0x00, 0xe0, 0x07, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00 };
diff --git a/main/vcl/inc/unx/x11_cursors/salcursors.h
b/main/vcl/inc/unx/x11_cursors/salcursors.h
index ba103f795a..be7a446033 100644
--- a/main/vcl/inc/unx/x11_cursors/salcursors.h
+++ b/main/vcl/inc/unx/x11_cursors/salcursors.h
@@ -19,10 +19,8 @@
*
*************************************************************/
-
-
-#include "unx/x11_cursors/nodrop_curs.h"
-#include "unx/x11_cursors/nodrop_mask.h"
+#include "unx/x11_cursors/notallow_curs.h"
+#include "unx/x11_cursors/notallow_mask.h"
#include "unx/x11_cursors/magnify_curs.h"
#include "unx/x11_cursors/magnify_mask.h"
#include "unx/x11_cursors/rotate_curs.h"
diff --git a/main/vcl/unx/generic/app/saldisp.cxx
b/main/vcl/unx/generic/app/saldisp.cxx
index 05140a4461..df928646bc 100644
--- a/main/vcl/unx/generic/app/saldisp.cxx
+++ b/main/vcl/unx/generic/app/saldisp.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -115,12 +113,12 @@ using namespace vcl_sal;
// -=-= static variables -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
static const char* const VisualClassName[] = {
- "StaticGray",
- "GrayScale",
- "StaticColor",
- "PseudoColor",
- "TrueColor",
- "DirectColor"
+ "StaticGray",
+ "GrayScale",
+ "StaticColor",
+ "PseudoColor",
+ "TrueColor",
+ "DirectColor"
};
static const char* const EventNames[] =
@@ -186,13 +184,13 @@ inline int ColorDiff( SalColor c1, int r, int g, int b )
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
static int sal_Shift( Pixel nMask )
{
- int i = 24;
- if( nMask < 0x00010000 ) { nMask <<= 16; i -= 16; }
- if( nMask < 0x01000000 ) { nMask <<= 8; i -= 8; }
- if( nMask < 0x10000000 ) { nMask <<= 4; i -= 4; }
- if( nMask < 0x40000000 ) { nMask <<= 2; i -= 2; }
- if( nMask < 0x80000000 ) { nMask <<= 1; i -= 1; }
- return i;
+ int i = 24;
+ if( nMask < 0x00010000 ) { nMask <<= 16; i -= 16; }
+ if( nMask < 0x01000000 ) { nMask <<= 8; i -= 8; }
+ if( nMask < 0x10000000 ) { nMask <<= 4; i -= 4; }
+ if( nMask < 0x40000000 ) { nMask <<= 2; i -= 2; }
+ if( nMask < 0x80000000 ) { nMask <<= 1; i -= 1; }
+ return i;
}
static int sal_significantBits( Pixel nMask )
@@ -268,13 +266,13 @@ sal_EqualHosts( const OUString& Host1, const OUString&
Host2)
else
pHostAddr2 = osl_resolveHostname( Host2.pData );
- if( pHostAddr1 && pHostAddr2 )
- bEqualAddress = osl_isEqualSocketAddr( pHostAddr1, pHostAddr2 ) ?
sal_True : sal_False;
+ if( pHostAddr1 && pHostAddr2 )
+ bEqualAddress = osl_isEqualSocketAddr( pHostAddr1, pHostAddr2 )
? sal_True : sal_False;
- if( pHostAddr1 )
- osl_destroySocketAddr( pHostAddr1 );
- if( pHostAddr2 )
- osl_destroySocketAddr( pHostAddr2 );
+ if( pHostAddr1 )
+ osl_destroySocketAddr( pHostAddr1 );
+ if( pHostAddr2 )
+ osl_destroySocketAddr( pHostAddr2 );
return bEqualAddress;
}
@@ -317,13 +315,13 @@ sal_IsLocalDisplay( Display *pDisplay )
if( pPtr != NULL )
{
const OUString& rLocalHostname(
GetX11SalData()->GetLocalHostName() );
- if( rLocalHostname.getLength() )
- {
+ if( rLocalHostname.getLength() )
+ {
*pPtr = '\0';
OUString aDisplayHostname( pDisplayHost, strlen(
pDisplayHost ), osl_getThreadTextEncoding() );
bEqual = sal_EqualHosts( rLocalHostname,
aDisplayHostname );
bEqual = bEqual && sal_IsDisplayNumber( pPtr + 1 );
- }
+ }
}
free( pDisplayHost );
@@ -373,7 +371,7 @@ sal_GetServerVendor( Display *p_display )
// handle regular server vendors
char *p_name = ServerVendor( p_display );
- vendor_t *p_vendor;
+ vendor_t *p_vendor;
for (p_vendor = const_cast<vendor_t*>(p_vendorlist); p_vendor->e_vendor
!= vendor_none; p_vendor++)
{
if ( strncmp (p_name, p_vendor->p_name, p_vendor->n_len) == 0 )
@@ -386,18 +384,18 @@ sal_GetServerVendor( Display *p_display )
static sal_Bool sal_IsTrustedSolaris (Display *p_display)
{
- int n_numextensions = 0;
- char **p_extensions = XListExtensions (p_display, &n_numextensions);
- sal_Bool b_is = sal_False;
+ int n_numextensions = 0;
+ char **p_extensions = XListExtensions (p_display,
&n_numextensions);
+ sal_Bool b_is = sal_False;
- if (p_extensions != NULL)
- {
- for (int i = 0; !b_is && i < n_numextensions; i++)
- b_is = (strcmp (p_extensions[i], "SUN_TSOL") == 0);
- XFreeExtensionList (p_extensions);
- }
+ if (p_extensions != NULL)
+ {
+ for (int i = 0; !b_is && i < n_numextensions; i++)
+ b_is = (strcmp (p_extensions[i], "SUN_TSOL") == 0);
+ XFreeExtensionList (p_extensions);
+ }
- return b_is;
+ return b_is;
}
// -=-= SalDisplay -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -412,11 +410,11 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
if( pVID )
sscanf( pVID, "%li", &nVID );
- if( nVID && sal_GetVisualInfo( pDisplay, nVID, rVI ) )
- return rVI.visualid == nDefVID;
+ if( nVID && sal_GetVisualInfo( pDisplay, nVID, rVI ) )
+ return rVI.visualid == nDefVID;
XVisualInfo aVI;
- aVI.screen = nScreen;
+ aVI.screen = nScreen;
// get all visuals
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
@@ -498,23 +496,23 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
SalDisplay::SalDisplay( Display *display ) :
- mpInputMethod( NULL ),
+ mpInputMethod( NULL ),
pDisp_( display ),
- m_pWMAdaptor( NULL ),
- m_pDtIntegrator( NULL ),
- m_bUseRandRWrapper( true ),
- m_nLastUserEventTime( CurrentTime )
+ m_pWMAdaptor( NULL ),
+ m_pDtIntegrator( NULL ),
+ m_bUseRandRWrapper( true ),
+ m_nLastUserEventTime( CurrentTime )
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "SalDisplay::SalDisplay()\n" );
+ fprintf( stderr, "SalDisplay::SalDisplay()\n" );
#endif
- X11SalData *pSalData = GetX11SalData();
+ X11SalData *pSalData = GetX11SalData();
- DBG_ASSERT( ! pSalData->GetDisplay(), "Second SalDisplay created !!!\n" );
- pSalData->SetSalDisplay( this );
+ DBG_ASSERT( ! pSalData->GetDisplay(), "Second SalDisplay created !!!\n"
);
+ pSalData->SetSalDisplay( this );
pXLib_ = pSalData->GetLib();
- m_nDefaultScreen = DefaultScreen( pDisp_ );
+ m_nDefaultScreen = DefaultScreen( pDisp_ );
}
@@ -522,40 +520,40 @@ SalDisplay::SalDisplay( Display *display ) :
SalDisplay::~SalDisplay( )
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "SalDisplay::~SalDisplay()\n" );
+ fprintf( stderr, "SalDisplay::~SalDisplay()\n" );
#endif
- if( pDisp_ )
- {
- doDestruct();
+ if( pDisp_ )
+ {
+ doDestruct();
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "display %p closed\n", pDisp_ );
+ fprintf( stderr, "display %p closed\n", pDisp_ );
#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();
+ 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()
{
- X11SalData *pSalData = GetX11SalData();
+ X11SalData *pSalData = GetX11SalData();
- delete m_pWMAdaptor;
- m_pWMAdaptor = NULL;
- delete m_pDtIntegrator;
- m_pDtIntegrator = NULL;
+ delete m_pWMAdaptor;
+ m_pWMAdaptor = NULL;
+ delete m_pDtIntegrator;
+ m_pDtIntegrator = NULL;
X11SalBitmap::ImplDestroyCache();
- X11SalGraphics::releaseGlyphPeer();
+ X11SalGraphics::releaseGlyphPeer();
- if( IsDisplay() )
- {
+ if( IsDisplay() )
+ {
delete mpInputMethod, mpInputMethod =
(SalI18N_InputMethod*)ILLEGAL_POINTER;
delete mpKbdExtension, mpKbdExtension =
(SalI18N_KeyboardExtension*)ILLEGAL_POINTER;
- // do not call anything that could implicitly call back into
- // this object after this point
- osl_destroyMutex( hEventGuard_ );
+ // do not call anything that could implicitly call back into
+ // this object after this point
+ osl_destroyMutex( hEventGuard_ );
for( unsigned int i = 0; i < m_aScreens.size(); i++ )
{
@@ -640,7 +638,7 @@ fd
SalX11Display::SalX11Display( Display *display )
: SalDisplay( display )
{
- Init();
+ Init();
pXLib_->Insert( ConnectionNumber( pDisp_ ),
this,
@@ -652,7 +650,7 @@ SalX11Display::SalX11Display( Display *display )
SalX11Display::~SalX11Display()
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "SalX11Display::~SalX11Display()\n" );
+ fprintf( stderr, "SalX11Display::~SalX11Display()\n" );
#endif
if( pDisp_ )
{
@@ -929,7 +927,7 @@ void SalDisplay::Init()
// nicht alle! (bekannt: nur Sparc II CG3, CG6?)
nProperties_ &= ~PROPERTY_SUPPORT_XSetClipMask;
- // trusted solaris doesn't allow to change properties on the
+ // trusted Solaris doesn't allow to change properties on the
// wm decoration window
if (sal_IsTrustedSolaris (pDisp_))
nProperties_ |= PROPERTY_FEATURE_TrustedSolaris;
@@ -1005,13 +1003,13 @@ void SalDisplay::Init()
}
}
- InitXinerama();
+ InitXinerama();
- // initialize system settings update
- m_pDtIntegrator = DtIntegrator::CreateDtIntegrator();
+ // initialize system settings update
+ m_pDtIntegrator = DtIntegrator::CreateDtIntegrator();
#ifdef DBG_UTIL
- PrintInfo();
+ PrintInfo();
#endif
}
@@ -1019,7 +1017,7 @@ void SalDisplay::Init()
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
void SalDisplay::Beep() const
{
- XBell( pDisp_, 0 );
+ XBell( pDisp_, 0 );
}
// Keyboard
@@ -1069,7 +1067,7 @@ void SalDisplay::ModifierMapping()
nShiftKeySym_ = sal_XModifier2Keysym( pDisp_, pXModMap, ShiftMapIndex );
nCtrlKeySym_ = sal_XModifier2Keysym( pDisp_, pXModMap, ControlMapIndex
);
nMod1KeySym_ = sal_XModifier2Keysym( pDisp_, pXModMap, Mod1MapIndex );
- // Auf Sun-Servern und SCO-Severn beruecksichtigt XLookupString
+ // Auf Sun-Servern und SCO-Severn berücksichtigt XLookupString
// nicht den NumLock Modifier.
if( (GetServerVendor() == vendor_sun)
|| (GetServerVendor() == vendor_sco) )
@@ -1088,33 +1086,33 @@ void SalDisplay::ModifierMapping()
}
}
- XFreeModifiermap( pXModMap );
+ XFreeModifiermap( pXModMap );
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
XubString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
{
- String aStrMap;
+ String aStrMap;
if( nKeyCode & KEY_MOD1 )
- aStrMap += GetKeyNameFromKeySym( nCtrlKeySym_ );
+ aStrMap += GetKeyNameFromKeySym( nCtrlKeySym_ );
- if( nKeyCode & KEY_MOD2 )
- {
- if( aStrMap.Len() )
- aStrMap += '+';
- aStrMap += GetKeyNameFromKeySym( nMod1KeySym_ );
- }
+ if( nKeyCode & KEY_MOD2 )
+ {
+ if( aStrMap.Len() )
+ aStrMap += '+';
+ aStrMap += GetKeyNameFromKeySym( nMod1KeySym_ );
+ }
- if( nKeyCode & KEY_SHIFT )
- {
- if( aStrMap.Len() )
- aStrMap += '+';
- aStrMap += GetKeyNameFromKeySym( nShiftKeySym_ );
- }
- nKeyCode &= 0x0FFF;
+ if( nKeyCode & KEY_SHIFT )
+ {
+ if( aStrMap.Len() )
+ aStrMap += '+';
+ aStrMap += GetKeyNameFromKeySym( nShiftKeySym_ );
+ }
+ nKeyCode &= 0x0FFF;
- KeySym nKeySym = 0;
+ KeySym nKeySym = 0;
if( KEY_0 <= nKeyCode && nKeyCode <= KEY_9 )
nKeySym = XK_0 + (nKeyCode - KEY_0);
@@ -1903,7 +1901,7 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
MAKE_CURSOR( copyfiles_ );
break;
case POINTER_NOTALLOWED:
- MAKE_CURSOR( nodrop_ );
+ MAKE_CURSOR( notallow_ );
break;
case POINTER_ROTATE:
MAKE_CURSOR( rotate_ );
@@ -3420,7 +3418,7 @@ Pixel SalColormap::GetPixel( SalColor nSalColor ) const
((SalColormap*)this)->GetLookupTable();
}
- // Colormatching ueber Palette
+ // Colormatching über Palette
sal_uInt16 r = SALCOLOR_RED ( nSalColor );
sal_uInt16 g = SALCOLOR_GREEN( nSalColor );
sal_uInt16 b = SALCOLOR_BLUE ( nSalColor );
@@ -3428,3 +3426,5 @@ Pixel SalColormap::GetPixel( SalColor nSalColor ) const
+ (((g+8)/17) << 4)
+ ((b+8)/17) ];
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/unx/generic/dtrans/X11_selection.cxx
b/main/vcl/unx/generic/dtrans/X11_selection.cxx
index 0d32c9865b..dfacd56984 100644
--- a/main/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/main/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -51,14 +51,14 @@
#include "vcl/svapp.hxx"
// pointer bitmaps
-#include <copydata_curs.h>
-#include <copydata_mask.h>
-#include <movedata_curs.h>
-#include <movedata_mask.h>
-#include <linkdata_curs.h>
-#include <linkdata_mask.h>
-#include <nodrop_curs.h>
-#include <nodrop_mask.h>
+#include <unx/x11_cursors/copydata_curs.h>
+#include <unx/x11_cursors/copydata_mask.h>
+#include <unx/x11_cursors/movedata_curs.h>
+#include <unx/x11_cursors/movedata_mask.h>
+#include <unx/x11_cursors/linkdata_curs.h>
+#include <unx/x11_cursors/linkdata_mask.h>
+#include <unx/x11_cursors/notallow_curs.h>
+#include <unx/x11_cursors/notallow_mask.h>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
@@ -436,7 +436,7 @@ void SelectionManager::initialize( const Sequence< Any >&
arguments ) throw (::c
m_aMoveCursor = createCursorFromXPM( movedata_);
m_aCopyCursor = createCursorFromXPM( copydata_);
m_aLinkCursor = createCursorFromXPM( linkdata_);
- m_aNoneCursor = createCursorFromXPM( nodrop_);
+ m_aNoneCursor = createCursorFromXPM( notallow_);
// just interested in
SelectionClear/Notify/Request and PropertyChange
XSelectInput( m_pDisplay, m_aWindow,
PropertyChangeMask );
diff --git a/main/vcl/unx/generic/dtrans/copydata_curs.h
b/main/vcl/unx/generic/dtrans/copydata_curs.h
deleted file mode 100644
index d34fe17146..0000000000
--- a/main/vcl/unx/generic/dtrans/copydata_curs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define copydata_curs_width 32
-#define copydata_curs_height 32
-#define copydata_curs_x_hot 1
-#define copydata_curs_y_hot 1
-static const unsigned char copydata_curs_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
- 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
- 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
- 0xfe, 0x03, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00,
- 0x66, 0x00, 0x00, 0x00, 0xc2, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
- 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x10, 0x53, 0x00, 0x00,
- 0x28, 0xa3, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
- 0x10, 0xf0, 0x1f, 0x00, 0x08, 0xf0, 0x1f, 0x00, 0x10, 0xf0, 0x1e, 0x00,
- 0xa8, 0xf2, 0x1e, 0x00, 0x50, 0x35, 0x18, 0x00, 0x00, 0xf0, 0x1e, 0x00,
- 0x00, 0xf0, 0x1e, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/generic/dtrans/copydata_mask.h
b/main/vcl/unx/generic/dtrans/copydata_mask.h
deleted file mode 100644
index ba16f0a9e0..0000000000
--- a/main/vcl/unx/generic/dtrans/copydata_mask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define copydata_mask_width 32
-#define copydata_mask_height 32
-#define copydata_mask_x_hot 1
-#define copydata_mask_y_hot 1
-static const unsigned char copydata_mask_bits[] = {
- 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
- 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
- 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
- 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
- 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00,
- 0xe0, 0x03, 0x00, 0x00, 0xf8, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00,
- 0xfc, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00, 0x3c, 0xf8, 0x3f, 0x00,
- 0x3c, 0xf8, 0x3f, 0x00, 0x3c, 0xf8, 0x3f, 0x00, 0xfc, 0xff, 0x3f, 0x00,
- 0xfc, 0xff, 0x3f, 0x00, 0xfc, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0x3f, 0x00,
- 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00,
- 0x00, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/generic/dtrans/linkdata_curs.h
b/main/vcl/unx/generic/dtrans/linkdata_curs.h
deleted file mode 100644
index d13fddbcc7..0000000000
--- a/main/vcl/unx/generic/dtrans/linkdata_curs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define linkdata_curs_width 32
-#define linkdata_curs_height 32
-#define linkdata_curs_x_hot 1
-#define linkdata_curs_y_hot 1
-static const unsigned char linkdata_curs_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
- 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
- 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
- 0xfe, 0x03, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00,
- 0x66, 0x00, 0x00, 0x00, 0xc2, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
- 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x10, 0x53, 0x00, 0x00,
- 0x28, 0xa3, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
- 0x10, 0xf0, 0x1f, 0x00, 0x08, 0x70, 0x18, 0x00, 0x10, 0xf0, 0x18, 0x00,
- 0xa8, 0x72, 0x18, 0x00, 0x50, 0x35, 0x1a, 0x00, 0x00, 0x30, 0x1f, 0x00,
- 0x00, 0xb0, 0x1f, 0x00, 0x00, 0x70, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/generic/dtrans/linkdata_mask.h
b/main/vcl/unx/generic/dtrans/linkdata_mask.h
deleted file mode 100644
index 50ac3c6303..0000000000
--- a/main/vcl/unx/generic/dtrans/linkdata_mask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define linkdata_mask_width 32
-#define linkdata_mask_height 32
-#define linkdata_mask_x_hot 1
-#define linkdata_mask_y_hot 1
-static const unsigned char linkdata_mask_bits[] = {
- 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
- 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
- 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
- 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
- 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00,
- 0xe0, 0x03, 0x00, 0x00, 0xf8, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00,
- 0xfc, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00, 0x3c, 0xf8, 0x3f, 0x00,
- 0x3c, 0xf8, 0x3f, 0x00, 0x3c, 0xf8, 0x3f, 0x00, 0xfc, 0xff, 0x3f, 0x00,
- 0xfc, 0xff, 0x3f, 0x00, 0xfc, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0x3f, 0x00,
- 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00,
- 0x00, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/generic/dtrans/movedata_curs.h
b/main/vcl/unx/generic/dtrans/movedata_curs.h
deleted file mode 100644
index a24055e81b..0000000000
--- a/main/vcl/unx/generic/dtrans/movedata_curs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define movedata_curs_width 32
-#define movedata_curs_height 32
-#define movedata_curs_x_hot 1
-#define movedata_curs_y_hot 1
-static const unsigned char movedata_curs_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
- 0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
- 0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
- 0xfe, 0x03, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00,
- 0x66, 0x00, 0x00, 0x00, 0xc2, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
- 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x10, 0x53, 0x00, 0x00,
- 0x28, 0xa3, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00,
- 0x10, 0x40, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00,
- 0xa8, 0xaa, 0x00, 0x00, 0x50, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/generic/dtrans/movedata_mask.h
b/main/vcl/unx/generic/dtrans/movedata_mask.h
deleted file mode 100644
index 90eca799c4..0000000000
--- a/main/vcl/unx/generic/dtrans/movedata_mask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define movedata_mask_width 32
-#define movedata_mask_height 32
-#define movedata_mask_x_hot 1
-#define movedata_mask_y_hot 1
-static const unsigned char movedata_mask_bits[] = {
- 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
- 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
- 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
- 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
- 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00,
- 0xe0, 0x03, 0x00, 0x00, 0xf8, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00,
- 0xfc, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00, 0x3c, 0xe0, 0x01, 0x00,
- 0x3c, 0xe0, 0x01, 0x00, 0x3c, 0xe0, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00,
- 0xfc, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00, 0xf8, 0xff, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/generic/dtrans/nodrop_curs.h
b/main/vcl/unx/generic/dtrans/nodrop_curs.h
deleted file mode 100644
index 608caefff8..0000000000
--- a/main/vcl/unx/generic/dtrans/nodrop_curs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define nodrop_curs_width 32
-#define nodrop_curs_height 32
-#define nodrop_curs_x_hot 9
-#define nodrop_curs_y_hot 9
-static const unsigned char nodrop_curs_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00,
- 0xf8, 0x7f, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0x1c, 0xfc, 0x00, 0x00,
- 0x1e, 0xfe, 0x01, 0x00, 0x0e, 0xdf, 0x01, 0x00, 0x8e, 0xcf, 0x01, 0x00,
- 0xce, 0xc7, 0x01, 0x00, 0xee, 0xc3, 0x01, 0x00, 0xfe, 0xe1, 0x01, 0x00,
- 0xfc, 0xe0, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00,
- 0xf0, 0x3f, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/generic/dtrans/nodrop_mask.h
b/main/vcl/unx/generic/dtrans/nodrop_mask.h
deleted file mode 100644
index 69a86867f2..0000000000
--- a/main/vcl/unx/generic/dtrans/nodrop_mask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-#define nodrop_mask_width 32
-#define nodrop_mask_height 32
-#define nodrop_mask_x_hot 9
-#define nodrop_mask_y_hot 9
-static const unsigned char nodrop_mask_bits[] = {
- 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00,
- 0xfc, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x7e, 0xfe, 0x01, 0x00,
- 0x3f, 0xff, 0x03, 0x00, 0x9f, 0xff, 0x03, 0x00, 0xdf, 0xff, 0x03, 0x00,
- 0xff, 0xef, 0x03, 0x00, 0xff, 0xe7, 0x03, 0x00, 0xff, 0xf3, 0x03, 0x00,
- 0xfe, 0xf9, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x00, 0x00,
- 0xf8, 0x7f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/main/vcl/unx/gtk/app/gtkdata.cxx b/main/vcl/unx/gtk/app/gtkdata.cxx
index baa88e8443..f59a5459d8 100644
--- a/main/vcl/unx/gtk/app/gtkdata.cxx
+++ b/main/vcl/unx/gtk/app/gtkdata.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -62,15 +60,15 @@ using namespace rtl;
using namespace vcl_sal;
/***************************************************************************
- * class GtkDisplay *
+ * class GtkDisplay
***************************************************************************/
GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay )
- : SalDisplay( gdk_x11_display_get_xdisplay( pDisplay ) ),
- m_pGdkDisplay( pDisplay ),
- m_bStartupCompleted( false )
+ : SalDisplay( gdk_x11_display_get_xdisplay( pDisplay )
),
+ m_pGdkDisplay( pDisplay ),
+ m_bStartupCompleted( false )
{
- m_bUseRandRWrapper = false; // use gdk signal instead
+ m_bUseRandRWrapper = false; // use gdk signal instead
for(int i = 0; i < POINTER_COUNT; i++)
m_aCursors[ i ] = NULL;
Init ();
@@ -78,15 +76,15 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay )
GtkSalDisplay::~GtkSalDisplay()
{
- if( !m_bStartupCompleted )
- gdk_notify_startup_complete();
- doDestruct();
+ if( !m_bStartupCompleted )
+ gdk_notify_startup_complete();
+ doDestruct();
for(int i = 0; i < POINTER_COUNT; i++)
if( m_aCursors[ i ] )
gdk_cursor_unref( m_aCursors[ i ] );
- pDisp_ = NULL;
+ pDisp_ = NULL;
}
void GtkSalDisplay::deregisterFrame( SalFrame* pFrame )
@@ -96,7 +94,7 @@ void GtkSalDisplay::deregisterFrame( SalFrame* pFrame )
static_cast<GtkSalFrame*>(m_pCapture)->grabPointer( FALSE );
m_pCapture = NULL;
}
- SalDisplay::deregisterFrame( pFrame );
+ SalDisplay::deregisterFrame( pFrame );
}
extern "C" {
@@ -104,25 +102,25 @@ GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
GdkEvent* event,
gpointer data )
{
- return GtkSalDisplay::filterGdkEvent( sys_event, event, data );
+ return GtkSalDisplay::filterGdkEvent( sys_event, event, data );
}
void signalKeysChanged( GdkKeymap*, gpointer data )
{
- GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
- pDisp->GetKeyboardName(TRUE);
+ GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
+ pDisp->GetKeyboardName(TRUE);
}
void signalScreenSizeChanged( GdkScreen* pScreen, gpointer data )
{
- GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
- pDisp->screenSizeChanged( pScreen );
+ GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
+ pDisp->screenSizeChanged( pScreen );
}
void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
{
- GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
- pDisp->monitorsChanged( pScreen );
+ GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
+ pDisp->monitorsChanged( pScreen );
}
}
@@ -131,20 +129,20 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent*
sys_event,
GdkEvent*,
gpointer data )
{
- GdkFilterReturn aFilterReturn = GDK_FILTER_CONTINUE;
+ GdkFilterReturn aFilterReturn = GDK_FILTER_CONTINUE;
XEvent *pEvent = (XEvent *)sys_event;
GtkSalDisplay *pDisplay = (GtkSalDisplay *)data;
- // dispatch all XEvents to event callback
- if( GetSalData()->m_pInstance->
- CallEventCallback( pEvent, sizeof( XEvent ) ) )
- aFilterReturn = GDK_FILTER_REMOVE;
+ // dispatch all XEvents to event callback
+ if( GetSalData()->m_pInstance->
+ CallEventCallback( pEvent, sizeof( XEvent ) ) )
+ aFilterReturn = GDK_FILTER_REMOVE;
- GTK_YIELD_GRAB();
+ GTK_YIELD_GRAB();
- if (pDisplay->GetDisplay() == pEvent->xany.display )
- {
+ if (pDisplay->GetDisplay() == pEvent->xany.display )
+ {
// #i53471# gtk has no callback mechanism that lets us be notified
// when settings (as in XSETTING and opposed to styles) are changed.
// so we need to listen for corresponding property notifications here
@@ -210,7 +208,7 @@ void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen )
gdk_screen_get_monitor_geometry however has a different sort order that
has a default monitor number
Xinerama returns the default monitor as 0.
- That means if we fill in the multiple montors vector from gdk, we'll
get the wrong order unless
+ That means if we fill in the multiple monitors vector from gdk, we'll
get the wrong order unless
the default monitor is incidentally the same (number 0).
Given that XRandR (which is what gdk_screen_get_monitor_geometry is
based on) is
@@ -364,20 +362,20 @@ GdkCursor* GtkSalDisplay::getFromXPM( const char *pBitmap,
GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
{
- if (ePointerStyle >= POINTER_COUNT)
- return NULL;
+ if (ePointerStyle >= POINTER_COUNT)
+ return NULL;
if ( !m_aCursors[ ePointerStyle ] )
{
GdkCursor *pCursor = NULL;
- switch( ePointerStyle )
- {
+ switch( ePointerStyle )
+ {
MAP_BUILTIN( POINTER_ARROW, GDK_LEFT_PTR );
MAP_BUILTIN( POINTER_TEXT, GDK_XTERM );
MAP_BUILTIN( POINTER_HELP, GDK_QUESTION_ARROW );
MAP_BUILTIN( POINTER_CROSS, GDK_CROSSHAIR );
- MAP_BUILTIN( POINTER_WAIT, GDK_WATCH );
+ MAP_BUILTIN( POINTER_WAIT, GDK_WATCH );
MAP_BUILTIN( POINTER_NSIZE, GDK_SB_V_DOUBLE_ARROW );
MAP_BUILTIN( POINTER_SSIZE, GDK_SB_V_DOUBLE_ARROW );
@@ -420,7 +418,7 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle
ePointerStyle )
MAKE_CURSOR( POINTER_COPYFILE, copyfile_ );
MAKE_CURSOR( POINTER_MOVEFILES, movefiles_ );
MAKE_CURSOR( POINTER_COPYFILES, copyfiles_ );
- MAKE_CURSOR( POINTER_NOTALLOWED, nodrop_ );
+ MAKE_CURSOR( POINTER_NOTALLOWED, notallow_ );
MAKE_CURSOR( POINTER_ROTATE, rotate_ );
MAKE_CURSOR( POINTER_HSHEAR, hshear_ );
MAKE_CURSOR( POINTER_VSHEAR, vshear_ );
@@ -471,17 +469,17 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle
ePointerStyle )
MAKE_CURSOR( POINTER_AIRBRUSH, airbrush_ );
MAKE_CURSOR( POINTER_TEXT_VERTICAL, vertcurs_ );
- // --> FME 2004-07-30 #i32329# Enhanced table selection
- MAKE_CURSOR( POINTER_TAB_SELECT_S, tblsels_ );
- MAKE_CURSOR( POINTER_TAB_SELECT_E, tblsele_ );
- MAKE_CURSOR( POINTER_TAB_SELECT_SE, tblselse_ );
- MAKE_CURSOR( POINTER_TAB_SELECT_W, tblselw_ );
- MAKE_CURSOR( POINTER_TAB_SELECT_SW, tblselsw_ );
- // <--
+ // --> FME 2004-07-30 #i32329# Enhanced table selection
+ MAKE_CURSOR( POINTER_TAB_SELECT_S, tblsels_ );
+ MAKE_CURSOR( POINTER_TAB_SELECT_E, tblsele_ );
+ MAKE_CURSOR( POINTER_TAB_SELECT_SE, tblselse_ );
+ MAKE_CURSOR( POINTER_TAB_SELECT_W, tblselw_ );
+ MAKE_CURSOR( POINTER_TAB_SELECT_SW, tblselsw_ );
+ // <--
- // --> FME 2004-08-16 #i20119# Paintbrush tool
- MAKE_CURSOR( POINTER_PAINTBRUSH, paintbrush_ );
- // <--
+ // --> FME 2004-08-16 #i20119# Paintbrush tool
+ MAKE_CURSOR( POINTER_PAINTBRUSH, paintbrush_ );
+ // <--
default:
fprintf( stderr, "pointer %d not implemented",
ePointerStyle );
@@ -498,7 +496,7 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle
ePointerStyle )
int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame )
{
- GtkSalFrame* pFrame = static_cast<GtkSalFrame*>(pSFrame);
+ GtkSalFrame* pFrame = static_cast<GtkSalFrame*>(pSFrame);
if( !pFrame )
{
@@ -517,22 +515,22 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame )
m_pCapture = pFrame;
static_cast<GtkSalFrame*>(pFrame)->grabPointer( TRUE );
- return 1;
+ return 1;
}
/***************************************************************************
- * class GtkXLib *
+ * class GtkXLib
***************************************************************************/
class GtkXLib : public SalXLib
{
- GtkSalDisplay *m_pGtkSalDisplay;
- std::list<GSource *> m_aSources;
- GSource *m_pTimeout;
+ GtkSalDisplay *m_pGtkSalDisplay;
+ std::list<GSource *> m_aSources;
+ GSource *m_pTimeout;
GSource *m_pUserEvent;
- oslMutex m_aDispatchMutex;
- oslCondition m_aDispatchCondition;
- XIOErrorHandler m_aOrigGTKXIOErrorHandler;
+ oslMutex m_aDispatchMutex;
+ oslCondition m_aDispatchCondition;
+ XIOErrorHandler m_aOrigGTKXIOErrorHandler;
public:
static gboolean timeoutFn(gpointer data);
@@ -551,28 +549,28 @@ public:
virtual void StartTimer( sal_uLong nMS );
virtual void StopTimer();
- virtual void Wakeup();
- virtual void PostUserEvent();
+ virtual void Wakeup();
+ virtual void PostUserEvent();
};
GtkXLib::GtkXLib()
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "GtkXLib::GtkXLib()\n" );
+ fprintf( stderr, "GtkXLib::GtkXLib()\n" );
#endif
- m_pGtkSalDisplay = NULL;
+ m_pGtkSalDisplay = NULL;
m_pTimeout = NULL;
m_nTimeoutMS = 0;
- m_pUserEvent = NULL;
- m_aDispatchCondition = osl_createCondition();
- m_aDispatchMutex = osl_createMutex();
- m_aOrigGTKXIOErrorHandler = NULL;
+ m_pUserEvent = NULL;
+ m_aDispatchCondition = osl_createCondition();
+ m_aDispatchMutex = osl_createMutex();
+ m_aOrigGTKXIOErrorHandler = NULL;
}
GtkXLib::~GtkXLib()
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "GtkXLib::~GtkXLib()\n" );
+ fprintf( stderr, "GtkXLib::~GtkXLib()\n" );
#endif
StopTimer();
// sanity check: at this point nobody should be yielding, but wake them
@@ -581,19 +579,19 @@ GtkXLib::~GtkXLib()
osl_destroyCondition( m_aDispatchCondition );
osl_destroyMutex( m_aDispatchMutex );
- PopXErrorLevel();
- XSetIOErrorHandler (m_aOrigGTKXIOErrorHandler);
+ PopXErrorLevel();
+ XSetIOErrorHandler (m_aOrigGTKXIOErrorHandler);
}
void GtkXLib::Init()
{
- int i;
+ int i;
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "GtkXLib::Init()\n" );
+ fprintf( stderr, "GtkXLib::Init()\n" );
#endif
XrmInitialize();
- gtk_set_locale();
+ gtk_set_locale();
/*
* open connection to X11 Display
@@ -603,21 +601,21 @@ void GtkXLib::Init()
* o default display
*/
- GdkDisplay *pGdkDisp = NULL;
+ GdkDisplay *pGdkDisp = NULL;
// is there a -display command line parameter?
- rtl_TextEncoding aEnc = osl_getThreadTextEncoding();
+ rtl_TextEncoding aEnc = osl_getThreadTextEncoding();
int nParams = osl_getCommandArgCount();
rtl::OString aDisplay;
rtl::OUString aParam, aBin;
- char** pCmdLineAry = new char*[ nParams+1 ];
- osl_getExecutableFile( &aParam.pData );
- osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
- pCmdLineAry[0] = g_strdup( OUStringToOString( aBin, aEnc ).getStr() );
+ char** pCmdLineAry = new char*[ nParams+1 ];
+ osl_getExecutableFile( &aParam.pData );
+ osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
+ pCmdLineAry[0] = g_strdup( OUStringToOString( aBin, aEnc ).getStr() );
for (i=0; i<nParams; i++)
{
osl_getCommandArg(i, &aParam.pData );
- OString aBParam( OUStringToOString( aParam, aEnc ) );
+ OString aBParam( OUStringToOString( aParam, aEnc ) );
if( aParam.equalsAscii( "-display" ) || aParam.equalsAscii(
"--display" ) )
{
@@ -626,27 +624,27 @@ void GtkXLib::Init()
aDisplay = rtl::OUStringToOString( aParam, aEnc );
}
else
- pCmdLineAry[i+1] = g_strdup( aBParam.getStr() );
+ pCmdLineAry[i+1] = g_strdup( aBParam.getStr() );
}
- // add executable
- nParams++;
+ // add executable
+ nParams++;
- g_set_application_name(X11SalData::getFrameClassName());
+ g_set_application_name(X11SalData::getFrameClassName());
- // Set consistent name of the root accessible
- rtl::OUString aAppName = Application::GetAppName();
- if( aAppName.getLength() > 0 )
- {
- rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
- g_set_prgname( aPrgName.getStr());
- }
+ // Set consistent name of the root accessible
+ rtl::OUString aAppName = Application::GetAppName();
+ if( aAppName.getLength() > 0 )
+ {
+ rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
+ g_set_prgname( aPrgName.getStr());
+ }
- // init gtk/gdk
- gtk_init_check( &nParams, &pCmdLineAry );
+ // init gtk/gdk
+ gtk_init_check( &nParams, &pCmdLineAry );
- //gtk_init_check sets XError/XIOError handlers, we want our own one
- m_aOrigGTKXIOErrorHandler = XSetIOErrorHandler (
(XIOErrorHandler)X11SalData::XIOErrorHdl );
- PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
+ // gtk_init_check sets XError/XIOError handlers, we want our own one
+ m_aOrigGTKXIOErrorHandler = XSetIOErrorHandler (
(XIOErrorHandler)X11SalData::XIOErrorHdl );
+ PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
for (i = 0; i < nParams; i++ )
g_free( pCmdLineAry[i] );
@@ -657,14 +655,14 @@ void GtkXLib::Init()
gdk_window_set_debug_updates (TRUE);
#endif
- pGdkDisp = gdk_display_get_default();
+ pGdkDisp = gdk_display_get_default();
if ( !pGdkDisp )
{
- rtl::OUString aProgramFileURL;
- osl_getExecutableFile( &aProgramFileURL.pData );
- rtl::OUString aProgramSystemPath;
- osl_getSystemPathFromFileURL (aProgramFileURL.pData,
&aProgramSystemPath.pData);
- rtl::OString aProgramName = rtl::OUStringToOString(
+ rtl::OUString aProgramFileURL;
+ osl_getExecutableFile( &aProgramFileURL.pData );
+ rtl::OUString aProgramSystemPath;
+ osl_getSystemPathFromFileURL (aProgramFileURL.pData,
&aProgramSystemPath.pData);
+ rtl::OString aProgramName = rtl::OUStringToOString(
aProgramSystemPath,
osl_getThreadTextEncoding() );
fprintf( stderr, "%s X11 error: Can't open display: %s\n",
@@ -691,18 +689,18 @@ void GtkXLib::Init()
m_pGtkSalDisplay = new GtkSalDisplay( pGdkDisp );
- gdk_window_add_filter( NULL, call_filterGdkEvent, m_pGtkSalDisplay );
+ gdk_window_add_filter( NULL, call_filterGdkEvent, m_pGtkSalDisplay );
- PushXErrorLevel( true );
+ PushXErrorLevel( true );
SalI18N_KeyboardExtension *pKbdExtension = new
SalI18N_KeyboardExtension( pDisp );
XSync( pDisp, False );
pKbdExtension->UseExtension( ! HasXErrorOccured() );
- PopXErrorLevel();
+ PopXErrorLevel();
m_pGtkSalDisplay->SetKbdExtension( pKbdExtension );
- g_signal_connect( G_OBJECT(gdk_keymap_get_default()), "keys_changed",
G_CALLBACK(signalKeysChanged), m_pGtkSalDisplay );
+ g_signal_connect( G_OBJECT(gdk_keymap_get_default()), "keys_changed",
G_CALLBACK(signalKeysChanged), m_pGtkSalDisplay );
// add signal handler to notify screen size changes
int nScreens = gdk_display_get_n_screens( pGdkDisp );
@@ -720,10 +718,10 @@ void GtkXLib::Init()
extern "C"
{
- gboolean call_timeoutFn(gpointer data)
- {
- return GtkXLib::timeoutFn(data);
- }
+ gboolean call_timeoutFn(gpointer data)
+ {
+ return GtkXLib::timeoutFn(data);
+ }
}
gboolean GtkXLib::timeoutFn(gpointer data)
@@ -760,20 +758,20 @@ void GtkXLib::StartTimer( sal_uLong nMS )
}
m_pTimeout = g_timeout_source_new (m_nTimeoutMS);
- // #i36226# timers should be executed with lower priority
- // than XEvents like in generic plugin
- g_source_set_priority( m_pTimeout, G_PRIORITY_LOW );
+ // #i36226# timers should be executed with lower priority
+ // than XEvents like in generic plugin
+ g_source_set_priority( m_pTimeout, G_PRIORITY_LOW );
g_source_set_can_recurse (m_pTimeout, TRUE);
g_source_set_callback (m_pTimeout, call_timeoutFn,
(gpointer) this, NULL);
g_source_attach (m_pTimeout, g_main_context_default ());
- SalXLib::StartTimer( nMS );
+ SalXLib::StartTimer( nMS );
}
void GtkXLib::StopTimer()
{
- SalXLib::StopTimer();
+ SalXLib::StopTimer();
if (m_pTimeout)
{
@@ -785,10 +783,10 @@ void GtkXLib::StopTimer()
extern "C"
{
- gboolean call_userEventFn( gpointer data )
- {
- return GtkXLib::userEventFn( data );
- }
+ gboolean call_userEventFn( gpointer data )
+ {
+ return GtkXLib::userEventFn( data );
+ }
}
gboolean GtkXLib::userEventFn(gpointer data)
@@ -833,7 +831,7 @@ void GtkXLib::PostUserEvent()
(gpointer) this,
NULL);
g_source_attach (m_pUserEvent, g_main_context_default ());
}
- Wakeup();
+ Wakeup();
}
void GtkXLib::Wakeup()
@@ -916,7 +914,7 @@ sal_source_prepare (GSource *source,
*timeout = -1;
if (watch->pending &&
- watch->pending (watch->pollfd.fd, watch->user_data)) {
+ watch->pending (watch->pollfd.fd, watch->user_data)) {
watch->pollfd.revents |= watch->condition;
return TRUE;
}
@@ -959,8 +957,8 @@ static GSourceFuncs sal_source_watch_funcs = {
sal_source_check,
sal_source_dispatch,
sal_source_finalize,
- NULL,
- NULL
+ NULL,
+ NULL
};
static GSource *
@@ -1009,7 +1007,7 @@ void GtkXLib::Insert( int nFD,
void GtkXLib::Remove( int nFD )
{
- ::std::list< GSource * >::iterator it;
+ ::std::list< GSource * >::iterator it;
for (it = m_aSources.begin(); it != m_aSources.end(); ++it)
{
@@ -1017,7 +1015,7 @@ void GtkXLib::Remove( int nFD )
if (watch->pollfd.fd == nFD)
{
- m_aSources.erase( it );
+ m_aSources.erase( it );
g_source_destroy ((GSource *)watch);
g_source_unref ((GSource *)watch);
@@ -1027,7 +1025,7 @@ void GtkXLib::Remove( int nFD )
}
/**********************************************************************
- * class GtkData *
+ * class GtkData
**********************************************************************/
GtkData::~GtkData()
@@ -1036,6 +1034,8 @@ GtkData::~GtkData()
void GtkData::Init()
{
- pXLib_ = new GtkXLib();
- pXLib_->Init();
+ pXLib_ = new GtkXLib();
+ pXLib_->Init();
}
+
+/* vim: set noet sw=4 ts=4: */
