diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 16:59:30 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 16:59:30 +0000 |
| commit | 2f382d6c2579a25c68dbd121af7f1f5dc7ec9852 (patch) | |
| tree | 8c6c555a872e6812cd3f76de570b06683526ad14 /vcl/unx/inc/saldisp.hxx | |
| parent | f7a0cc83bb59efd6abd820bd78acc75e8313ea4e (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'vcl/unx/inc/saldisp.hxx')
| -rw-r--r-- | vcl/unx/inc/saldisp.hxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index 6ba5f39ef32f..9deb3362224c 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: saldisp.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: pl $ $Date: 2002-09-18 14:24:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 17:58:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -263,22 +263,24 @@ class SalXLib timeval Timeout_; ULONG nTimeoutMS_; + int pTimeoutFDS_[2]; + int nStateOfYield_; BOOL bWasXError_; BOOL bIgnoreXErrors_; + int nFDs_; - fd_set *pReadFDS_; - fd_set *pExceptionFDS_; + fd_set aReadFDS_; + fd_set aExceptionFDS_; YieldEntry *pYieldEntries_; - void CheckTimeout(); - public: SalXLib(); ~SalXLib(); void Init( int *pArgc, char *ppArgv[] ); void Yield( BOOL bWait ); + void Wakeup(); void Insert( int fd, void* data, YieldFunc pending, @@ -294,6 +296,8 @@ public: inline void StartTimer( ULONG nMS ); inline void StopTimer(); + + bool CheckTimeout( bool bExecuteTimers = true ); }; // -=-= SalXEvent =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -478,6 +482,7 @@ public: ULONG GetImageDepths() const { return nImageDepths_; } ULONG SupportsShm() const { return nSharedImages_; } void DisableShm() { nSharedImages_ /= 2; } // = 0 + void GetScreenFontResolution( long& rDPIX, long& rDPIY ) const; BOOL MouseCaptured( const SalFrameData *pFrameData ) const { return pCapture_ == pFrameData; } |