xkb: unify ErrorFs. Prefix all with [xkb].
Output for XkbUseMsg intentionally skipped.
This commit is contained in:
parent
8b508f5d6b
commit
bfc89c0355
@ -141,12 +141,12 @@ Atom name;
|
|||||||
duration= oldDuration= ctrl->bell_duration;
|
duration= oldDuration= ctrl->bell_duration;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags>1)
|
if (xkbDebugFlags>1)
|
||||||
ErrorF("beep: %d (count= %d)\n",xkbInfo->beepType,xkbInfo->beepCount);
|
ErrorF("[xkb] beep: %d (count= %d)\n",xkbInfo->beepType,xkbInfo->beepCount);
|
||||||
#endif
|
#endif
|
||||||
name= None;
|
name= None;
|
||||||
switch (xkbInfo->beepType) {
|
switch (xkbInfo->beepType) {
|
||||||
default:
|
default:
|
||||||
ErrorF("Unknown beep type %d\n",xkbInfo->beepType);
|
ErrorF("[xkb] Unknown beep type %d\n",xkbInfo->beepType);
|
||||||
case _BEEP_NONE:
|
case _BEEP_NONE:
|
||||||
duration= 0;
|
duration= 0;
|
||||||
break;
|
break;
|
||||||
|
@ -49,7 +49,7 @@ int realRepeat;
|
|||||||
ctrl->autoRepeat= 0;
|
ctrl->autoRepeat= 0;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags&0x4) {
|
if (xkbDebugFlags&0x4) {
|
||||||
ErrorF("XkbDDXKeybdCtrlProc: setting repeat to %d (real repeat is %d)\n",
|
ErrorF("[xkb] XkbDDXKeybdCtrlProc: setting repeat to %d (real repeat is %d)\n",
|
||||||
ctrl->autoRepeat,realRepeat);
|
ctrl->autoRepeat,realRepeat);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -44,7 +44,7 @@ XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic)
|
|||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags)
|
if (xkbDebugFlags)
|
||||||
ErrorF("Click.\n");
|
ErrorF("[xkb] Click.\n");
|
||||||
#endif
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -200,10 +200,10 @@ char tmpname[PATH_MAX];
|
|||||||
in= Popen(buf,"r");
|
in= Popen(buf,"r");
|
||||||
#else
|
#else
|
||||||
#ifdef DEBUG_CMD
|
#ifdef DEBUG_CMD
|
||||||
ErrorF("xkb executes: %s\n",buf);
|
ErrorF("[xkb] xkb executes: %s\n",buf);
|
||||||
#endif
|
#endif
|
||||||
if (System(buf) < 0)
|
if (System(buf) < 0)
|
||||||
ErrorF("Could not invoke keymap compiler\n");
|
ErrorF("[xkb] Could not invoke keymap compiler\n");
|
||||||
else
|
else
|
||||||
in= fopen(tmpname, "r");
|
in= fopen(tmpname, "r");
|
||||||
#endif
|
#endif
|
||||||
@ -271,7 +271,7 @@ char tmpname[PATH_MAX];
|
|||||||
fclose(in);
|
fclose(in);
|
||||||
else if ((rval=Pclose(in))!=0) {
|
else if ((rval=Pclose(in))!=0) {
|
||||||
if (xkbDebugFlags)
|
if (xkbDebugFlags)
|
||||||
ErrorF("xkbcomp returned exit code %d\n",rval);
|
ErrorF("[xkb] xkbcomp returned exit code %d\n",rval);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
fclose(in);
|
fclose(in);
|
||||||
|
@ -134,11 +134,11 @@ Win32System(const char *cmdline)
|
|||||||
0,
|
0,
|
||||||
NULL ))
|
NULL ))
|
||||||
{
|
{
|
||||||
ErrorF("Starting '%s' failed!\n", cmdline);
|
ErrorF("[xkb] Starting '%s' failed!\n", cmdline);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ErrorF("Starting '%s' failed: %s", cmdline, (char *)buffer);
|
ErrorF("[xkb] Starting '%s' failed: %s", cmdline, (char *)buffer);
|
||||||
LocalFree(buffer);
|
LocalFree(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -258,12 +258,12 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
|
|||||||
}
|
}
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags) {
|
if (xkbDebugFlags) {
|
||||||
ErrorF("XkbDDXCompileNamedKeymap compiling keymap using:\n");
|
ErrorF("[xkb] XkbDDXCompileNamedKeymap compiling keymap using:\n");
|
||||||
ErrorF(" \"cmd\"\n");
|
ErrorF("[xkb] \"cmd\"\n");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef DEBUG_CMD
|
#ifdef DEBUG_CMD
|
||||||
ErrorF("xkb executes: %s\n",cmd);
|
ErrorF("[xkb] xkb executes: %s\n",cmd);
|
||||||
#endif
|
#endif
|
||||||
if (System(cmd)==0) {
|
if (System(cmd)==0) {
|
||||||
if (nameRtrn) {
|
if (nameRtrn) {
|
||||||
@ -277,7 +277,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
|
|||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
ErrorF("Error compiling keymap (%s)\n",names->keymap);
|
ErrorF("[xkb] Error compiling keymap (%s)\n",names->keymap);
|
||||||
#endif
|
#endif
|
||||||
if (outFile!=NULL)
|
if (outFile!=NULL)
|
||||||
_XkbFree(outFile);
|
_XkbFree(outFile);
|
||||||
@ -305,7 +305,7 @@ char tmpname[PATH_MAX];
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (strlen(names->keymap) > PATH_MAX - 1) {
|
if (strlen(names->keymap) > PATH_MAX - 1) {
|
||||||
ErrorF("name of keymap (%s) exceeds max length\n", names->keymap);
|
ErrorF("[xkb] name of keymap (%s) exceeds max length\n", names->keymap);
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
strcpy(keymap,names->keymap);
|
strcpy(keymap,names->keymap);
|
||||||
@ -360,7 +360,7 @@ char tmpname[PATH_MAX];
|
|||||||
if (out!=NULL) {
|
if (out!=NULL) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags) {
|
if (xkbDebugFlags) {
|
||||||
ErrorF("XkbDDXCompileKeymapByNames compiling keymap:\n");
|
ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
|
||||||
XkbWriteXKBKeymapForNames(stderr,names,NULL,xkb,want,need);
|
XkbWriteXKBKeymapForNames(stderr,names,NULL,xkb,want,need);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -372,10 +372,10 @@ char tmpname[PATH_MAX];
|
|||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
#ifdef DEBUG_CMD
|
#ifdef DEBUG_CMD
|
||||||
ErrorF("xkb executes: %s\n",buf);
|
ErrorF("[xkb] xkb executes: %s\n",buf);
|
||||||
ErrorF("xkbcomp input:\n");
|
ErrorF("[xkb] xkbcomp input:\n");
|
||||||
XkbWriteXKBKeymapForNames(stderr,names,NULL,xkb,want,need);
|
XkbWriteXKBKeymapForNames(stderr,names,NULL,xkb,want,need);
|
||||||
ErrorF("end xkbcomp input\n");
|
ErrorF("[xkb] end xkbcomp input\n");
|
||||||
#endif
|
#endif
|
||||||
if (nameRtrn) {
|
if (nameRtrn) {
|
||||||
strncpy(nameRtrn,keymap,nameRtrnLen);
|
strncpy(nameRtrn,keymap,nameRtrnLen);
|
||||||
@ -387,7 +387,7 @@ char tmpname[PATH_MAX];
|
|||||||
}
|
}
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
else
|
else
|
||||||
ErrorF("Error compiling keymap (%s)\n",keymap);
|
ErrorF("[xkb] Error compiling keymap (%s)\n",keymap);
|
||||||
#endif
|
#endif
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
/* remove the temporary file */
|
/* remove the temporary file */
|
||||||
@ -397,9 +397,9 @@ char tmpname[PATH_MAX];
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
else {
|
else {
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
ErrorF("Could not invoke keymap compiler\n");
|
ErrorF("[xkb] Could not invoke keymap compiler\n");
|
||||||
#else
|
#else
|
||||||
ErrorF("Could not open file %s\n", tmpname);
|
ErrorF("[xkb] Could not open file %s\n", tmpname);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -478,7 +478,7 @@ unsigned missing;
|
|||||||
}
|
}
|
||||||
else if (!XkbDDXCompileNamedKeymap(xkb,names,nameRtrn,nameRtrnLen)) {
|
else if (!XkbDDXCompileNamedKeymap(xkb,names,nameRtrn,nameRtrnLen)) {
|
||||||
#ifdef NOISY
|
#ifdef NOISY
|
||||||
ErrorF("Couldn't compile keymap file\n");
|
ErrorF("[xkb] Couldn't compile keymap file\n");
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -486,7 +486,7 @@ unsigned missing;
|
|||||||
else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
|
else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
|
||||||
nameRtrn,nameRtrnLen)){
|
nameRtrn,nameRtrnLen)){
|
||||||
#ifdef NOISY
|
#ifdef NOISY
|
||||||
ErrorF("Couldn't compile keymap file\n");
|
ErrorF("[xkb] Couldn't compile keymap file\n");
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -504,7 +504,7 @@ unsigned missing;
|
|||||||
}
|
}
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
else if (xkbDebugFlags) {
|
else if (xkbDebugFlags) {
|
||||||
ErrorF("Loaded %s, defined=0x%x\n",fileName,finfoRtrn->defined);
|
ErrorF("[xkb] Loaded %s, defined=0x%x\n",fileName,finfoRtrn->defined);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
36
xkb/xkb.c
36
xkb/xkb.c
@ -170,7 +170,7 @@ ProcXkbUseExtension(ClientPtr client)
|
|||||||
client->vMinor= stuff->wantedMinor;
|
client->vMinor= stuff->wantedMinor;
|
||||||
}
|
}
|
||||||
else if (xkbDebugFlags&0x1) {
|
else if (xkbDebugFlags&0x1) {
|
||||||
ErrorF("Rejecting client %d (0x%lx) (wants %d.%02d, have %d.%02d)\n",
|
ErrorF("[xkb] Rejecting client %d (0x%lx) (wants %d.%02d, have %d.%02d)\n",
|
||||||
client->index,
|
client->index,
|
||||||
(long)client->clientAsMask,
|
(long)client->clientAsMask,
|
||||||
stuff->wantedMajor,stuff->wantedMinor,
|
stuff->wantedMajor,stuff->wantedMinor,
|
||||||
@ -334,7 +334,7 @@ ProcXkbSelectEvents(ClientPtr client)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dataLeft>2) {
|
if (dataLeft>2) {
|
||||||
ErrorF("Extra data (%d bytes) after SelectEvents\n",dataLeft);
|
ErrorF("[xkb] Extra data (%d bytes) after SelectEvents\n",dataLeft);
|
||||||
return BadLength;
|
return BadLength;
|
||||||
}
|
}
|
||||||
return client->noClientException;
|
return client->noClientException;
|
||||||
@ -1339,7 +1339,7 @@ char *desc,*start;
|
|||||||
if ( rep->totalVModMapKeys>0 )
|
if ( rep->totalVModMapKeys>0 )
|
||||||
desc= XkbWriteVirtualModMap(xkb,rep,desc,client);
|
desc= XkbWriteVirtualModMap(xkb,rep,desc,client);
|
||||||
if ((desc-start)!=(len)) {
|
if ((desc-start)!=(len)) {
|
||||||
ErrorF("BOGUS LENGTH in write keyboard desc, expected %d, got %ld\n",
|
ErrorF("[xkb] BOGUS LENGTH in write keyboard desc, expected %d, got %ld\n",
|
||||||
len, (unsigned long)(desc-start));
|
len, (unsigned long)(desc-start));
|
||||||
}
|
}
|
||||||
if (client->swapped) {
|
if (client->swapped) {
|
||||||
@ -2374,7 +2374,7 @@ ProcXkbSetMap(ClientPtr client)
|
|||||||
return BadValue;
|
return BadValue;
|
||||||
}
|
}
|
||||||
if (((tmp-((char *)stuff))/4)!=stuff->length) {
|
if (((tmp-((char *)stuff))/4)!=stuff->length) {
|
||||||
ErrorF("Internal error! Bad length in XkbSetMap (after check)\n");
|
ErrorF("[xkb] Internal error! Bad length in XkbSetMap (after check)\n");
|
||||||
client->errorValue = tmp-((char *)&stuff[1]);
|
client->errorValue = tmp-((char *)&stuff[1]);
|
||||||
return BadLength;
|
return BadLength;
|
||||||
}
|
}
|
||||||
@ -2425,7 +2425,7 @@ ProcXkbSetMap(ClientPtr client)
|
|||||||
if (stuff->present&XkbVirtualModMapMask)
|
if (stuff->present&XkbVirtualModMapMask)
|
||||||
tmp= SetVirtualModMap(xkbi,stuff,(xkbVModMapWireDesc *)tmp,&change);
|
tmp= SetVirtualModMap(xkbi,stuff,(xkbVModMapWireDesc *)tmp,&change);
|
||||||
if (((tmp-((char *)stuff))/4)!=stuff->length) {
|
if (((tmp-((char *)stuff))/4)!=stuff->length) {
|
||||||
ErrorF("Internal error! Bad length in XkbSetMap (after set)\n");
|
ErrorF("[xkb] Internal error! Bad length in XkbSetMap (after set)\n");
|
||||||
client->errorValue = tmp-((char *)&stuff[1]);
|
client->errorValue = tmp-((char *)&stuff[1]);
|
||||||
return BadLength;
|
return BadLength;
|
||||||
}
|
}
|
||||||
@ -2701,7 +2701,7 @@ ProcXkbSetCompatMap(ClientPtr client)
|
|||||||
}
|
}
|
||||||
i= XkbPaddedSize((data-((char *)stuff)));
|
i= XkbPaddedSize((data-((char *)stuff)));
|
||||||
if ((i/4)!=stuff->length) {
|
if ((i/4)!=stuff->length) {
|
||||||
ErrorF("Internal length error on read in ProcXkbSetCompatMap\n");
|
ErrorF("[xkb] Internal length error on read in ProcXkbSetCompatMap\n");
|
||||||
return BadLength;
|
return BadLength;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3411,7 +3411,7 @@ register int n;
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((desc-start)!=(length)) {
|
if ((desc-start)!=(length)) {
|
||||||
ErrorF("BOGUS LENGTH in write names, expected %d, got %ld\n",
|
ErrorF("[xkb] BOGUS LENGTH in write names, expected %d, got %ld\n",
|
||||||
length, (unsigned long)(desc-start));
|
length, (unsigned long)(desc-start));
|
||||||
}
|
}
|
||||||
WriteToClient(client, SIZEOF(xkbGetNamesReply), (char *)rep);
|
WriteToClient(client, SIZEOF(xkbGetNamesReply), (char *)rep);
|
||||||
@ -4102,9 +4102,9 @@ xkbDoodadWireDesc * doodadWire;
|
|||||||
wire= XkbWriteCountedString(wire,doodad->logo.logo_name,swap);
|
wire= XkbWriteCountedString(wire,doodad->logo.logo_name,swap);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ErrorF("Unknown doodad type %d in XkbWriteGeomDoodads\n",
|
ErrorF("[xkb] Unknown doodad type %d in XkbWriteGeomDoodads\n",
|
||||||
doodad->any.type);
|
doodad->any.type);
|
||||||
ErrorF("Ignored\n");
|
ErrorF("[xkb] Ignored\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4332,7 +4332,7 @@ XkbSendGeometry( ClientPtr client,
|
|||||||
if ( rep->nKeyAliases>0 )
|
if ( rep->nKeyAliases>0 )
|
||||||
desc = XkbWriteGeomKeyAliases(desc,geom,client->swapped);
|
desc = XkbWriteGeomKeyAliases(desc,geom,client->swapped);
|
||||||
if ((desc-start)!=(len)) {
|
if ((desc-start)!=(len)) {
|
||||||
ErrorF("BOGUS LENGTH in XkbSendGeometry, expected %d, got %ld\n",
|
ErrorF("[xkb] BOGUS LENGTH in XkbSendGeometry, expected %d, got %ld\n",
|
||||||
len, (unsigned long)(desc-start));
|
len, (unsigned long)(desc-start));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -5781,8 +5781,8 @@ char * str;
|
|||||||
}
|
}
|
||||||
else if (length!=0) {
|
else if (length!=0) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
ErrorF("Internal Error! BadLength in ProcXkbGetDeviceInfo\n");
|
ErrorF("[xkb] Internal Error! BadLength in ProcXkbGetDeviceInfo\n");
|
||||||
ErrorF(" Wrote %d fewer bytes than expected\n",length);
|
ErrorF("[xkb] Wrote %d fewer bytes than expected\n",length);
|
||||||
#endif
|
#endif
|
||||||
return BadLength;
|
return BadLength;
|
||||||
}
|
}
|
||||||
@ -6078,25 +6078,25 @@ xkbSetDebuggingFlagsReply rep;
|
|||||||
newCtrls= xkbDebugCtrls&(~stuff->affectCtrls);
|
newCtrls= xkbDebugCtrls&(~stuff->affectCtrls);
|
||||||
newCtrls|= (stuff->ctrls&stuff->affectCtrls);
|
newCtrls|= (stuff->ctrls&stuff->affectCtrls);
|
||||||
if (xkbDebugFlags || newFlags || stuff->msgLength) {
|
if (xkbDebugFlags || newFlags || stuff->msgLength) {
|
||||||
ErrorF("XkbDebug: Setting debug flags to 0x%lx\n",(long)newFlags);
|
ErrorF("[xkb] XkbDebug: Setting debug flags to 0x%lx\n",(long)newFlags);
|
||||||
if (newCtrls!=xkbDebugCtrls)
|
if (newCtrls!=xkbDebugCtrls)
|
||||||
ErrorF("XkbDebug: Setting debug controls to 0x%lx\n",(long)newCtrls);
|
ErrorF("[xkb] XkbDebug: Setting debug controls to 0x%lx\n",(long)newCtrls);
|
||||||
}
|
}
|
||||||
extraLength= (stuff->length<<2)-sz_xkbSetDebuggingFlagsReq;
|
extraLength= (stuff->length<<2)-sz_xkbSetDebuggingFlagsReq;
|
||||||
if (stuff->msgLength>0) {
|
if (stuff->msgLength>0) {
|
||||||
char *msg;
|
char *msg;
|
||||||
if (extraLength<XkbPaddedSize(stuff->msgLength)) {
|
if (extraLength<XkbPaddedSize(stuff->msgLength)) {
|
||||||
ErrorF("XkbDebug: msgLength= %d, length= %ld (should be %d)\n",
|
ErrorF("[xkb] XkbDebug: msgLength= %d, length= %ld (should be %d)\n",
|
||||||
stuff->msgLength,(long)extraLength,
|
stuff->msgLength,(long)extraLength,
|
||||||
XkbPaddedSize(stuff->msgLength));
|
XkbPaddedSize(stuff->msgLength));
|
||||||
return BadLength;
|
return BadLength;
|
||||||
}
|
}
|
||||||
msg= (char *)&stuff[1];
|
msg= (char *)&stuff[1];
|
||||||
if (msg[stuff->msgLength-1]!='\0') {
|
if (msg[stuff->msgLength-1]!='\0') {
|
||||||
ErrorF("XkbDebug: message not null-terminated\n");
|
ErrorF("[xkb] XkbDebug: message not null-terminated\n");
|
||||||
return BadValue;
|
return BadValue;
|
||||||
}
|
}
|
||||||
ErrorF("XkbDebug: %s\n",msg);
|
ErrorF("[xkb] XkbDebug: %s\n",msg);
|
||||||
}
|
}
|
||||||
xkbDebugFlags = newFlags;
|
xkbDebugFlags = newFlags;
|
||||||
xkbDebugCtrls = newCtrls;
|
xkbDebugCtrls = newCtrls;
|
||||||
@ -6193,7 +6193,7 @@ XkbClientGone(pointer data,XID id)
|
|||||||
DevicePtr pXDev = (DevicePtr)data;
|
DevicePtr pXDev = (DevicePtr)data;
|
||||||
|
|
||||||
if (!XkbRemoveResourceClient(pXDev,id)) {
|
if (!XkbRemoveResourceClient(pXDev,id)) {
|
||||||
ErrorF("Internal Error! bad RemoveResourceClient in XkbClientGone\n");
|
ErrorF("[xkb] Internal Error! bad RemoveResourceClient in XkbClientGone\n");
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -132,7 +132,7 @@ xEvent xE;
|
|||||||
xE.u.keyButtonPointer.time = GetTimeInMillis();
|
xE.u.keyButtonPointer.time = GetTimeInMillis();
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags&0x8) {
|
if (xkbDebugFlags&0x8) {
|
||||||
ErrorF("AXKE: Key %d %s\n",keyCode,(xE.u.u.type==KeyPress?"down":"up"));
|
ErrorF("[xkb] AXKE: Key %d %s\n",keyCode,(xE.u.u.type==KeyPress?"down":"up"));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -530,7 +530,7 @@ KeySym * sym = XkbKeySymsPtr(xkbi->desc,key);
|
|||||||
if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key)) {
|
if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key)) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags&0x10)
|
if (xkbDebugFlags&0x10)
|
||||||
ErrorF("Starting software autorepeat...\n");
|
ErrorF("[xkb] Starting software autorepeat...\n");
|
||||||
#endif
|
#endif
|
||||||
xkbi->repeatKey = key;
|
xkbi->repeatKey = key;
|
||||||
xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
|
xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
|
||||||
|
@ -818,15 +818,15 @@ GrabInfoPtr grabinfo;
|
|||||||
((xE[0].u.u.type==KeyPress)||(xE[0].u.u.type==KeyRelease)||
|
((xE[0].u.u.type==KeyPress)||(xE[0].u.u.type==KeyRelease)||
|
||||||
(xE[0].u.u.type==DeviceKeyPress)||
|
(xE[0].u.u.type==DeviceKeyPress)||
|
||||||
(xE[0].u.u.type == DeviceKeyRelease))) {
|
(xE[0].u.u.type == DeviceKeyRelease))) {
|
||||||
ErrorF("XKbFilterWriteEvents:\n");
|
ErrorF("[xkb] XKbFilterWriteEvents:\n");
|
||||||
ErrorF(" Event state= 0x%04x\n",xE[0].u.keyButtonPointer.state);
|
ErrorF("[xkb] Event state= 0x%04x\n",xE[0].u.keyButtonPointer.state);
|
||||||
ErrorF(" XkbLastRepeatEvent!=xE (0x%p!=0x%p) %s\n",
|
ErrorF("[xkb] XkbLastRepeatEvent!=xE (0x%p!=0x%p) %s\n",
|
||||||
XkbLastRepeatEvent,xE,
|
XkbLastRepeatEvent,xE,
|
||||||
((XkbLastRepeatEvent!=(pointer)xE)?"True":"False"));
|
((XkbLastRepeatEvent!=(pointer)xE)?"True":"False"));
|
||||||
ErrorF(" (xkbClientEventsFlags&XWDA)==0 (0x%x) %s\n",
|
ErrorF("[xkb] (xkbClientEventsFlags&XWDA)==0 (0x%x) %s\n",
|
||||||
pClient->xkbClientFlags,
|
pClient->xkbClientFlags,
|
||||||
(_XkbWantsDetectableAutoRepeat(pClient)?"True":"False"));
|
(_XkbWantsDetectableAutoRepeat(pClient)?"True":"False"));
|
||||||
ErrorF(" !IsRelease(%d) %s\n",xE[0].u.u.type,
|
ErrorF("[xkb] !IsRelease(%d) %s\n",xE[0].u.u.type,
|
||||||
(!_XkbIsReleaseEvent(xE[0].u.u.type))?"True":"False");
|
(!_XkbIsReleaseEvent(xE[0].u.u.type))?"True":"False");
|
||||||
}
|
}
|
||||||
#endif /* DEBUG */
|
#endif /* DEBUG */
|
||||||
@ -872,7 +872,7 @@ GrabInfoPtr grabinfo;
|
|||||||
* when the mouse is released, the server does not behave properly.
|
* when the mouse is released, the server does not behave properly.
|
||||||
* Faking a release of the button here solves the problem.
|
* Faking a release of the button here solves the problem.
|
||||||
*/
|
*/
|
||||||
ErrorF("Faking release of button %d\n", xE[0].u.u.detail);
|
ErrorF("[xkb] Faking release of button %d\n", xE[0].u.u.detail);
|
||||||
#endif
|
#endif
|
||||||
XkbDDXFakePointerButton(ButtonRelease, xE[0].u.u.detail);
|
XkbDDXFakePointerButton(ButtonRelease, xE[0].u.u.detail);
|
||||||
}
|
}
|
||||||
@ -888,11 +888,11 @@ GrabInfoPtr grabinfo;
|
|||||||
(xE[i].u.u.type==DeviceKeyPress)||
|
(xE[i].u.u.type==DeviceKeyPress)||
|
||||||
(xE[i].u.u.type == DeviceKeyRelease))) {
|
(xE[i].u.u.type == DeviceKeyRelease))) {
|
||||||
XkbStatePtr s= &xkbi->state;
|
XkbStatePtr s= &xkbi->state;
|
||||||
ErrorF("XKbFilterWriteEvents (non-XKB):\n");
|
ErrorF("[xkb] XKbFilterWriteEvents (non-XKB):\n");
|
||||||
ErrorF("event= 0x%04x\n",xE[i].u.keyButtonPointer.state);
|
ErrorF("[xkb] event= 0x%04x\n",xE[i].u.keyButtonPointer.state);
|
||||||
ErrorF("lookup= 0x%02x, grab= 0x%02x\n",s->lookup_mods,
|
ErrorF("[xkb] lookup= 0x%02x, grab= 0x%02x\n",s->lookup_mods,
|
||||||
s->grab_mods);
|
s->grab_mods);
|
||||||
ErrorF("compat lookup= 0x%02x, grab= 0x%02x\n",
|
ErrorF("[xkb] compat lookup= 0x%02x, grab= 0x%02x\n",
|
||||||
s->compat_lookup_mods,
|
s->compat_lookup_mods,
|
||||||
s->compat_grab_mods);
|
s->compat_grab_mods);
|
||||||
}
|
}
|
||||||
@ -930,14 +930,14 @@ GrabInfoPtr grabinfo;
|
|||||||
((xE[i].u.keyButtonPointer.state >> 7) & button_mask) == button_mask &&
|
((xE[i].u.keyButtonPointer.state >> 7) & button_mask) == button_mask &&
|
||||||
(xkbi->lockedPtrButtons & button_mask) == button_mask) {
|
(xkbi->lockedPtrButtons & button_mask) == button_mask) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
ErrorF("Faking release of button %d\n", xE[i].u.u.detail);
|
ErrorF("[xkb] Faking release of button %d\n", xE[i].u.u.detail);
|
||||||
#endif
|
#endif
|
||||||
XkbDDXFakePointerButton(ButtonRelease, xE[i].u.u.detail);
|
XkbDDXFakePointerButton(ButtonRelease, xE[i].u.u.detail);
|
||||||
} else if (type == DeviceButtonPress &&
|
} else if (type == DeviceButtonPress &&
|
||||||
((((deviceKeyButtonPointer*)&xE[i])->state >> 7) & button_mask) == button_mask &&
|
((((deviceKeyButtonPointer*)&xE[i])->state >> 7) & button_mask) == button_mask &&
|
||||||
(xkbi->lockedPtrButtons & button_mask) == button_mask) {
|
(xkbi->lockedPtrButtons & button_mask) == button_mask) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
ErrorF("Faking release of button %d\n", ((deviceKeyButtonPointer*)&xE[i])->state);
|
ErrorF("[xkb] Faking release of button %d\n", ((deviceKeyButtonPointer*)&xE[i])->state);
|
||||||
#endif
|
#endif
|
||||||
XkbDDXFakePointerButton(DeviceButtonRelease, ((deviceKeyButtonPointer*)&xE[i])->state);
|
XkbDDXFakePointerButton(DeviceButtonRelease, ((deviceKeyButtonPointer*)&xE[i])->state);
|
||||||
}
|
}
|
||||||
|
@ -179,12 +179,12 @@ char * pval;
|
|||||||
|
|
||||||
name= MakeAtom(_XKB_RF_NAMES_PROP_ATOM,strlen(_XKB_RF_NAMES_PROP_ATOM),1);
|
name= MakeAtom(_XKB_RF_NAMES_PROP_ATOM,strlen(_XKB_RF_NAMES_PROP_ATOM),1);
|
||||||
if (name==None) {
|
if (name==None) {
|
||||||
ErrorF("Atom error: %s not created\n",_XKB_RF_NAMES_PROP_ATOM);
|
ErrorF("[xkb] Atom error: %s not created\n",_XKB_RF_NAMES_PROP_ATOM);
|
||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
pval= (char*) ALLOCATE_LOCAL(len);
|
pval= (char*) ALLOCATE_LOCAL(len);
|
||||||
if (!pval) {
|
if (!pval) {
|
||||||
ErrorF("Allocation error: %s proprerty not created\n",
|
ErrorF("[xkb] Allocation error: %s proprerty not created\n",
|
||||||
_XKB_RF_NAMES_PROP_ATOM);
|
_XKB_RF_NAMES_PROP_ATOM);
|
||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
@ -218,7 +218,7 @@ char * pval;
|
|||||||
}
|
}
|
||||||
pval[out++]= '\0';
|
pval[out++]= '\0';
|
||||||
if (out!=len) {
|
if (out!=len) {
|
||||||
ErrorF("Internal Error! bad size (%d!=%d) for _XKB_RULES_NAMES\n",
|
ErrorF("[xkb] Internal Error! bad size (%d!=%d) for _XKB_RULES_NAMES\n",
|
||||||
out,len);
|
out,len);
|
||||||
}
|
}
|
||||||
ChangeWindowProperty(WindowTable[0],name,XA_STRING,8,PropModeReplace,
|
ChangeWindowProperty(WindowTable[0],name,XA_STRING,8,PropModeReplace,
|
||||||
@ -511,7 +511,7 @@ XkbEventCauseRec cause;
|
|||||||
/* the other here, but for now just complain */
|
/* the other here, but for now just complain */
|
||||||
/* can't just update the core range without */
|
/* can't just update the core range without */
|
||||||
/* reallocating the KeySymsRec (pain) */
|
/* reallocating the KeySymsRec (pain) */
|
||||||
ErrorF("Internal Error!! XKB and core keymap have different range\n");
|
ErrorF("[xkb] Internal Error!! XKB and core keymap have different range\n");
|
||||||
}
|
}
|
||||||
if (XkbAllocClientMap(xkb,XkbAllClientInfoMask,0)!=Success)
|
if (XkbAllocClientMap(xkb,XkbAllClientInfoMask,0)!=Success)
|
||||||
FatalError("Couldn't allocate client map in XkbInitDevice\n");
|
FatalError("Couldn't allocate client map in XkbInitDevice\n");
|
||||||
@ -772,7 +772,7 @@ XkbSrvLedInfoPtr sli;
|
|||||||
if (sli && xkbi)
|
if (sli && xkbi)
|
||||||
XkbCheckIndicatorMaps(xkbi->device,sli,XkbAllIndicatorsMask);
|
XkbCheckIndicatorMaps(xkbi->device,sli,XkbAllIndicatorsMask);
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
else ErrorF("No indicator feedback in XkbFinishInit (shouldn't happen)!\n");
|
else ErrorF("[xkb] No indicator feedback in XkbFinishInit (shouldn't happen)!\n");
|
||||||
#endif
|
#endif
|
||||||
return softRepeat;
|
return softRepeat;
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,7 @@ int xiEvent;
|
|||||||
xiEvent= (xE->u.u.type & EXTENSION_EVENT_BASE);
|
xiEvent= (xE->u.u.type & EXTENSION_EVENT_BASE);
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags&0x8) {
|
if (xkbDebugFlags&0x8) {
|
||||||
ErrorF("XkbPKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up"));
|
ErrorF("[xkb] XkbPKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up"));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -162,7 +162,7 @@ int xiEvent;
|
|||||||
}
|
}
|
||||||
rg->currentDown= key;
|
rg->currentDown= key;
|
||||||
}
|
}
|
||||||
else ErrorF("InternalError! Illegal radio group %d\n",ndx);
|
else ErrorF("[xkb] InternalError! Illegal radio group %d\n",ndx);
|
||||||
break;
|
break;
|
||||||
case XkbKB_Overlay1: case XkbKB_Overlay2:
|
case XkbKB_Overlay1: case XkbKB_Overlay2:
|
||||||
{
|
{
|
||||||
@ -182,7 +182,7 @@ int xiEvent;
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ErrorF("unknown key behavior 0x%04x\n",behavior.type);
|
ErrorF("[xkb] unknown key behavior 0x%04x\n",behavior.type);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -201,7 +201,7 @@ XkbSrvInfoPtr xkbi;
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (xkbDebugFlags&0x8) {
|
if (xkbDebugFlags&0x8) {
|
||||||
int key= xE->u.u.detail;
|
int key= xE->u.u.detail;
|
||||||
ErrorF("PKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up"));
|
ErrorF("[xkb] PKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up"));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if ((xkbi->desc->ctrls->enabled_ctrls&XkbAllFilteredEventsMask)==0)
|
if ((xkbi->desc->ctrls->enabled_ctrls&XkbAllFilteredEventsMask)==0)
|
||||||
|
@ -129,7 +129,7 @@ register int n;
|
|||||||
dataLeft-= (size*2);
|
dataLeft-= (size*2);
|
||||||
}
|
}
|
||||||
if (dataLeft>2) {
|
if (dataLeft>2) {
|
||||||
ErrorF("Extra data (%d bytes) after SelectEvents\n",dataLeft);
|
ErrorF("[xkb] Extra data (%d bytes) after SelectEvents\n",dataLeft);
|
||||||
return BadLength;
|
return BadLength;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2010,7 +2010,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||||||
|
|
||||||
if (sendNotifies) {
|
if (sendNotifies) {
|
||||||
if (!pDev) {
|
if (!pDev) {
|
||||||
ErrorF("XkbCopyKeymap: asked for notifies, but can't find device!\n");
|
ErrorF("[xkb] XkbCopyKeymap: asked for notifies, but can't find device!\n");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* send NewKeyboardNotify if the keycode range changed, else
|
/* send NewKeyboardNotify if the keycode range changed, else
|
||||||
|
Loading…
Reference in New Issue
Block a user