diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 18:58:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 18:58:20 +0000 |
| commit | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (patch) | |
| tree | d25ddcc9b5bb33bef4832bd6e8702061a9887a53 /xkbcomp/indicators.h | |
| parent | e445df175688f07d599649591c990d432375c67e (diff) | |
| parent | dc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff) | |
| download | vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.gz vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.bz2 vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xkbcomp/indicators.h')
| -rw-r--r-- | xkbcomp/indicators.h | 85 |
1 files changed, 39 insertions, 46 deletions
diff --git a/xkbcomp/indicators.h b/xkbcomp/indicators.h index 041cacc17..35ae38a4c 100644 --- a/xkbcomp/indicators.h +++ b/xkbcomp/indicators.h @@ -1,4 +1,3 @@ -/* $Xorg: indicators.h,v 1.3 2000/08/17 19:54:32 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifndef INDICATORS_H #define INDICATORS_H 1 @@ -39,57 +37,52 @@ #define _LED_NotBound 255 -typedef struct _LEDInfo { - CommonInfo defs; - Atom name; - unsigned char indicator; - unsigned char flags; - unsigned char which_mods; - unsigned char real_mods; - unsigned short vmods; - unsigned char which_groups; - unsigned char groups; - unsigned int ctrls; +typedef struct _LEDInfo +{ + CommonInfo defs; + Atom name; + unsigned char indicator; + unsigned char flags; + unsigned char which_mods; + unsigned char real_mods; + unsigned short vmods; + unsigned char which_groups; + unsigned char groups; + unsigned int ctrls; } LEDInfo; -extern void ClearIndicatorMapInfo( - Display * /* dpy */, - LEDInfo * /* info */ -); +extern void ClearIndicatorMapInfo(Display * /* dpy */ , + LEDInfo * /* info */ + ); -extern LEDInfo *AddIndicatorMap( - LEDInfo * /* oldLEDs */, - LEDInfo * /* newLED */ -); +extern LEDInfo *AddIndicatorMap(LEDInfo * /* oldLEDs */ , + LEDInfo * /* newLED */ + ); -extern int SetIndicatorMapField( - LEDInfo * /* led */, - XkbDescPtr /* xkb */, - char * /* field */, - ExprDef * /* arrayNdx */, - ExprDef * /* value */ -); +extern int SetIndicatorMapField(LEDInfo * /* led */ , + XkbDescPtr /* xkb */ , + char * /* field */ , + ExprDef * /* arrayNdx */ , + ExprDef * /* value */ + ); -extern LEDInfo *HandleIndicatorMapDef( - IndicatorMapDef * /* stmt */, - XkbDescPtr /* xkb */, - LEDInfo * /* dflt */, - LEDInfo * /* oldLEDs */, - unsigned /* mergeMode */ -); +extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ , + XkbDescPtr /* xkb */ , + LEDInfo * /* dflt */ , + LEDInfo * /* oldLEDs */ , + unsigned /* mergeMode */ + ); -extern Bool CopyIndicatorMapDefs( - XkbFileInfo * /* result */, - LEDInfo * /* leds */, - LEDInfo ** /* unboundRtrn */ -); +extern Bool CopyIndicatorMapDefs(XkbFileInfo * /* result */ , + LEDInfo * /* leds */ , + LEDInfo ** /* unboundRtrn */ + ); -extern Bool BindIndicators( - XkbFileInfo * /* result */, - Bool /* force */, - LEDInfo * /* unbound */, - LEDInfo ** /* unboundRtrn */ -); +extern Bool BindIndicators(XkbFileInfo * /* result */ , + Bool /* force */ , + LEDInfo * /* unbound */ , + LEDInfo ** /* unboundRtrn */ + ); #endif /* INDICATORS_H */ |