diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/xkb/xkbPrKeyEv.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkb/xkbPrKeyEv.c')
| -rw-r--r-- | xorg-server/xkb/xkbPrKeyEv.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xorg-server/xkb/xkbPrKeyEv.c b/xorg-server/xkb/xkbPrKeyEv.c index 69c218c8c..a3f715c7d 100644 --- a/xorg-server/xkb/xkbPrKeyEv.c +++ b/xorg-server/xkb/xkbPrKeyEv.c @@ -39,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "exevents.h" #include <xkbsrv.h> #include <ctype.h> -#define EXTENSION_EVENT_BASE 64 /***====================================================================***/ @@ -57,7 +56,7 @@ int xiEvent; key= xE->u.u.detail; xiEvent= (xE->u.u.type & EXTENSION_EVENT_BASE); if (xkbDebugFlags&0x8) { - DebugF("XkbPKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up")); + DebugF("[xkb] XkbPKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up")); } if ( (xkbi->repeatKey==key) && (xE->u.u.type==KeyRelease) && @@ -160,7 +159,7 @@ int xiEvent; } rg->currentDown= key; } - else ErrorF("InternalError! Illegal radio group %d\n",ndx); + else ErrorF("[xkb] InternalError! Illegal radio group %d\n",ndx); break; case XkbKB_Overlay1: case XkbKB_Overlay2: { @@ -180,7 +179,7 @@ int xiEvent; } break; default: - ErrorF("unknown key behavior 0x%04x\n",behavior.type); + ErrorF("[xkb] unknown key behavior 0x%04x\n",behavior.type); break; } } @@ -223,8 +222,8 @@ ProcessKeyboardEvent(xEvent *xE,DeviceIntPtr keybd,int count) AccessXFilterPressEvent(xE, keybd, count); else if (is_release) AccessXFilterReleaseEvent(xE, keybd, count); - } - else { + + } else { XkbProcessKeyboardEvent(xE, keybd, count); } |