Hash :
6a84a34d
Author :
Date :
2009-04-08T07:46:25
Remove all non-public API from XKBcommon.h header The noble intention was to expose all the new API and new generic types in the split out kbproto headers through XKBcommon.h. It turns out that would be a massive amount of work in the server. Someday, but first just wedging in XkbCompileKeymap* would be good. Most of the API is in new internal xkb*.h headers. In order to allow the XKBcommon.h header to be used from the server, we can't pull in other headers from kbproto since the server has its own copies. However, types that are different (XkbDescRec, XkbAction) still have Xkbc equivalents here, and I think they should be used in the server.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270
/************************************************************
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.
********************************************************/
#define DEBUG_VAR debugFlags
#include <stdio.h>
#include "xkbcomp.h"
#include "xkballoc.h"
#include "xkbmisc.h"
#include "tokens.h"
#include "expr.h"
#include "misc.h"
#include <X11/extensions/XKB.h>
#include <X11/extensions/XKBstrcommon.h>
#include "vmod.h"
void
InitVModInfo(VModInfo * info, XkbcDescPtr xkb)
{
ClearVModInfo(info, xkb);
info->errorCount = 0;
return;
}
void
ClearVModInfo(VModInfo * info, XkbcDescPtr xkb)
{
register int i;
if (XkbcAllocNames(xkb, XkbVirtualModNamesMask, 0, 0) != Success)
return;
if (XkbcAllocServerMap(xkb, XkbVirtualModsMask, 0) != Success)
return;
info->xkb = xkb;
info->newlyDefined = info->defined = info->available = 0;
if (xkb && xkb->names)
{
register int bit;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
{
if (xkb->names->vmods[i] != None)
info->defined |= bit;
}
}
return;
}
/***====================================================================***/
/**
* Handle one entry in the virtualModifiers line (e.g. NumLock).
* If the entry is e.g. NumLock=Mod1, stmt->value is not NULL, and the
* XkbServerMap's vmod is set to the given modifier. Otherwise, the vmod is 0.
*
* @param stmt The statement specifying the name and (if any the value).
* @param mergeMode Merge strategy (e.g. MergeOverride)
*/
Bool
HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info)
{
register int i, bit, nextFree;
ExprResult mod;
XkbcServerMapPtr srv;
XkbNamesPtr names;
Atom stmtName;
srv = info->xkb->server;
names = info->xkb->names;
stmtName = XkbcInternAtom(XkbcAtomGetString(stmt->name), False);
for (i = 0, bit = 1, nextFree = -1; i < XkbNumVirtualMods; i++, bit <<= 1)
{
if (info->defined & bit)
{
if (names->vmods[i] == stmtName)
{ /* already defined */
info->available |= bit;
if (stmt->value == NULL)
return True;
else
{
char *str1;
const char *str2 = "";
if (!ExprResolveModMask(stmt->value, &mod, NULL, NULL))
{
str1 = XkbcAtomText(stmt->name);
ACTION("Declaration of %s ignored\n", str1);
return False;
}
if (mod.uval == srv->vmods[i])
return True;
str1 = XkbcAtomText(stmt->name);
WARN("Virtual modifier %s multiply defined\n", str1);
str1 = XkbcModMaskText(srv->vmods[i], True);
if (mergeMode == MergeOverride)
{
str2 = str1;
str1 = XkbcModMaskText(mod.uval, True);
}
ACTION("Using %s, ignoring %s\n", str1, str2);
if (mergeMode == MergeOverride)
srv->vmods[i] = mod.uval;
return True;
}
}
}
else if (nextFree < 0)
nextFree = i;
}
if (nextFree < 0)
{
ERROR("Too many virtual modifiers defined (maximum %d)\n",
XkbNumVirtualMods);
return False;
}
info->defined |= (1 << nextFree);
info->newlyDefined |= (1 << nextFree);
info->available |= (1 << nextFree);
names->vmods[nextFree] = stmtName;
if (stmt->value == NULL)
return True;
if (ExprResolveModMask(stmt->value, &mod, NULL, NULL))
{
srv->vmods[nextFree] = mod.uval;
return True;
}
ACTION("Declaration of %s ignored\n",
XkbcAtomText(stmt->name));
return False;
}
/**
* Returns the index of the given modifier in the xkb->names->vmods array.
*
* @param priv Pointer to the xkb data structure.
* @param elem Must be None, otherwise return False.
* @param field The Atom of the modifier's name (e.g. Atom for LAlt)
* @param type Must be TypeInt, otherwise return False.
* @param val_rtrn Set to the index of the modifier that matches.
*
* @return True on success, False otherwise. If False is returned, val_rtrn is
* undefined.
*/
int
LookupVModIndex(char * priv,
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
register int i;
register char *fieldStr;
register char *modStr;
XkbcDescPtr xkb;
xkb = (XkbcDescPtr) priv;
if ((xkb == NULL) || (xkb->names == NULL) || (elem != None)
|| (type != TypeInt))
{
return False;
}
/* get the actual name */
fieldStr = XkbcAtomGetString(field);
if (fieldStr == NULL)
return False;
/* For each named modifier, get the name and compare it to the one passed
* in. If we get a match, return the index of the modifier.
* The order of modifiers is the same as in the virtual_modifiers line in
* the xkb_types section.
*/
for (i = 0; i < XkbNumVirtualMods; i++)
{
modStr = XkbcAtomGetString(xkb->names->vmods[i]);
if ((modStr != NULL) && (uStrCaseCmp(fieldStr, modStr) == 0))
{
val_rtrn->uval = i;
return True;
}
}
return False;
}
/**
* Get the mask for the given modifier and set val_rtrn.uval to the mask.
* Note that the mask returned is always > 512.
*
* @param priv Pointer to xkb data structure.
* @param val_rtrn Set to the mask returned.
*
* @return True on success, False otherwise. If False is returned, val_rtrn is
* undefined.
*/
int
LookupVModMask(char * priv,
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
if (LookupVModIndex(priv, elem, field, type, val_rtrn))
{
register unsigned ndx = val_rtrn->uval;
val_rtrn->uval = (1 << (XkbNumModifiers + ndx));
return True;
}
return False;
}
int
FindKeypadVMod(XkbcDescPtr xkb)
{
Atom name;
ExprResult rtrn;
name = XkbcInternAtom("NumLock", False);
if ((xkb) && LookupVModIndex((char *) xkb, None, name, TypeInt, &rtrn))
{
return rtrn.ival;
}
return -1;
}
Bool
ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info)
{
XkbNamesPtr names;
names = info->xkb->names;
if (def->op == ExprIdent)
{
register int i, bit;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
{
char *str1, *str2;
str1 = XkbcAtomGetString(names->vmods[i]);
str2 = XkbcAtomGetString(def->value.str);
if ((info->available & bit) && (uStrCaseCmp(str1, str2) == Equal))
{
val_rtrn->uval = i;
return True;
}
}
}
if (ExprResolveInteger(def, val_rtrn, NULL, NULL))
{
if (val_rtrn->uval < XkbNumVirtualMods)
return True;
ERROR("Illegal virtual modifier %d (must be 0..%d inclusive)\n",
val_rtrn->uval, XkbNumVirtualMods - 1);
}
return False;
}