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.391 by sf-exg, Mon Oct 6 11:11:19 2014 UTC vs.
Revision 1.394 by root, Sat Dec 13 10:07:30 2014 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 3 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
277 free (locale); 277 free (locale);
278 free (v_buffer); 278 free (v_buffer);
279 279
280 delete selection_req; 280 delete selection_req;
281 281
282 if (memcmp (env, envv->begin (), envv->size () * sizeof (char *))) 282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n"); 283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284 284
285 delete env; 285 delete env;
286 286
287 delete envv; 287 delete envv;
… …
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
299void 301void
300rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
388 390
389#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
390static void ecb_cold 392static void ecb_cold
391print_x_error (Display *dpy, XErrorEvent *event) 393print_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
488int ecb_cold 490int ecb_cold
489rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_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

Diff Legend

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