… | |
… | |
291 | delete keyboard; |
291 | delete keyboard; |
292 | #endif |
292 | #endif |
293 | #ifndef NO_RESOURCES |
293 | #ifndef NO_RESOURCES |
294 | XrmDestroyDatabase (option_db); |
294 | XrmDestroyDatabase (option_db); |
295 | #endif |
295 | #endif |
|
|
296 | |
|
|
297 | SET_R ((rxvt_term *)0); |
296 | } |
298 | } |
297 | |
299 | |
298 | // child has exited, usually destroys |
300 | // child has exited, usually destroys |
299 | void |
301 | void |
300 | rxvt_term::child_cb (ev::child &w, int status) |
302 | rxvt_term::child_cb (ev::child &w, int status) |
… | |
… | |
388 | |
390 | |
389 | #if !ENABLE_MINIMAL |
391 | #if !ENABLE_MINIMAL |
390 | static void ecb_cold |
392 | static void ecb_cold |
391 | print_x_error (Display *dpy, XErrorEvent *event) |
393 | print_x_error (Display *dpy, XErrorEvent *event) |
392 | { |
394 | { |
393 | char buffer[BUFSIZ]; |
395 | char buffer[BUFSIZ]; |
394 | char mesg[BUFSIZ]; |
396 | char mesg[BUFSIZ]; |
395 | char number[32]; |
397 | char number[32]; |
396 | |
398 | |
397 | rxvt_warn ("An X Error occurred, trying to continue after report.\n"); |
399 | rxvt_warn ("An X Error occurred, trying to continue after report.\n"); |
398 | |
400 | |
399 | XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); |
401 | XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); |
400 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); |
402 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); |
401 | |
403 | |
402 | XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); |
404 | XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); |
403 | XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); |
405 | XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); |
404 | rxvt_warn ("+ %s: %s\n", mesg, buffer); |
406 | rxvt_warn ("+ %s: %s\n", mesg, buffer); |
405 | |
407 | |
406 | XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); |
408 | XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); |
407 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); |
409 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); |
408 | |
410 | |
409 | if (event->request_code >= 128) |
411 | if (event->request_code >= 128) |
410 | { |
412 | { |
411 | #if 0 |
413 | #if 0 |
412 | /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ |
414 | /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ |
413 | int nexts; |
415 | int nexts; |
414 | char **exts = XListExtensions (dpy, &nexts); |
416 | char **exts = XListExtensions (dpy, &nexts); |
415 | |
417 | |
416 | while (nexts) |
418 | while (nexts) |
417 | { |
419 | { |
418 | char *extname = exts [nexts - 1]; |
420 | char *extname = exts [nexts - 1]; |
419 | int major, first_event, first_error; |
421 | int major, first_event, first_error; |
420 | |
422 | |
421 | if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) |
423 | if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) |
422 | { |
424 | { |
423 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
425 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
424 | rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); |
426 | rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); |
425 | |
427 | |
426 | snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); |
428 | snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); |
427 | XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); |
429 | XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); |
428 | rxvt_warn ("+ (which is %s)\n", buffer); |
430 | rxvt_warn ("+ (which is %s)\n", buffer); |
429 | |
431 | |
430 | break; |
432 | break; |
431 | } |
433 | } |
432 | |
434 | |
433 | printf ("nextss %d %s\n", nexts, extname);//D |
435 | printf ("nextss %d %s\n", nexts, extname);//D |
434 | --nexts; |
436 | --nexts; |
435 | ++exts; |
437 | ++exts; |
436 | } |
438 | } |
437 | #else |
439 | #else |
438 | int nexts = 0; |
440 | int nexts = 0; |
439 | char **exts = 0; |
441 | char **exts = 0; |
440 | #endif |
442 | #endif |
441 | |
443 | |
442 | if (!nexts) |
444 | if (!nexts) |
443 | { |
445 | { |
444 | rxvt_warn ("+ (which is an unknown extension)\n", buffer); |
446 | rxvt_warn ("+ (which is an unknown extension)\n", buffer); |
445 | |
447 | |
446 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
448 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
447 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); |
449 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); |
448 | |
450 | |
449 | #if 0 |
451 | #if 0 |
450 | sprintf (number, "RENDER.%d", event->minor_code); |
452 | sprintf (number, "RENDER.%d", event->minor_code); |
451 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
453 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
452 | rxvt_warn ("+ (which is %s)\n", buffer); |
454 | rxvt_warn ("+ (which is %s)\n", buffer); |
453 | #endif |
455 | #endif |
454 | } |
456 | } |
455 | |
457 | |
456 | XFreeExtensionList (exts); |
458 | XFreeExtensionList (exts); |
457 | } |
459 | } |
458 | else |
460 | else |
459 | { |
461 | { |
460 | sprintf (number, "%d", event->request_code); |
462 | sprintf (number, "%d", event->request_code); |
461 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
463 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
462 | rxvt_warn ("+ (which is %s)\n", buffer); |
464 | rxvt_warn ("+ (which is %s)\n", buffer); |
463 | } |
465 | } |
464 | |
466 | |
465 | if (event->error_code == BadWindow |
467 | if (event->error_code == BadWindow |
466 | || event->error_code == BadPixmap |
468 | || event->error_code == BadPixmap |
467 | || event->error_code == BadCursor |
469 | || event->error_code == BadCursor |
468 | || event->error_code == BadFont |
470 | || event->error_code == BadFont |
469 | || event->error_code == BadDrawable |
471 | || event->error_code == BadDrawable |
470 | || event->error_code == BadColor |
472 | || event->error_code == BadColor |
471 | || event->error_code == BadGC |
473 | || event->error_code == BadGC |
472 | || event->error_code == BadIDChoice |
474 | || event->error_code == BadIDChoice |
473 | || event->error_code == BadValue |
475 | || event->error_code == BadValue |
474 | || event->error_code == BadAtom) |
476 | || event->error_code == BadAtom) |
475 | { |
477 | { |
476 | if (event->error_code == BadValue) |
478 | if (event->error_code == BadValue) |
477 | XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); |
479 | XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); |
478 | else if (event->error_code == BadAtom) |
480 | else if (event->error_code == BadAtom) |
479 | XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); |
481 | XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); |
480 | else |
482 | else |
481 | XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); |
483 | XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); |
482 | |
484 | |
483 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); |
485 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); |
484 | } |
486 | } |
485 | } |
487 | } |
486 | #endif |
488 | #endif |
487 | |
489 | |
488 | int ecb_cold |
490 | int ecb_cold |
489 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
491 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
490 | { |
492 | { |
491 | if (GET_R->allowedxerror == -1) |
493 | if (GET_R && GET_R->allowedxerror == -1) |
492 | GET_R->allowedxerror = event->error_code; |
494 | GET_R->allowedxerror = event->error_code; |
493 | else |
495 | else |
494 | { |
496 | { |
495 | // GET_R is most likely not the terminal which caused the error, |
497 | // GET_R is most likely not the terminal which caused the error, |
496 | // so just output the error and continue |
498 | // so just output the error and continue |