diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2004-11-02 23:06:25 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2004-11-02 23:06:25 +0000 |
| commit | 4d431bbaae40a5a99988c4d8e7d5d33dc717710f (patch) | |
| tree | 553fa8bdba0c1bc2f8f5c4de2c40c9dd126a6558 /libxklavier/xklavier_private.h | |
| parent | 2fc330af2405d304aa79457a4e43a1d6e709cd70 (diff) | |
| download | libxklavier-4d431bbaae40a5a99988c4d8e7d5d33dc717710f.tar.gz | |
virtualizing xkb functions into vtable. preparing 1.11
Diffstat (limited to 'libxklavier/xklavier_private.h')
| -rw-r--r-- | libxklavier/xklavier_private.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libxklavier/xklavier_private.h b/libxklavier/xklavier_private.h index 7025661..78a2d04 100644 --- a/libxklavier/xklavier_private.h +++ b/libxklavier/xklavier_private.h @@ -15,6 +15,8 @@ typedef Bool ( *XklConfigWriteFileHandler )( const char *fileName, const XklConfigRecPtr data, const Bool binary ); +typedef int ( *XklEventHandler )( XEvent *xev ); + typedef void ( *XklFreeAllInfoHandler )( void ); typedef const char **( *XklGetGroupNamesHandler )( void ); @@ -27,12 +29,15 @@ typedef void ( *XklLockGroupHandler )( int group ); typedef int ( *XklPauseResumeListenHandler )( void ); +typedef void ( *XklSetIndicatorsHandler )( const XklState *windowState ); + typedef struct { XklConfigActivateHandler xklConfigActivateHandler; XklConfigInitHandler xklConfigInitHandler; /* private */ XklConfigMultipleLayoutsSupportedHandler xklConfigMultipleLayoutsSupportedHandler; XklConfigWriteFileHandler xklConfigWriteFileHandler; + XklEventHandler xklEventHandler; XklFreeAllInfoHandler xklFreeAllInfoHandler; /* private */ XklGetGroupNamesHandler xklGetGroupNamesHandler; XklGetNumGroupsHandler xklGetNumGroupsHandler; @@ -40,6 +45,7 @@ typedef struct XklLockGroupHandler xklLockGroupHandler; XklPauseResumeListenHandler xklPauseListenHandler; XklPauseResumeListenHandler xklResumeListenHandler; + XklSetIndicatorsHandler xklSetIndicatorsHandler; /* private */ } XklVTable; extern void _XklEnsureVTableInited( void ); @@ -143,13 +149,10 @@ extern char *_xklIndicatorNames[]; #define XKLAVIER_STATE 2 #define XKLAVIER_TRANSPARENT 3 -#ifdef XKB_HEADERS_PRESENT - #define XKB_RF_NAMES_PROP_ATOM 4 - #define XKB_RF_NAMES_PROP_ATOM_BACKUP 5 - #define TOTAL_ATOMS 6 -#else - #define TOTAL_ATOMS 4 -#endif +// XKB ones +#define XKB_RF_NAMES_PROP_ATOM 4 +#define XKB_RF_NAMES_PROP_ATOM_BACKUP 5 +#define TOTAL_ATOMS 6 #define XKLAVIER_STATE_PROP_LENGTH 2 |