e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Tweak error handler API.

This commit is contained in:
Kim Woelders 2013-12-28 21:57:54 +01:00
parent 248ec63e1e
commit 9cc77c09c3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/events.c
View File

@ -380,9 +380,9 @@ EventsGetExtensionName(int req)
}
void
EventShowError(const XErrorEvent * ev)
EventShowError(const XEvent * evp)
{
Display *dpy = disp;
const XErrorEvent *ev = &evp->xerror;
char buf[64], buf1[64];
if (ev->request_code < 128)
@ -390,8 +390,8 @@ EventShowError(const XErrorEvent * ev)
else
Esnprintf(buf, sizeof(buf), "%s.%d",
EventsGetExtensionName(ev->request_code), ev->minor_code);
XGetErrorDatabaseText(dpy, "XRequest", buf, "", buf1, sizeof(buf1));
XGetErrorText(dpy, ev->error_code, buf, sizeof(buf));
XGetErrorDatabaseText(disp, "XRequest", buf, "", buf1, sizeof(buf1));
XGetErrorText(disp, ev->error_code, buf, sizeof(buf));
Eprintf("*** ERROR: xid=%#lx req=%i/%i err=%i: %s: %s\n",
ev->resourceid, ev->request_code, ev->minor_code,
ev->error_code, buf1, buf);

2
src/events.h
View File

@ -41,7 +41,7 @@
void EventsInit(void);
void EventsMain(void);
void EventShow(const XEvent * ev);
void EventShowError(const XErrorEvent * ev);
void EventShowError(const XEvent * ev);
typedef struct _EventFdDesc EventFdDesc;
typedef void (EventFdHandler) (void);

2
src/x.c
View File

@ -1794,7 +1794,7 @@ static int
_HandleXError(Display * dpy __UNUSED__, XErrorEvent * ev)
{
if (EDebug(1) && EXErrorFunc)
EXErrorFunc(ev);
EXErrorFunc((XEvent *) ev);
Dpy.last_error_code = ev->error_code;

2
src/xwin.h
View File

@ -54,7 +54,7 @@ int EDisplayOpen(const char *dstr, int scr);
void EDisplayClose(void);
void EDisplayDisconnect(void);
typedef void (EXErrorHandler) (const XErrorEvent *);
typedef void (EXErrorHandler) (const XEvent *);
typedef void (EXIOErrorHandler) (void);
void EDisplaySetErrorHandlers(EXErrorHandler * error,
EXIOErrorHandler * fatal);