ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.377 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.378 by root, Tue Jun 5 11:10:50 2012 UTC

… …
381{ 381{
382 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
384 char number[32]; 384 char number[32];
385 const char mtype[] = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
386
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
392 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
395 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397 mesg, BUFSIZ);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
399 } 401 }
402
400 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 406 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 408 || event->error_code == BadColor
406 (event->error_code == BadGC) || 409 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 411 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
410 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 418 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ); 420
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420 } 422 }
423
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 426}
425#endif 427#endif
426 428
427int ecb_cold 429int ecb_cold

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines