aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/vmod.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 18:58:20 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 18:58:20 +0000
commite2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (patch)
treed25ddcc9b5bb33bef4832bd6e8702061a9887a53 /xkbcomp/vmod.h
parente445df175688f07d599649591c990d432375c67e (diff)
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.gz
vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.bz2
vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xkbcomp/vmod.h')
-rw-r--r--xkbcomp/vmod.h85
1 files changed, 38 insertions, 47 deletions
diff --git a/xkbcomp/vmod.h b/xkbcomp/vmod.h
index 231d2c8ba..559b9d504 100644
--- a/xkbcomp/vmod.h
+++ b/xkbcomp/vmod.h
@@ -1,4 +1,3 @@
-/* $Xorg: vmod.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,64 +23,56 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef VMOD_H
#define VMOD_H 1
-typedef struct _VModInfo {
- XkbDescPtr xkb;
- unsigned defined;
- unsigned available;
- unsigned newlyDefined;
- int errorCount;
+typedef struct _VModInfo
+{
+ XkbDescPtr xkb;
+ unsigned defined;
+ unsigned available;
+ unsigned newlyDefined;
+ int errorCount;
} VModInfo;
-extern void InitVModInfo(
- VModInfo * /* info */,
- XkbDescPtr /* xkb */
-);
+extern void InitVModInfo(VModInfo * /* info */ ,
+ XkbDescPtr /* xkb */
+ );
-extern void ClearVModInfo(
- VModInfo * /* info */,
- XkbDescPtr /* xkb */
-);
+extern void ClearVModInfo(VModInfo * /* info */ ,
+ XkbDescPtr /* xkb */
+ );
-extern Bool HandleVModDef(
- VModDef * /* stmt */,
- unsigned /* mergeMode */,
- VModInfo * /* info */
-);
+extern Bool HandleVModDef(VModDef * /* stmt */ ,
+ unsigned /* mergeMode */ ,
+ VModInfo * /* info */
+ );
-extern Bool ApplyVModDefs(
- VModInfo * /* info */,
- XkbDescPtr /* xkb */
-);
+extern Bool ApplyVModDefs(VModInfo * /* info */ ,
+ XkbDescPtr /* xkb */
+ );
-extern int LookupVModIndex(
- XPointer /* priv */,
- Atom /* elem */,
- Atom /* field */,
- unsigned /* type */,
- ExprResult * /* val_rtrn */
-);
+extern int LookupVModIndex(XPointer /* priv */ ,
+ Atom /* elem */ ,
+ Atom /* field */ ,
+ unsigned /* type */ ,
+ ExprResult * /* val_rtrn */
+ );
-extern int LookupVModMask(
- XPointer /* priv */,
- Atom /* elem */,
- Atom /* field */,
- unsigned /* type */,
- ExprResult * /* val_rtrn */
-);
+extern int LookupVModMask(XPointer /* priv */ ,
+ Atom /* elem */ ,
+ Atom /* field */ ,
+ unsigned /* type */ ,
+ ExprResult * /* val_rtrn */
+ );
-extern int FindKeypadVMod(
- XkbDescPtr /* xkb */
-);
+extern int FindKeypadVMod(XkbDescPtr /* xkb */
+ );
-extern Bool ResolveVirtualModifier(
- ExprDef * /* def */,
- ExprResult * /* value_rtrn */,
- VModInfo * /* info */
-);
+extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,
+ ExprResult * /* value_rtrn */ ,
+ VModInfo * /* info */
+ );
#endif /* VMOD_H */