Move STRINGIFY to utils.h and add STRINGIFY2

[platform/upstream/libxkbcommon.git] / src / xkbcomp / vmod.h

diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index e8833fc..546cf7e 100644 (file)
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -1,71 +1,34 @@
 /************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
- THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+ * Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of Silicon Graphics not be
+ * used in advertising or publicity pertaining to distribution
+ * of the software without specific prior written permission.
+ * Silicon Graphics makes no representation about the suitability
+ * of this software for any purpose. It is provided "as is"
+ * without any express or implied warranty.
+ *
+ * SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ * GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+ * THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  ********************************************************/
 
-#ifndef VMOD_H
-#define VMOD_H 1
-
-typedef struct _VModInfo
-{
-    struct xkb_desc * xkb;
-    unsigned defined;
-    unsigned available;
-    unsigned newlyDefined;
-    int errorCount;
-} VModInfo;
-
-extern void InitVModInfo(VModInfo * /* info */ ,
-                         struct xkb_desc *     /* xkb */
-    );
-
-extern void ClearVModInfo(VModInfo * /* info */ ,
-                          struct xkb_desc *    /* xkb */
-    );
-
-extern Bool HandleVModDef(VModDef * /* stmt */ ,
-                          unsigned /* mergeMode */ ,
-                          VModInfo *    /* info */
-    );
-
-extern Bool ApplyVModDefs(VModInfo * /* info */ ,
-                          struct xkb_desc *    /* xkb */
-    );
-
-extern int LookupVModMask(char * /* priv */ ,
-                          uint32_t /* elem */ ,
-                          uint32_t /* field */ ,
-                          unsigned /* type */ ,
-                          ExprResult *  /* val_rtrn */
-    );
-
-extern int FindKeypadVMod(struct xkb_desc *    /* xkb */
-    );
+#ifndef XKBCOMP_VMOD_H
+#define XKBCOMP_VMOD_H
 
-extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,
-                                   ExprResult * /* value_rtrn */ ,
-                                   VModInfo *   /* info */
-    );
+bool
+HandleVModDef(struct xkb_context *ctx, struct xkb_mod_set *mods,
+              VModDef *stmt, enum merge_mode merge);
 
-#endif /* VMOD_H */
+#endif