parent
eff72fab5d
commit
744527e9a9
|
@ -3592,11 +3592,11 @@ CopySectionDef(struct xkb_geometry * geom, SectionInfo * si, GeometryInfo * info
|
|||
key->shape_ndx = 0;
|
||||
else
|
||||
{
|
||||
ShapeInfo *si;
|
||||
si = FindShape(info, ki->shape, "key", keyText(ki));
|
||||
if (!si)
|
||||
ShapeInfo *shapei;
|
||||
shapei = FindShape(info, ki->shape, "key", keyText(ki));
|
||||
if (!shapei)
|
||||
return False;
|
||||
key->shape_ndx = si->index;
|
||||
key->shape_ndx = shapei->index;
|
||||
}
|
||||
if (ki->color != None)
|
||||
color =
|
||||
|
|
|
@ -1678,7 +1678,7 @@ FindKeyForSymbol(struct xkb_desc * xkb, uint32_t sym, xkb_keycode_t *kc_rtrn)
|
|||
if (j < (int) XkbKeyNumSyms(xkb, i))
|
||||
{
|
||||
gotOne = True;
|
||||
if ((XkbKeySym(xkb, i, j) == sym))
|
||||
if (XkbKeySym(xkb, i, j) == sym)
|
||||
{
|
||||
*kc_rtrn = i;
|
||||
return True;
|
||||
|
|
|
@ -114,7 +114,7 @@ uError(const char *s, ...);
|
|||
|
||||
#define FATAL uFatalError
|
||||
|
||||
extern __ATTR_PRINTF(1, 2) void
|
||||
extern __ATTR_PRINTF(1, 2) _X_NORETURN void
|
||||
uFatalError(const char *s, ...);
|
||||
|
||||
/* WSGO stands for "Weird Stuff Going On" (wtf???) */
|
||||
|
|
Loading…
Reference in New Issue