diff options
Diffstat (limited to 'vcl/unx/inc')
| -rw-r--r-- | vcl/unx/inc/dtint.hxx | 9 | ||||
| -rw-r--r-- | vcl/unx/inc/i18n_cb.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/inc/i18n_ic.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/inc/i18n_im.hxx | 4 | ||||
| -rw-r--r-- | vcl/unx/inc/kde_headers.h | 98 | ||||
| -rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkframe.hxx | 50 | ||||
| -rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkgdi.hxx | 65 | ||||
| -rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkinst.hxx | 8 | ||||
| -rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkobject.hxx | 13 | ||||
| -rw-r--r-- | vcl/unx/inc/plugins/kde/kdedata.hxx | 6 | ||||
| -rw-r--r-- | vcl/unx/inc/pspgraphics.h | 39 | ||||
| -rw-r--r-- | vcl/unx/inc/salbmp.h | 16 | ||||
| -rw-r--r-- | vcl/unx/inc/saldata.hxx | 8 | ||||
| -rw-r--r-- | vcl/unx/inc/saldisp.hxx | 80 | ||||
| -rw-r--r-- | vcl/unx/inc/salframe.h | 64 | ||||
| -rw-r--r-- | vcl/unx/inc/salgdi.h | 102 | ||||
| -rw-r--r-- | vcl/unx/inc/salinst.h | 23 | ||||
| -rw-r--r-- | vcl/unx/inc/salobj.h | 21 | ||||
| -rw-r--r-- | vcl/unx/inc/salprn.h | 34 | ||||
| -rw-r--r-- | vcl/unx/inc/saltimer.h | 2 | ||||
| -rw-r--r-- | vcl/unx/inc/salunx.h | 6 | ||||
| -rw-r--r-- | vcl/unx/inc/salvd.h | 18 | ||||
| -rw-r--r-- | vcl/unx/inc/soicon.hxx | 4 | ||||
| -rw-r--r-- | vcl/unx/inc/wmadaptor.hxx | 6 | ||||
| -rw-r--r-- | vcl/unx/inc/xfont.hxx | 165 |
26 files changed, 369 insertions, 478 deletions
diff --git a/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx index b6f7aa4b9350..010a0417d89b 100644 --- a/vcl/unx/inc/dtint.hxx +++ b/vcl/unx/inc/dtint.hxx @@ -32,19 +32,12 @@ #include <tools/string.hxx> #include <tools/color.hxx> #include <vcl/font.hxx> +#include "svunx.h" class SalBitmap; class SalDisplay; class AllSettings; -#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_) -// forwards from X -struct Display; -struct XEvent; -#define Atom UINT32 -#define XLIB_Window UINT32 -#endif - enum DtType { DtGeneric, DtCDE diff --git a/vcl/unx/inc/i18n_cb.hxx b/vcl/unx/inc/i18n_cb.hxx index 358538390a8d..22aee5aeb41a 100644 --- a/vcl/unx/inc/i18n_cb.hxx +++ b/vcl/unx/inc/i18n_cb.hxx @@ -90,7 +90,7 @@ typedef struct { preedit_status_t eState; preedit_text_t aText; SalExtTextInputEvent aInputEv; - std::vector< USHORT > aInputFlags; + std::vector< sal_uInt16 > aInputFlags; } preedit_data_t; #endif /* _SAL_I18N_CALLBACK_HXX */ diff --git a/vcl/unx/inc/i18n_ic.hxx b/vcl/unx/inc/i18n_ic.hxx index e7382ef6ebd8..b038d179f4a2 100644 --- a/vcl/unx/inc/i18n_ic.hxx +++ b/vcl/unx/inc/i18n_ic.hxx @@ -76,7 +76,7 @@ public: void HandleDestroyIM(); int HandleKeyEvent( XKeyEvent *pEvent, SalFrame *pFrame ); // unused - void EndExtTextInput( USHORT nFlags ); // unused + void EndExtTextInput( sal_uInt16 nFlags ); // unused int CommitStringCallback( sal_Unicode* pText, sal_Size nLength ); int CommitKeyEvent( sal_Unicode* pText, sal_Size nLength ); int UpdateSpotLocation(); diff --git a/vcl/unx/inc/i18n_im.hxx b/vcl/unx/inc/i18n_im.hxx index cca69a3de223..92931ec6353e 100644 --- a/vcl/unx/inc/i18n_im.hxx +++ b/vcl/unx/inc/i18n_im.hxx @@ -57,10 +57,6 @@ public: Bool FilterEvent( XEvent *pEvent, XLIB_Window window ); Bool AddConnectionWatch (Display *pDisplay, void *pConnectionHandler); - #ifdef _USE_PRINT_EXTENSION_ - void Invalidate() { mbUseable = False; } - #endif - SalI18N_InputMethod(); ~SalI18N_InputMethod(); }; diff --git a/vcl/unx/inc/kde_headers.h b/vcl/unx/inc/kde_headers.h new file mode 100644 index 000000000000..7ec45fdc383d --- /dev/null +++ b/vcl/unx/inc/kde_headers.h @@ -0,0 +1,98 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef INCLUDED_VCL_KDE_HEADERS_H +#define INCLUDED_VCL_KDE_HEADERS_H + +/* ********* Suppress warnings if needed */ +#include "sal/config.h" + +#include <cstddef> + +#if defined __GNUC__ +#pragma GCC system_header +#endif + + +/* ********* Hack, but needed because of conflicting types... */ +#define Region QtXRegion + + +/* ********* Qt headers */ +#include <qaccessible.h> +#include <qcheckbox.h> +#include <qcombobox.h> +#include <qfont.h> +#include <qframe.h> +#include <qlineedit.h> +#include <qlistview.h> +#include <qmainwindow.h> +#include <qmenudata.h> +#include <qpaintdevice.h> +#include <qpainter.h> +#include <qpushbutton.h> +#include <qradiobutton.h> +#include <qrangecontrol.h> +#include <qstring.h> +#include <qtabbar.h> +#include <qtabwidget.h> +#include <qtoolbar.h> +#include <qtoolbutton.h> +#include <qwidget.h> +#include <qprogressbar.h> + +/* ********* See hack on top of this file */ +#undef Region + + +/* ********* KDE base headers */ +#include <kaboutdata.h> +#include <kapplication.h> +#include <kcmdlineargs.h> +#include <kconfig.h> +#include <kdeversion.h> +#include <kemailsettings.h> +#include <kglobal.h> +#include <kglobalsettings.h> +#include <klocale.h> +#include <kmainwindow.h> +#include <kmenubar.h> +#include <kprotocolmanager.h> +#include <kstartupinfo.h> +#include <kstyle.h> + + +/* ********* KDE address book connectivity headers */ +#include <kabc/addressbook.h> +#include <kabc/addressee.h> +#include <kabc/field.h> +#include <kabc/stdaddressbook.h> + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx index 4f02ea7c5ecf..e4a1bb5e9527 100644 --- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx @@ -60,6 +60,8 @@ class GtkSalDisplay : public SalDisplay GdkDisplay* m_pGdkDisplay; GdkCursor *m_aCursors[ POINTER_COUNT ]; bool m_bStartupCompleted; + std::vector< int > m_aXineramaScreenIndexMap; + GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char *pMask, int nWidth, int nHeight, int nXHot, int nYHot ); public: diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx index f63f02bcda0f..010844ec3c78 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx @@ -136,7 +136,7 @@ class GtkSalFrame : public SalFrame bool m_bFocused; bool m_bPreeditJustChanged; SalExtTextInputEvent m_aInputEvent; - std::vector< USHORT > m_aInputFlags; + std::vector< sal_uInt16 > m_aInputFlags; IMHandler( GtkSalFrame* ); ~IMHandler(); @@ -145,7 +145,7 @@ class GtkSalFrame : public SalFrame void deleteIMContext(); void updateIMSpotLocation(); void setInputContext( SalInputContext* pContext ); - void endExtTextInput( USHORT nFlags ); + void endExtTextInput( sal_uInt16 nFlags ); bool handleKeyEvent( GdkEventKey* pEvent ); void focusChanged( bool bFocusIn ); @@ -169,7 +169,7 @@ class GtkSalFrame : public SalFrame GdkWindow* m_pForeignTopLevel; GdkNativeWindow m_aForeignTopLevelWindow; Pixmap m_hBackgroundPixmap; - ULONG m_nStyle; + sal_uLong m_nStyle; SalExtStyle m_nExtStyle; GtkFixed* m_pFixedContainer; GtkSalFrame* m_pParent; @@ -177,7 +177,7 @@ class GtkSalFrame : public SalFrame GdkWindowState m_nState; SystemEnvData m_aSystemData; GraphicsHolder m_aGraphics[ nMaxGraphics ]; - USHORT m_nKeyModifiers; + sal_uInt16 m_nKeyModifiers; GdkCursor *m_pCurrentCursor; GdkVisibilityState m_nVisibility; PointerStyle m_ePointerStyle; @@ -201,7 +201,7 @@ class GtkSalFrame : public SalFrame GdkRegion* m_pRegion; - void Init( SalFrame* pParent, ULONG nStyle ); + void Init( SalFrame* pParent, sal_uLong nStyle ); void Init( SystemParentData* pSysData ); void InitCommon(); @@ -253,7 +253,7 @@ class GtkSalFrame : public SalFrame bool isChild( bool bPlug = true, bool bSysChild = true ) { - ULONG nMask = 0; + sal_uLong nMask = 0; if( bPlug ) nMask |= SAL_FRAME_STYLE_PLUG; if( bSysChild ) @@ -274,14 +274,14 @@ class GtkSalFrame : public SalFrame DECL_LINK( ImplDelayedFullScreenHdl, void* ); public: - GtkSalFrame( SalFrame* pParent, ULONG nStyle ); + GtkSalFrame( SalFrame* pParent, sal_uLong nStyle ); GtkSalFrame( SystemParentData* pSysData ); // dispatches an event, returns true if dispatched // and false else; if true was returned the event should // be swallowed bool Dispatch( const XEvent* pEvent ); - void grabPointer( BOOL bGrab, BOOL bOwnerEvents = FALSE ); + void grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents = sal_False ); GtkSalDisplay* getDisplay(); GdkDisplay* getGdkDisplay(); @@ -308,41 +308,41 @@ public: // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual BOOL PostEvent( void* pData ); + virtual sal_Bool PostEvent( void* pData ); virtual void SetTitle( const XubString& rTitle ); - virtual void SetIcon( USHORT nIcon ); + virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu *pSalMenu ); virtual void DrawMenuBar(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); // Before the window is visible, a resize event // must be sent with the correct size - virtual void Show( BOOL bVisible, BOOL bNoActivate = FALSE ); - virtual void Enable( BOOL bEnable ); + virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); + virtual void Enable( sal_Bool bEnable ); // Set ClientSize and Center the Window to the desktop // and send/post a resize message virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ); + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); virtual void GetClientSize( long& rWidth, long& rHeight ); virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual BOOL GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ); + virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); // Enable/Disable ScreenSaver, SystemAgents, ... - virtual void StartPresentation( BOOL bStart ); + virtual void StartPresentation( sal_Bool bStart ); // Show Window over all other Windows - virtual void SetAlwaysOnTop( BOOL bOnTop ); + virtual void SetAlwaysOnTop( sal_Bool bOnTop ); // Window to top and grab focus - virtual void ToTop( USHORT nFlags ); + virtual void ToTop( sal_uInt16 nFlags ); // this function can call with the same // pointer style virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( BOOL bMouse ); + virtual void CaptureMouse( sal_Bool bMouse ); virtual void SetPointerPos( long nX, long nY ); // flush output buffer @@ -352,11 +352,11 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( USHORT nFlags ); + virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual String GetKeyName( USHORT nKeyCode ); - virtual String GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode ); - virtual BOOL MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual String GetKeyName( sal_uInt16 nKeyCode ); + virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode ); + virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS @@ -377,7 +377,7 @@ public: virtual SalIndicatorState GetIndicatorState(); - virtual void SimulateKeyPress( USHORT nKeyCode ); + virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); // set new parent window virtual void SetParent( SalFrame* pNewParent ); @@ -395,7 +395,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( ULONG nRects ); + virtual void BeginSetClipRegion( sal_uLong nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx index 209ba99cd875..4f7d66712ac7 100644 --- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx @@ -56,34 +56,31 @@ public: // will be set when UI theme was changed - static BOOL bThemeChanged; - static BOOL bNeedPixmapPaint; - static BOOL bGlobalNeedPixmapPaint; - static BOOL bToolbarGripWorkaround; - static BOOL bNeedButtonStyleAsEditBackgroundWorkaround; + static sal_Bool bThemeChanged; + static sal_Bool bNeedPixmapPaint; + static sal_Bool bGlobalNeedPixmapPaint; + static sal_Bool bToolbarGripWorkaround; + static sal_Bool bNeedButtonStyleAsEditBackgroundWorkaround; // native widget methods - virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); - virtual BOOL hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, BOOL& rIsInside ); - virtual BOOL drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + const Point& aPos, sal_Bool& rIsInside ); + virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& rCaption ); - virtual BOOL drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& rCaption ); - virtual BOOL getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); //helper methods for frame's UpdateSettings void updateSettings( AllSettings& rSettings ); + virtual bool setClipRegion( const Region& ); virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( ULONG nCount ); - virtual BOOL unionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); - virtual void EndSetClipRegion(); // some themes set the background pixmap of our window EVERY time // a control is painted; but presentation effects need @@ -96,93 +93,89 @@ protected: typedef std::list< Rectangle > clipList; GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect ); - BOOL NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ); + sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ); - BOOL NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKScrollbar( ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKTabItem( ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - BOOL NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + sal_Bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - - BOOL drawNativeMixedStateCheck( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& rCaption ); }; #endif // _VCL_GTKGDI_HXX diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/unx/inc/plugins/gtk/gtkinst.hxx index 325bf54f7998..07549776e9cf 100644 --- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkinst.hxx @@ -64,7 +64,7 @@ class GtkHookedYieldMutex : public GtkYieldMutex { virtual int Grab() { return 0; }; virtual void Ungrab(int ) {}; - std::list<ULONG> aYieldStack; + std::list<sal_uLong> aYieldStack; public: GtkHookedYieldMutex(); virtual void acquire(); @@ -85,9 +85,9 @@ public: {} virtual ~GtkInstance(); - virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle ); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, ULONG nStyle ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); virtual SalSystem* CreateSalSystem(); virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); }; diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx index 143f9a2d19a9..72b33b0e5c3b 100644 --- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx @@ -45,28 +45,29 @@ class GtkSalObject : public SalObject static gboolean signalFocus( GtkWidget*, GdkEventFocus*, gpointer ); static void signalDestroy( GtkObject*, gpointer ); public: - GtkSalObject( GtkSalFrame* pParent, BOOL bShow = TRUE ); + GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow = sal_True ); virtual ~GtkSalObject(); // overload all pure virtual methods virtual void ResetClipRegion(); - virtual USHORT GetClipRegionType(); - virtual void BeginSetClipRegion( ULONG nRects ); + virtual sal_uInt16 GetClipRegionType(); + virtual void BeginSetClipRegion( sal_uLong nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( BOOL bVisible ); - virtual void Enable( BOOL nEnable ); + virtual void Show( sal_Bool bVisible ); + virtual void Enable( sal_Bool nEnable ); virtual void GrabFocus(); virtual void SetBackground(); virtual void SetBackground( SalColor nSalColor ); - virtual void SetForwardKey( BOOL bEnable ); + virtual void SetForwardKey( sal_Bool bEnable ); virtual const SystemEnvData* GetSystemData() const; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; #endif // _SV_SALOBJ_H diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx index 458685ea58b0..9125b33f1b20 100644 --- a/vcl/unx/inc/plugins/kde/kdedata.hxx +++ b/vcl/unx/inc/plugins/kde/kdedata.hxx @@ -68,14 +68,14 @@ class KDESalFrame : public X11SalFrame GraphicsHolder m_aGraphics[ nMaxGraphics ]; public: - KDESalFrame( SalFrame* pParent, ULONG nStyle ); + KDESalFrame( SalFrame* pParent, sal_uLong ); virtual ~KDESalFrame(); virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics *pGraphics ); virtual void updateGraphics( bool bClear ); virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Show( BOOL bVisible, BOOL bNoActivate ); + virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate ); }; class KDESalInstance : public X11SalInstance @@ -84,7 +84,7 @@ public: KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} virtual ~KDESalInstance() {} - virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); }; class KDEXLib : public SalXLib diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index 1c7c3d51a785..80d1f5fb92cc 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -84,14 +84,11 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual USHORT GetBitCount() const; + virtual sal_uInt16 GetBitCount() const; virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( ULONG nCount ); - virtual BOOL unionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); - virtual void EndSetClipRegion(); + virtual bool setClipRegion( const Region& ); virtual void SetLineColor(); virtual void SetLineColor( SalColor nSalColor ); @@ -102,15 +99,15 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ); virtual void SetTextColor( SalColor nSalColor ); - virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); + virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual ULONG GetKernPairs( ULONG nMaxPairs, ImplKernPairData* ); - virtual ImplFontCharMap* GetImplFontCharMap() const; + virtual sal_uLong GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* ); + virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ); - virtual BOOL CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -129,8 +126,8 @@ public: bool bVertical, Int32Vector& rWidths, Ucs2UIntMap& rUnicodeEnc ); - virtual BOOL GetGlyphBoundRect( long nIndex, Rectangle& ); - virtual BOOL GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); + virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& ); + virtual sal_Bool GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); virtual void DrawServerFontLayout( const ServerFontLayout& ); virtual bool supportsOperation( OutDevSupportType ) const; @@ -138,30 +135,30 @@ public: virtual void drawPixel( long nX, long nY, SalColor nSalColor ); virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - virtual void drawPolyLine( ULONG nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( ULONG nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); virtual bool drawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin); - virtual sal_Bool drawPolyLineBezier( ULONG nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, - const BYTE* pFlgAry ); - virtual sal_Bool drawPolygonBezier( ULONG nPoints, + const sal_uInt8* pFlgAry ); + virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, - const BYTE* pFlgAry ); + const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, - const BYTE* const* pFlgAry ); + const sal_uInt8* const* pFlgAry ); virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, - USHORT nFlags ); + sal_uInt16 nFlags ); virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ); virtual void drawBitmap( const SalTwoRect* pPosAry, @@ -178,9 +175,9 @@ public: virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); virtual SalColor getPixel( long nX, long nY ); virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop ); virtual bool drawAlphaBitmap( const SalTwoRect&, diff --git a/vcl/unx/inc/salbmp.h b/vcl/unx/inc/salbmp.h index 1f2dc420cb72..f72f77b9909f 100644 --- a/vcl/unx/inc/salbmp.h +++ b/vcl/unx/inc/salbmp.h @@ -52,7 +52,7 @@ class VCL_DLLPUBLIC X11SalBitmap : public SalBitmap private: static BitmapBuffer* ImplCreateDIB( const Size& rSize, - USHORT nBitCount, + sal_uInt16 nBitCount, const BitmapPalette& rPal ); static BitmapBuffer* ImplCreateDIB( Drawable aDrawable, int nScreen, @@ -64,7 +64,7 @@ private: public: static ImplSalBitmapCache* mpCache; - static ULONG mnCacheInstCount; + static sal_uIntPtr mnCacheInstCount; static void ImplCreateCache(); static void ImplDestroyCache(); @@ -106,13 +106,13 @@ public: // overload pure virtual methods virtual bool Create( const Size& rSize, - USHORT nBitCount, + sal_uInt16 nBitCount, const BitmapPalette& rPal ); virtual bool Create( const SalBitmap& rSalBmp ); virtual bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ); virtual bool Create( const SalBitmap& rSalBmp, - USHORT nNewBitCount ); + sal_uInt16 nNewBitCount ); virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, Size& rSize, bool bMask = false ); @@ -120,7 +120,7 @@ public: virtual void Destroy(); virtual Size GetSize() const; - virtual USHORT GetBitCount() const; + virtual sal_uInt16 GetBitCount() const; virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ); virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); @@ -167,7 +167,7 @@ public: long ImplGetWidth() const { return maTwoRect.mnDestWidth; } long ImplGetHeight() const { return maTwoRect.mnDestHeight; } long ImplGetDepth() const { return mnDepth; } - ULONG ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); } + sal_uIntPtr ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); } int ImplGetScreen() const { return mnScreen; } bool ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const; @@ -184,14 +184,14 @@ class ImplSalBitmapCache private: List maBmpList; - ULONG mnTotalSize; + sal_uIntPtr mnTotalSize; public: ImplSalBitmapCache(); ~ImplSalBitmapCache(); - void ImplAdd( X11SalBitmap* pBmp, ULONG nMemSize = 0UL, ULONG nFlags = 0UL ); + void ImplAdd( X11SalBitmap* pBmp, sal_uIntPtr nMemSize = 0UL, sal_uIntPtr nFlags = 0UL ); void ImplRemove( X11SalBitmap* pBmp ); void ImplClear(); }; diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index 9544491137fb..e967b0f7e4d0 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -56,11 +56,12 @@ typedef unsigned int pthread_t; class VCL_DLLPUBLIC X11SalData : public SalData { protected: - BOOL bNoExceptions_; + sal_Bool bNoExceptions_; SalXLib *pXLib_; SalDisplay *m_pSalDisplay; pthread_t hMainThread_; rtl::OUString maLocalHostName; + rtl::OUString maUnicodeAccumulator; public: X11SalData(); @@ -82,11 +83,12 @@ public: inline SalXLib* GetLib() const { return pXLib_; } inline pthread_t GetMainThread() const { return hMainThread_; } - void StartTimer( ULONG nMS ); + void StartTimer( sal_uLong nMS ); inline void StopTimer(); void Timeout() const; const rtl::OUString& GetLocalHostName(); + rtl::OUString& GetUnicodeAccumulator() { return maUnicodeAccumulator; } static int XErrorHdl( Display*, XErrorEvent* ); static int XIOErrorHdl( Display* ); @@ -109,7 +111,7 @@ inline void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) const class YieldMutexReleaser { - ULONG m_nYieldCount; + sal_uLong m_nYieldCount; public: inline YieldMutexReleaser(); inline ~YieldMutexReleaser(); diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index 64eb16a1b313..895f4513800e 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -149,8 +149,8 @@ public: Pixel GetTCPixel( SalColor nColor ) const; SalColor GetTCColor( Pixel nPixel ) const; - BOOL Convert( int &n0, int &n1, int &n2, int &n3 ); // 32bit - BOOL Convert( int &n0, int &n1, int &n2 ); // 24bit + sal_Bool Convert( int &n0, int &n1, int &n2, int &n3 ); // 32bit + sal_Bool Convert( int &n0, int &n1, int &n2 ); // 24bit }; // -=-= SalColormap =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -160,7 +160,7 @@ class SalColormap Colormap m_hColormap; std::vector<SalColor> m_aPalette; // Pseudocolor SalVisual m_aVisual; - std::vector<USHORT> m_aLookupTable; // Pseudocolor: 12bit reduction + std::vector<sal_uInt16> m_aLookupTable; // Pseudocolor: 12bit reduction Pixel m_nWhitePixel; Pixel m_nBlackPixel; Pixel m_nUsed; // Pseudocolor @@ -173,7 +173,7 @@ public: Colormap hColormap, int nScreen ); SalColormap( const BitmapPalette &rpPalette ); - SalColormap( USHORT nDepth ); + SalColormap( sal_uInt16 nDepth ); SalColormap(); ~SalColormap(); @@ -188,11 +188,11 @@ public: inline int GetClass() const { return m_aVisual.GetClass(); } inline int GetScreenNumber() const { return m_nScreen; } - BOOL GetXPixels( XColor &rColor, + sal_Bool GetXPixels( XColor &rColor, int r, int g, int b ) const; - inline BOOL GetXPixel( XColor &rColor, + inline sal_Bool GetXPixel( XColor &rColor, int r, int g, int b ) const; @@ -209,7 +209,7 @@ class VCL_DLLPUBLIC SalXLib { protected: timeval m_aTimeout; - ULONG m_nTimeoutMS; + sal_uLong m_nTimeoutMS; int m_pTimeoutFDS[2]; bool m_bHaveSystemChildFrames; @@ -251,7 +251,7 @@ public: void PushXErrorLevel( bool bIgnore ); void PopXErrorLevel(); - virtual void StartTimer( ULONG nMS ); + virtual void StartTimer( sal_uLong nMS ); virtual void StopTimer(); bool CheckTimeout( bool bExecuteTimers = true ); @@ -266,15 +266,10 @@ public: class SalI18N_InputMethod; class SalI18N_KeyboardExtension; -class XlfdStorage; -class ExtendedFontStruct; -class ExtendedXlfd; class AttributeProvider; class SalUnicodeConverter; class SalConverterCache; -typedef ::std::vector< ExtendedFontStruct* > SalFontCache; - extern "C" { struct SnDisplay; struct SnLauncheeContext; @@ -331,9 +326,9 @@ public: { SalFrame* m_pFrame; void* m_pData; - USHORT m_nEvent; + sal_uInt16 m_nEvent; - SalUserEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT ) + SalUserEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT ) : m_pFrame( pFrame ), m_pData( pData ), m_nEvent( nEvent ) @@ -346,8 +341,6 @@ protected: SalI18N_KeyboardExtension *mpKbdExtension; AttributeProvider *mpFactory; - XlfdStorage *mpFontList; - const ExtendedXlfd *mpFallbackFactory; Display *pDisp_; // X Display int m_nDefaultScreen; // XDefaultScreen @@ -355,14 +348,14 @@ protected: ScreenData m_aInvalidScreenData; Pair aResolution_; // [dpi] bool mbExactResolution; - ULONG nMaxRequestSize_; // [byte] + sal_uLong nMaxRequestSize_; // [byte] srv_vendor_t meServerVendor; SalWM eWindowManager_; - ULONG nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE - BOOL bLocal_; // Server==Client? Init + sal_uLong nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE + sal_Bool bLocal_; // Server==Client? Init // in SalDisplay::IsLocal() - BOOL mbLocalIsValid; // bLocal_ is valid ? + sal_Bool mbLocalIsValid; // bLocal_ is valid ? // until x bytes oslMutex hEventGuard_; @@ -371,10 +364,8 @@ protected: XLIB_Cursor aPointerCache_[POINTER_COUNT]; SalFrame* m_pCapture; - mutable SalFontCache* m_pFontCache; - // Keyboard - BOOL bNumLockFromXS_; // Num Lock handled by X Server + sal_Bool bNumLockFromXS_; // Num Lock handled by X Server int nNumLockIndex_; // modifier index in modmap int nNumLockMask_; // keyevent state mask for KeySym nShiftKeySym_; // first shift modifier @@ -395,7 +386,6 @@ protected: mutable XLIB_Time m_nLastUserEventTime; // mutable because changed on first access - void DestroyFontCache(); virtual long Dispatch( XEvent *pEvent ) = 0; void InitXinerama(); void InitRandR( XLIB_Window aRoot ) const; @@ -406,7 +396,7 @@ protected: void addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight ); public: static SalDisplay *GetSalDisplay( Display* display ); - static BOOL BestVisual( Display *pDisp, + static sal_Bool BestVisual( Display *pDisp, int nScreen, XVisualInfo &rVI ); @@ -424,30 +414,22 @@ public: void Init(); - void SendInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT ); - void CancelInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent ); + void SendInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT ); + void CancelInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent ); bool DispatchInternalEvent(); void PrintInfo() const; void PrintEvent( const ByteString &rComment, XEvent *pEvent ) const; - XlfdStorage* GetXlfdList() const; - ExtendedFontStruct* - GetFont( const ExtendedXlfd *pFont, - const Size& rPixelSize, sal_Bool bVertical ) const; - const ExtendedXlfd* - GetFallbackFactory() - { return mpFallbackFactory; } - void Beep() const; void ModifierMapping(); - void SimulateKeyPress( USHORT nKeyCode ); - USHORT GetIndicatorState() const; + void SimulateKeyPress( sal_uInt16 nKeyCode ); + sal_uInt16 GetIndicatorState() const; String GetKeyNameFromKeySym( KeySym keysym ) const; - XubString GetKeyName( USHORT nKeyCode ) const; - USHORT GetKeyCode( KeySym keysym, char*pcPrintable ) const; + XubString GetKeyName( sal_uInt16 nKeyCode ) const; + sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; KeySym GetKeySym( XKeyEvent *pEvent, unsigned char *pPrintable, int *pLen, @@ -458,7 +440,7 @@ public: XLIB_Cursor GetPointer( int ePointerStyle ); virtual int CaptureMouse( SalFrame *pCapture ); - BOOL IsLocal(); + sal_Bool IsLocal(); void Remove( XEvent *pEvent ); @@ -479,27 +461,27 @@ public: const Size& GetScreenSize( int nScreen ) const { return getDataForScreen( nScreen ).m_aSize; } srv_vendor_t GetServerVendor() const { return meServerVendor; } void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); } - BOOL IsDisplay() const { return !!pXLib_; } + sal_Bool IsDisplay() const { return !!pXLib_; } GC GetMonoGC( int nScreen ) const { return getDataForScreen(nScreen).m_aMonoGC; } GC GetCopyGC( int nScreen ) const { return getDataForScreen(nScreen).m_aCopyGC; } GC GetAndInvertedGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndInvertedGC; } GC GetAndGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndGC; } GC GetOrGC( int nScreen ) const { return getDataForScreen(nScreen).m_aOrGC; } GC GetStippleGC( int nScreen ) const { return getDataForScreen(nScreen).m_aStippleGC; } - GC GetGC( USHORT nDepth, int nScreen ) const; + GC GetGC( sal_uInt16 nDepth, int nScreen ) const; Pixmap GetInvert50( int nScreen ) const { return getDataForScreen(nScreen).m_hInvert50; } const SalColormap& GetColormap( int nScreen ) const { return getDataForScreen(nScreen).m_aColormap; } const SalVisual& GetVisual( int nScreen ) const { return getDataForScreen(nScreen).m_aVisual; } RenderEntryMap& GetRenderEntries( int nScreen ) const { return getDataForScreen(nScreen).m_aRenderData; } const Pair &GetResolution() const { return aResolution_; } bool GetExactResolution() const { return mbExactResolution; } - ULONG GetProperties() const { return nProperties_; } - ULONG GetMaxRequestSize() const { return nMaxRequestSize_; } + sal_uLong GetProperties() const { return nProperties_; } + sal_uLong GetMaxRequestSize() const { return nMaxRequestSize_; } XLIB_Time GetLastUserEventTime( bool bAlwaysReget = false ) const; bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const; - BOOL MouseCaptured( const SalFrame *pFrameData ) const + sal_Bool MouseCaptured( const SalFrame *pFrameData ) const { return m_pCapture == pFrameData; } SalFrame* GetCaptureFrame() const { return m_pCapture; } @@ -525,14 +507,14 @@ public: const std::list< SalFrame* >& getFrames() const { return m_aFrames; } - BOOL IsNumLockFromXS() const { return bNumLockFromXS_; } + sal_Bool IsNumLockFromXS() const { return bNumLockFromXS_; } std::list< SalObject* >& getSalObjects() { return m_aSalObjects; } }; // -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -inline GC SalDisplay::GetGC( USHORT nDepth, int nScreen ) const +inline GC SalDisplay::GetGC( sal_uInt16 nDepth, int nScreen ) const { return 1 == nDepth ? GetMonoGC( nScreen ) : getDataForScreen(nScreen).m_aVisual.GetDepth() == nDepth @@ -551,7 +533,7 @@ public: virtual long Dispatch( XEvent *pEvent ); virtual void Yield(); - BOOL IsEvent(); + sal_Bool IsEvent(); }; /*---------------------------------------------------------- diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h index 5ec3f04355a0..0025afce2ad6 100644 --- a/vcl/unx/inc/salframe.h +++ b/vcl/unx/inc/salframe.h @@ -88,23 +88,23 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame X11SalGraphics *pFreeGraphics_; // first free frame graphics XLIB_Time nReleaseTime_; // timestamp of last key release - USHORT nKeyCode_; // last key code - USHORT nKeyState_; // last key state + sal_uInt16 nKeyCode_; // last key code + sal_uInt16 nKeyState_; // last key state int nCompose_; // compose state bool mbSendExtKeyModChange; - USHORT mnExtKeyMod; + sal_uInt16 mnExtKeyMod; int nShowState_; // show state int nWidth_; // client width int nHeight_; // client height Rectangle maRestorePosSize; - ULONG nStyle_; + sal_uIntPtr nStyle_; SalExtStyle mnExtStyle; - BOOL bAlwaysOnTop_; - BOOL bViewable_; - BOOL bMapped_; - BOOL mbInShow; - BOOL bDefaultPosition_; // client is centered initially + sal_Bool bAlwaysOnTop_; + sal_Bool bViewable_; + sal_Bool bMapped_; + sal_Bool mbInShow; + sal_Bool bDefaultPosition_; // client is centered initially bool m_bXEmbed; int nVisibility_; int m_nWorkArea; @@ -177,11 +177,11 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame void updateWMClass(); public: - X11SalFrame( SalFrame* pParent, ULONG nSalFrameStyle, SystemParentData* pSystemParent = NULL ); + X11SalFrame( SalFrame* pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent = NULL ); virtual ~X11SalFrame(); long Dispatch( XEvent *pEvent ); - void Init( ULONG nSalFrameStyle, int nScreen = -1, + void Init( sal_uIntPtr nSalFrameStyle, int nScreen = -1, SystemParentData* pParentData = NULL, bool bUseGeometry = false ); SalDisplay* GetDisplay() const { return pDisplay_; } @@ -194,10 +194,10 @@ public: XLIB_Window GetStackingWindow() const { return mhStackingWindow; } long ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); } long Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); } - ULONG GetStyle() const { return nStyle_; } + sal_uIntPtr GetStyle() const { return nStyle_; } inline XLIB_Cursor GetCursor() const { return hCursor_; } - inline BOOL IsCaptured() const { return nCaptured_ == 1; } + inline sal_Bool IsCaptured() const { return nCaptured_ == 1; } #if !defined(__synchronous_extinput__) void HandleExtTextEvent (XClientMessageEvent *pEvent); void PostExtTextEvent (sal_uInt16 nExtTextEventType, @@ -213,6 +213,10 @@ public: bool isMapped() const { return bMapped_; } bool hasFocus() const { return mbInputFocus; } + void beginUnicodeSequence(); + bool appendUnicodeSequence( sal_Unicode ); + bool endUnicodeSequence(); + virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); @@ -220,39 +224,39 @@ public: // call with false to setup graphics with window (GetWindow()) virtual void updateGraphics( bool bClear ); - virtual BOOL PostEvent( void* pData ); + virtual sal_Bool PostEvent( void* pData ); virtual void SetTitle( const XubString& rTitle ); - virtual void SetIcon( USHORT nIcon ); + virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pMenu ); virtual void DrawMenuBar(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( BOOL bVisible, BOOL bNoActivate = FALSE ); - virtual void Enable( BOOL bEnable ); + virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); + virtual void Enable( sal_Bool bEnable ); virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ); + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); virtual void GetClientSize( long& rWidth, long& rHeight ); virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual BOOL GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( BOOL bFullScreen, sal_Int32 nMonitor ); - virtual void StartPresentation( BOOL bStart ); - virtual void SetAlwaysOnTop( BOOL bOnTop ); - virtual void ToTop( USHORT nFlags ); + virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nMonitor ); + virtual void StartPresentation( sal_Bool bStart ); + virtual void SetAlwaysOnTop( sal_Bool bOnTop ); + virtual void ToTop( sal_uInt16 nFlags ); virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( BOOL bMouse ); + virtual void CaptureMouse( sal_Bool bMouse ); virtual void SetPointerPos( long nX, long nY ); using SalFrame::Flush; virtual void Flush(); virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( USHORT nFlags ); - virtual String GetKeyName( USHORT nKeyCode ); - virtual String GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode ); - virtual BOOL MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual void EndExtTextInput( sal_uInt16 nFlags ); + virtual String GetKeyName( sal_uInt16 nKeyCode ); + virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode ); + virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual SalBitmap* SnapShot(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -260,7 +264,7 @@ public: virtual const SystemEnvData* GetSystemData() const; virtual SalPointerState GetPointerState(); virtual SalIndicatorState GetIndicatorState(); - virtual void SimulateKeyPress( USHORT nKeyCode ); + virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetBackgroundBitmap( SalBitmap* pBitmap ); @@ -272,7 +276,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( ULONG nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index 4a9cd11f394d..ab8607aa523c 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -29,18 +29,15 @@ #ifndef _SV_SALGDI_H #define _SV_SALGDI_H - -// -=-= exports -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -class SalFontCacheItem; - // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include "salstd.hxx" #include "vcl/salgdi.hxx" #include "vcl/salgtype.hxx" #include "tools/fract.hxx" #include "vcl/dllapi.h" +#include <vcl/vclenum.hxx> +#include <vcl/sallayout.hxx> #include <deque> -#include "xfont.hxx" // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= struct ImplFontMetricData; @@ -94,21 +91,20 @@ protected: CairoFontsCache m_aCairoFontsCache; XLIB_Region pPaintRegion_; - XLIB_Region pClipRegion_; + XLIB_Region mpClipRegion; GC pPenGC_; // Pen attributes SalColor nPenColor_; Pixel nPenPixel_; GC pFontGC_; // Font attributes - ExtendedFontStructRef mXFont[ MAX_FALLBACK ]; ServerFont* mpServerFont[ MAX_FALLBACK ]; SalColor nTextColor_; Pixel nTextPixel_; - BOOL bFontVertical_; + sal_Bool bFontVertical_; - BOOL bDisableGraphite_; + sal_Bool bDisableGraphite_; GC pBrushGC_; // Brush attributes SalColor nBrushColor_; @@ -123,21 +119,22 @@ protected: GC pStippleGC_; GC pTrackingGC_; - BOOL bWindow_ : 1; // is Window - BOOL bPrinter_ : 1; // is Printer - BOOL bVirDev_ : 1; // is VirDev - BOOL bPenGC_ : 1; // is Pen GC valid - BOOL bFontGC_ : 1; // is Font GC valid - BOOL bBrushGC_ : 1; // is Brush GC valid - BOOL bMonoGC_ : 1; // is Mono GC valid - BOOL bCopyGC_ : 1; // is Copy GC valid - BOOL bInvertGC_ : 1; // is Invert GC valid - BOOL bInvert50GC_ : 1; // is Invert50 GC valid - BOOL bStippleGC_ : 1; // is Stipple GC valid - BOOL bTrackingGC_ : 1; // is Tracking GC valid + sal_Bool bWindow_ : 1; // is Window + sal_Bool bPrinter_ : 1; // is Printer + sal_Bool bVirDev_ : 1; // is VirDev + sal_Bool bPenGC_ : 1; // is Pen GC valid + sal_Bool bFontGC_ : 1; // is Font GC valid + sal_Bool bBrushGC_ : 1; // is Brush GC valid + sal_Bool bMonoGC_ : 1; // is Mono GC valid + sal_Bool bCopyGC_ : 1; // is Copy GC valid + sal_Bool bInvertGC_ : 1; // is Invert GC valid + sal_Bool bInvert50GC_ : 1; // is Invert50 GC valid + sal_Bool bStippleGC_ : 1; // is Stipple GC valid + sal_Bool bTrackingGC_ : 1; // is Tracking GC valid bool bXORMode_ : 1; // is ROP XOR Mode set - BOOL bDitherBrush_ : 1; // is solid or tile + sal_Bool bDitherBrush_ : 1; // is solid or tile + using SalGraphics::SetClipRegion; void SetClipRegion( GC pGC, XLIB_Region pXReg = NULL ) const; @@ -148,12 +145,12 @@ protected: unsigned long nMask = GCGraphicsExposures ); GC SelectPen(); GC SelectBrush(); - void DrawLines( ULONG nPoints, + void DrawLines( sal_uIntPtr nPoints, const SalPolyLine &rPoints, GC pGC, bool bClose ); - BOOL GetDitherPixmap ( SalColor nSalColor ); + sal_Bool GetDitherPixmap ( SalColor nSalColor ); inline GC GetMonoGC( Pixmap hPixmap ); inline GC GetCopyGC(); @@ -186,7 +183,7 @@ protected: const SalBitmap &rTransparentBitmap, SalColor nTransparentColor ); - GC SelectFont(); + GC GetFontGC(); bool setFont( const ImplFontSelectData* pEntry, int nFallbackLevel ); void drawMaskedBitmap( const SalTwoRect* pPosAry, @@ -194,9 +191,6 @@ protected: const SalBitmap& rTransparentBitmap ); protected: - void DrawStringUCS2MB( ExtendedFontStruct& rFont, const Point&, - const sal_Unicode* pStr, int nLength ); - void DrawPrinterString( const SalLayout& ); void DrawServerFontString( const ServerFontLayout& ); @@ -231,15 +225,12 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual USHORT GetBitCount() const; + virtual sal_uInt16 GetBitCount() const; virtual long GetGraphicsWidth() const; virtual long GetGraphicsHeight() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( ULONG nCount ); - virtual BOOL unionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); - virtual void EndSetClipRegion(); + virtual bool setClipRegion( const Region& ); virtual void SetLineColor(); virtual void SetLineColor( SalColor nSalColor ); @@ -253,15 +244,15 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ); virtual void SetTextColor( SalColor nSalColor ); - virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); + virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual ULONG GetKernPairs( ULONG nMaxPairs, ImplKernPairData* ); - virtual ImplFontCharMap* GetImplFontCharMap() const; + virtual sal_uLong GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* ); + virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ); - virtual BOOL CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -280,8 +271,8 @@ public: bool bVertical, Int32Vector& rWidths, Ucs2UIntMap& rUnicodeEnc ); - virtual BOOL GetGlyphBoundRect( long nIndex, Rectangle& ); - virtual BOOL GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); + virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& ); + virtual sal_Bool GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); virtual void DrawServerFontLayout( const ServerFontLayout& ); virtual bool supportsOperation( OutDevSupportType ) const; @@ -289,9 +280,9 @@ public: virtual void drawPixel( long nX, long nY, SalColor nSalColor ); virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - void drawPolyLine( ULONG nPoints, const SalPoint* pPtAry, bool bClose ); - virtual void drawPolyLine( ULONG nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( ULONG nPoints, const SalPoint* pPtAry ); + void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, bool bClose ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); @@ -300,16 +291,16 @@ public: virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency ); #if 1 // TODO: remove these obselete methods - virtual sal_Bool drawPolyLineBezier( ULONG nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, - const BYTE* pFlgAry ); - virtual sal_Bool drawPolygonBezier( ULONG nPoints, + const sal_uInt8* pFlgAry ); + virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, - const BYTE* pFlgAry ); + const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, - const BYTE* const* pFlgAry ); + const sal_uInt8* const* pFlgAry ); #endif virtual void copyArea( long nDestX, @@ -318,7 +309,7 @@ public: long nSrcY, long nSrcWidth, long nSrcHeight, - USHORT nFlags ); + sal_uInt16 nFlags ); virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ); virtual void drawBitmap( const SalTwoRect* pPosAry, @@ -335,9 +326,9 @@ public: virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); virtual SalColor getPixel( long nX, long nY ); virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, @@ -388,19 +379,8 @@ inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const #ifdef DBG_UTIL #define stderr0( s ) fprintf( stderr, s ) -#define stderr1( s, a ) fprintf( stderr, s, a ) -#define stderr2( s, a, b ) fprintf( stderr, s, a, b ) -#define stderr3( s, a, b, c ) fprintf( stderr, s, a, b, c ) -#define stdass0( b ) (void)( !(b) \ - ? fprintf( stderr, "\"%s\" (%s line %d)\n", \ - #b, __FILE__, __LINE__ ) \ - : 0 ) #else #define stderr0( s ) ; -#define stderr1( s, a ) ; -#define stderr2( s, a, b ) ; -#define stderr3( s, a, b, c ) ; -#define stdass0( b ) ; #endif #endif // _SV_SALGDI_H diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h index 0739902548bd..a571303333b3 100644 --- a/vcl/unx/inc/salinst.h +++ b/vcl/unx/inc/salinst.h @@ -39,7 +39,7 @@ class VCL_DLLPUBLIC SalYieldMutex : public vcl::SolarMutexObject { protected: - ULONG mnCount; + sal_uIntPtr mnCount; oslThreadIdentifier mnThreadId; public: @@ -49,7 +49,7 @@ public: virtual void release(); virtual sal_Bool tryToAcquire(); - ULONG GetAcquireCount() const { return mnCount; } + sal_uIntPtr GetAcquireCount() const { return mnCount; } oslThreadIdentifier GetThreadId() const { return mnThreadId; } }; @@ -67,16 +67,16 @@ public: {} virtual ~X11SalInstance(); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, ULONG nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); virtual void DestroyObject( SalObject* pObject ); virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, - USHORT nBitCount, const SystemGraphicsData *pData = NULL ); + sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ); virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ); virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, @@ -97,15 +97,12 @@ public: virtual SalSession* CreateSalSession(); virtual osl::SolarMutex* GetYieldMutex(); - virtual ULONG ReleaseYieldMutex(); - virtual void AcquireYieldMutex( ULONG nCount ); + virtual sal_uIntPtr ReleaseYieldMutex(); + virtual void AcquireYieldMutex( sal_uIntPtr nCount ); + virtual bool CheckYieldMutex(); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); - virtual bool AnyInput( USHORT nType ); - virtual SalMenu* CreateMenu( BOOL bMenuBar ); - virtual void DestroyMenu( SalMenu* pMenu); - virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); - virtual void DestroyMenuItem( SalMenuItem* pItem ); + virtual bool AnyInput( sal_uInt16 nType ); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); void FillFontPathList( std::list< rtl::OString >& o_rFontPaths ); diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h index 2a09222c365c..577a3675fa3d 100644 --- a/vcl/unx/inc/salobj.h +++ b/vcl/unx/inc/salobj.h @@ -42,16 +42,16 @@ public: SalClipRegion(); ~SalClipRegion(); - void BeginSetClipRegion( ULONG nRects ); + void BeginSetClipRegion( sal_uIntPtr nRects ); void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); XRectangle *EndSetClipRegion() { return ClipRectangleList; } void ResetClipRegion() { numClipRectangles = 0; } - USHORT GetClipRegionType() { + sal_uInt16 GetClipRegionType() { return nClipRegionType; } - void SetClipRegionType( USHORT nType ) { + void SetClipRegionType( sal_uInt16 nType ) { nClipRegionType = nType; } int GetRectangleCount() { return numClipRectangles; } @@ -61,7 +61,7 @@ private: XRectangle* ClipRectangleList; int numClipRectangles; int maxClipRectangles; - USHORT nClipRegionType; + sal_uInt16 nClipRegionType; }; @@ -74,24 +74,24 @@ public: XLIB_Window maSecondary; Colormap maColormap; SalClipRegion maClipRegion; - BOOL mbVisible; + sal_Bool mbVisible; static VCL_DLLPUBLIC long Dispatch( XEvent* pEvent ); - static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ); + static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); X11SalObject(); virtual ~X11SalObject(); // overload all pure virtual methods virtual void ResetClipRegion(); - virtual USHORT GetClipRegionType(); - virtual void BeginSetClipRegion( ULONG nRects ); + virtual sal_uInt16 GetClipRegionType(); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( BOOL bVisible ); - virtual void Enable( BOOL nEnable ); + virtual void Show( sal_Bool bVisible ); + virtual void Enable( sal_Bool nEnable ); virtual void GrabFocus(); virtual void SetBackground(); @@ -99,6 +99,7 @@ public: virtual const SystemEnvData* GetSystemData() const; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; #endif // _SV_SALOBJ_H diff --git a/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h index 97776d931f6a..b39a4034fa4b 100644 --- a/vcl/unx/inc/salprn.h +++ b/vcl/unx/inc/salprn.h @@ -49,16 +49,16 @@ public: // overload all pure virtual methods virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual BOOL Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); - virtual BOOL SetPrinterData( ImplJobSetup* pSetupData ); - virtual BOOL SetData( ULONG nFlags, ImplJobSetup* pSetupData ); + virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); + virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); + virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ); - virtual ULONG GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType ); - virtual ULONG GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin ); + virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); + virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); + virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -72,11 +72,12 @@ public: bool m_bFax:1; bool m_bPdf:1; bool m_bSwallowFaxNo:1; + bool m_bIsPDFWriterJob:1; PspGraphics* m_pGraphics; psp::PrinterJob m_aPrintJob; psp::JobData m_aJobData; psp::PrinterGfx m_aPrinterGfx; - ULONG m_nCopies; + sal_uIntPtr m_nCopies; bool m_bCollate; SalInfoPrinter* m_pInfoPrinter; @@ -85,18 +86,23 @@ public: // overload all pure virtual methods using SalPrinter::StartJob; - virtual BOOL StartJob( const XubString* pFileName, + virtual sal_Bool StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - ULONG nCopies, + sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); - virtual BOOL EndJob(); - virtual BOOL AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData ); - virtual BOOL EndPage(); - virtual ULONG GetErrorCode(); + virtual sal_Bool StartJob( const String*, + const String&, + const String&, + ImplJobSetup*, + vcl::PrinterController& i_rController ); + virtual sal_Bool EndJob(); + virtual sal_Bool AbortJob(); + virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); + virtual sal_Bool EndPage(); + virtual sal_uIntPtr GetErrorCode(); }; #endif // _SV_SALPRN_H diff --git a/vcl/unx/inc/saltimer.h b/vcl/unx/inc/saltimer.h index 7442f307c2c7..9820ba32d40c 100644 --- a/vcl/unx/inc/saltimer.h +++ b/vcl/unx/inc/saltimer.h @@ -38,7 +38,7 @@ public: virtual ~X11SalTimer(); // overload all pure virtual methods - void Start( ULONG nMS ); + void Start( sal_uIntPtr nMS ); void Stop(); }; diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h index c0620d812f63..1c331d06b9e8 100644 --- a/vcl/unx/inc/salunx.h +++ b/vcl/unx/inc/salunx.h @@ -70,7 +70,7 @@ inline int operator == ( const timeval &t1, const timeval &t2 ) { if( t1.tv_sec == t2.tv_sec ) return t1.tv_usec == t2.tv_usec; - return FALSE; + return sal_False; } inline timeval &operator -= ( timeval &t1, const timeval &t2 ) @@ -97,7 +97,7 @@ inline timeval &operator += ( timeval &t1, const timeval &t2 ) return t1; } -inline timeval &operator += ( timeval &t1, ULONG t2 ) +inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 ) { t1.tv_sec += t2 / 1000; t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500; @@ -115,7 +115,7 @@ inline timeval operator + ( const timeval &t1, const timeval &t2 ) return t0 += t2; } -inline timeval operator + ( const timeval &t1, ULONG t2 ) +inline timeval operator + ( const timeval &t1, sal_uIntPtr t2 ) { timeval t0 = t1; return t0 += t2; diff --git a/vcl/unx/inc/salvd.h b/vcl/unx/inc/salvd.h index e1c2b91d1627..9add5c261bbd 100644 --- a/vcl/unx/inc/salvd.h +++ b/vcl/unx/inc/salvd.h @@ -49,17 +49,17 @@ class X11SalVirtualDevice : public SalVirtualDevice int nDX_; int nDY_; - USHORT nDepth_; - BOOL bGraphics_; // is Graphics used - BOOL bExternPixmap_; + sal_uInt16 nDepth_; + sal_Bool bGraphics_; // is Graphics used + sal_Bool bExternPixmap_; public: X11SalVirtualDevice(); virtual ~X11SalVirtualDevice(); - BOOL Init( SalDisplay *pDisplay, + sal_Bool Init( SalDisplay *pDisplay, long nDX, long nDY, - USHORT nBitCount, + sal_uInt16 nBitCount, int nScreen, Pixmap hDrawable = None, XRenderPictFormat* pXRenderFormat = NULL ); @@ -67,9 +67,9 @@ public: inline Display *GetXDisplay() const; inline SalDisplay *GetDisplay() const; - inline BOOL IsDisplay() const; + inline sal_Bool IsDisplay() const; inline Pixmap GetDrawable() const { return hDrawable_; } - inline USHORT GetDepth() const { return nDepth_; } + inline sal_uInt16 GetDepth() const { return nDepth_; } int GetWidth() const { return nDX_; } int GetHeight() const { return nDY_; } int GetScreenNumber() const { return m_nScreen; } @@ -78,7 +78,7 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ); // Set new size, without saving the old contents - virtual BOOL SetSize( long nNewDX, long nNewDY ); + virtual sal_Bool SetSize( long nNewDX, long nNewDY ); virtual void GetSize( long& rWidth, long& rHeight ); }; @@ -93,7 +93,7 @@ inline Display *X11SalVirtualDevice::GetXDisplay() const inline SalDisplay *X11SalVirtualDevice::GetDisplay() const { return pDisplay_; } -inline BOOL X11SalVirtualDevice::IsDisplay() const +inline sal_Bool X11SalVirtualDevice::IsDisplay() const { return pDisplay_->IsDisplay(); } #endif diff --git a/vcl/unx/inc/soicon.hxx b/vcl/unx/inc/soicon.hxx index bf1810640b54..cb3302cb777b 100644 --- a/vcl/unx/inc/soicon.hxx +++ b/vcl/unx/inc/soicon.hxx @@ -32,8 +32,8 @@ class SalDisplay; class SalBitmap; class Bitmap; -BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen, - USHORT nIcon, USHORT iconSize, +sal_Bool SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen, + sal_uInt16 nIcon, sal_uInt16 iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask ); #endif diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx index 23235e479e75..c6ef6d98bca8 100644 --- a/vcl/unx/inc/wmadaptor.hxx +++ b/vcl/unx/inc/wmadaptor.hxx @@ -164,6 +164,8 @@ protected: bool m_bLegacyPartialFullscreen; int m_nWinGravity; int m_nInitWinGravity; + bool m_bWMshouldSwitchWorkspace; + bool m_bWMshouldSwitchWorkspaceInit; WMAdaptor( SalDisplay * ) ; @@ -176,6 +178,7 @@ protected: */ virtual bool isValid() const; + bool getWMshouldSwitchWorkspace() const; public: virtual ~WMAdaptor(); @@ -213,8 +216,9 @@ public: /* * attemp to switch the desktop to a certain workarea + * if bConsiderWM is true, then on some WMs the call will not result in any action */ - void switchToWorkArea( int nWorkArea ) const; + void switchToWorkArea( int nWorkArea, bool bConsiderWM = true ) const; /* * sets window title diff --git a/vcl/unx/inc/xfont.hxx b/vcl/unx/inc/xfont.hxx deleted file mode 100644 index 8fc118808ae3..000000000000 --- a/vcl/unx/inc/xfont.hxx +++ /dev/null @@ -1,165 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef EXTENDED_FONTSTRUCT_HXX -#define EXTENDED_FONTSTRUCT_HXX - -#ifndef _XLIB_H_ -#include <tools/prex.h> -#include <X11/Xlib.h> -#include <tools/postx.h> -#endif -#include <tools/ref.hxx> -#include <rtl/tencinfo.h> -#include <vcl/vclenum.hxx> -#include <vcl/sallayout.hxx> - -typedef unsigned short sal_MultiByte; - -class ImplFontMetricData; -class ExtendedXlfd; - -struct VerticalTextItem -{ - BOOL mbFixed; - XFontStruct* mpXFontStruct; - const sal_Unicode* mpString; - int mnLength; - int mnTransX; - int mnTransY; - int mnFixedAdvance; - int* mpAdvanceAry; - - VerticalTextItem( XFontStruct* pXFontStruct, - const sal_Unicode* pString, - int nLength, - int nTransX, - int nTransY, - int nFixedAdvance ) - : mbFixed( TRUE ), - mpXFontStruct( pXFontStruct ), - mpString( pString ), - mnLength( nLength ), - mnTransX( nTransX ), - mnTransY( nTransY ), - mnFixedAdvance( nFixedAdvance ) - {} - - VerticalTextItem( XFontStruct* pXFontStruct, - const sal_Unicode* pString, - int nLength, - int nTransX, - int nTransY, - int* pAdvanceAry ) - : mbFixed( FALSE ), - mpXFontStruct( pXFontStruct ), - mpString( pString ), - mnLength( nLength ), - mnTransX( nTransX ), - mnTransY( nTransY ), - mpAdvanceAry( pAdvanceAry ) - {} - - ~VerticalTextItem() - { - if (!mbFixed) - { - delete( mpAdvanceAry ); - } - } -}; - -class ExtendedFontStruct : public SvRefBase -{ - private: - Display* mpDisplay; - Size maPixelSize; - float mfXScale; - float mfYScale; - sal_Size mnDefaultWidth; - sal_Bool mbVertical; - rtl_TextEncoding mnCachedEncoding; - rtl_TextEncoding mnAsciiEncoding; - - ExtendedXlfd* mpXlfd; - XFontStruct** mpXFontStruct; - - // unicode range cache - mutable sal_uInt32* mpRangeCodes; - mutable int mnRangeCount; - - int LoadEncoding( rtl_TextEncoding nEncoding ); - FontPitch GetSpacing( rtl_TextEncoding nEncoding ); - bool GetFontBoundingBox( XCharStruct *pCharStruct, - int *pAscent, int *pDescent ) ; - - sal_Size GetDefaultWidth(); - sal_Size GetCharWidth8( sal_Unicode nFrom, sal_Unicode nTo, - sal_Int32 *pWidthArray, - rtl_TextEncoding nEncoding ); - sal_Size GetCharWidthUTF16( sal_Unicode nFrom, sal_Unicode nTo, - sal_Int32 *pWidthArray ); - sal_Size GetCharWidth16( sal_Unicode nFrom, sal_Unicode nTo, - sal_Int32 *pWidthArray, ExtendedFontStruct *pFallback ); - public: - ExtendedFontStruct( Display* pDisplay, - const Size& rPixelSize, sal_Bool bVertical, - ExtendedXlfd* pXlfd ); - ~ExtendedFontStruct(); - bool Match( const ExtendedXlfd *pXlfd, - const Size& rPixelSize, sal_Bool bVertical ) const; - XFontStruct* GetFontStruct( rtl_TextEncoding nEncoding ); - XFontStruct* GetFontStruct( sal_Unicode nChar, - rtl_TextEncoding *pEncoding ); - bool ToImplFontMetricData( ImplFontMetricData *pMetric ); - rtl_TextEncoding GetAsciiEncoding( int *pAsciiRange = NULL ) const; - sal_Size GetCharWidth( sal_Unicode, - sal_Int32* pPhysWidth, sal_Int32* pLogWidth ); - int GetFontCodeRanges( sal_uInt32* pCodePairs ) const; - bool HasUnicodeChar( sal_Unicode ) const; -}; - -// Declaration and Implementation for ExtendedFontStructRef: Add RefCounting -// to ExtendedFontStruct (it's not possible to separate decl and impl into -// a separate source file: all ref member functions are inline -SV_DECL_IMPL_REF( ExtendedFontStruct ); - -class X11FontLayout : public GenericSalLayout -{ -public: - X11FontLayout( ExtendedFontStruct& ); - virtual bool LayoutText( ImplLayoutArgs& ); - virtual void AdjustLayout( ImplLayoutArgs& ); - virtual void DrawText( SalGraphics& ) const; - -private: - ExtendedFontStruct& mrFont; -}; - -#endif /* EXTENDED_FONTSTRUCT_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |