diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-02-16 20:01:18 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-02-17 22:52:08 +0200 |
| commit | fbd776894658e7afb2c55dc8582b2a3efab78a3c (patch) | |
| tree | 0879ce2f27f34ff86aea76647ea1556724658da7 /xkb/xkbActions.c | |
| parent | e5f002eddef1abe324033a3155f01d048536a48d (diff) | |
XKB: Ditch XkbFileInfo
Sorry about the megacommit, but this touches on a lot of stuff.
Get rid of XkbFileInfo, which was pretty seriously redundant, and move the
only useful thing it had (defined) into XkbDescRec. defined will be removed
pretty soon anyway. Is the compat map pointer non-NULL? Then you have a
compat map, congratulations! Anyhow, I digress.
All functions that took an XkbFileInfoPtr now take an XkbDescPtr, _except_
XkmReadFile, which returns an XkbDescPtr *, because people want to deal in
XkbDescPtrs, not XkbDescRecs.
Diffstat (limited to 'xkb/xkbActions.c')
| -rw-r--r-- | xkb/xkbActions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 2aacc8ca6..890cf4250 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -843,7 +843,7 @@ _XkbFilterRedirectKey( XkbSrvInfoPtr xkbi, unsigned keycode, XkbAction * pAction) { -unsigned realMods; +unsigned realMods = 0; xEvent ev; int x,y; XkbStateRec old; @@ -1145,7 +1145,7 @@ void XkbHandleActions(DeviceIntPtr dev,DeviceIntPtr kbd,xEvent *xE,int count) { int key,bit,i; -CARD8 realMods; +CARD8 realMods = 0; XkbSrvInfoPtr xkbi; KeyClassPtr keyc; int changed,sendEvent; |