frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: split out keymap compilation. 

Refactoring for simpler double-use in the next patch. No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
This commit is contained in:
Peter Hutterer 2011-02-10 15:11:34 +10:00
parent 787ba25a8a
commit 47d1d2fed6
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
xkb/ddxLoad.c
View File

@ -425,35 +425,58 @@ XkbRF_RulesPtr rules;
return complete; return complete;
} }
XkbDescPtr static Bool
XkbCompileKeymap(DeviceIntPtr dev, XkbRMLVOSet *rmlvo) XkbRMLVOtoKcCGST(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, XkbComponentNamesPtr kccgst)
{ {
XkbComponentNamesRec kccgst;
XkbRF_VarDefsRec mlvo; XkbRF_VarDefsRec mlvo;
XkbDescPtr xkb;
char name[PATH_MAX];
if (!dev || !rmlvo) {
LogMessage(X_ERROR, "XKB: No device or RMLVO specified\n");
return NULL;
}
mlvo.model = rmlvo->model; mlvo.model = rmlvo->model;
mlvo.layout = rmlvo->layout; mlvo.layout = rmlvo->layout;
mlvo.variant = rmlvo->variant; mlvo.variant = rmlvo->variant;
mlvo.options = rmlvo->options; mlvo.options = rmlvo->options;
/* XDNFR already logs for us. */ return XkbDDXNamesFromRules(dev, rmlvo->rules, &mlvo, kccgst);
if (!XkbDDXNamesFromRules(dev, rmlvo->rules, &mlvo, &kccgst)) }
/**
* Compile the given RMLVO keymap and return it. Returns the XkbDescPtr on
* success or NULL on failure. If the components compiled are not a superset
* or equal to need, the compiliation is treated as failure.
*/
static XkbDescPtr
XkbCompileKeymapForDevice(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, int need)
{
XkbDescPtr xkb;
unsigned int provided;
XkbComponentNamesRec kccgst;
char name[PATH_MAX];
if (!XkbRMLVOtoKcCGST(dev, rmlvo, &kccgst))
return NULL; return NULL;
/* XDLKBN too, but it might return 0 as well as allocating. */ provided = XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, need,
if (!XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, 0, &xkb, name, &xkb, name, PATH_MAX);
PATH_MAX)) { if ((need & provided) != need) {
if (xkb) if (xkb) {
XkbFreeKeyboard(xkb, 0, TRUE); XkbFreeKeyboard(xkb, 0, TRUE);
return NULL; xkb = NULL;
}
} }
return xkb; return xkb;
} }
XkbDescPtr
XkbCompileKeymap(DeviceIntPtr dev, XkbRMLVOSet *rmlvo)
{
XkbDescPtr xkb;
if (!dev || !rmlvo) {
LogMessage(X_ERROR, "XKB: No device or RMLVO specified\n");
return NULL;
}
xkb = XkbCompileKeymapForDevice(dev, rmlvo, 0);
return xkb;
}