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.384 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs.
Revision 1.393 by root, Sat Dec 13 09:50:43 2014 UTC

… …
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2010 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 2 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.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
226 226
227#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
228 bg_destroy (); 228 bg_destroy ();
229#endif 229#endif
230 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
231 if (display) 235 if (display)
232 { 236 {
233 selection_clear (); 237 selection_clear ();
234 selection_clear (true); 238 selection_clear (true);
235 239
236#if USE_XIM 240#if USE_XIM
237 im_destroy (); 241 im_destroy ();
238#endif 242#endif
239 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
240 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
241 247
242 delete drawable; 248 delete drawable;
249
243 // destroy all windows 250 // destroy all windows
244 if (parent) 251 if (parent)
245 XDestroyWindow (dpy, parent); 252 XDestroyWindow (dpy, parent);
246 253
247 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
… …
270 free (locale); 277 free (locale);
271 free (v_buffer); 278 free (v_buffer);
272 279
273 delete selection_req; 280 delete selection_req;
274 281
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");
284
285 delete env;
286
275 delete envv; 287 delete envv;
276 delete argv; 288 delete argv;
277 289
278#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
279 delete keyboard; 291 delete keyboard;
280#endif 292#endif
281#ifndef NO_RESOURCES 293#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db); 294 XrmDestroyDatabase (option_db);
283#endif 295#endif
296
297 SET_R ((rxvt_term *)0);
284} 298}
285 299
286// child has exited, usually destroys 300// child has exited, usually destroys
287void 301void
288rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
376 390
377#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
378static void ecb_cold 392static void ecb_cold
379print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
380{ 394{
381 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
383 char number[32]; 397 char number[32];
384 398
385 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");
386 400
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); 401 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); 402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389 403
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); 404 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); 405 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
392 rxvt_warn ("+ %s: %s\n", mesg, buffer); 406 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393 407
394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); 408 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
395 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);
396 410
397 if (event->request_code >= 128) 411 if (event->request_code >= 128)
398 { 412 {
399#if 0 413#if 0
400 /* 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 */
401 int nexts; 415 int nexts;
402 char **exts = XListExtensions (dpy, &nexts); 416 char **exts = XListExtensions (dpy, &nexts);
403 417
404 while (nexts) 418 while (nexts)
405 { 419 {
406 char *extname = exts [nexts - 1]; 420 char *extname = exts [nexts - 1];
407 int major, first_event, first_error; 421 int major, first_event, first_error;
408 422
409 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)
410 { 424 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 425 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 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);
413 427
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); 428 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); 429 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer); 430 rxvt_warn ("+ (which is %s)\n", buffer);
417 431
418 break; 432 break;
419 } 433 }
420 434
421 printf ("nextss %d %s\n", nexts, extname);//D 435 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts; 436 --nexts;
423 ++exts; 437 ++exts;
424 } 438 }
425#else 439#else
426 int nexts = 0; 440 int nexts = 0;
427 char **exts = 0; 441 char **exts = 0;
428#endif 442#endif
429 443
430 if (!nexts) 444 if (!nexts)
431 { 445 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer); 446 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433 447
434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 448 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
435 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);
436 450
437#if 0 451#if 0
438 sprintf (number, "RENDER.%d", event->minor_code); 452 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer); 454 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif 455#endif
442 } 456 }
443 457
444 XFreeExtensionList (exts); 458 XFreeExtensionList (exts);
445 } 459 }
446 else 460 else
447 { 461 {
448 sprintf (number, "%d", event->request_code); 462 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); 463 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer); 464 rxvt_warn ("+ (which is %s)\n", buffer);
451 } 465 }
452 466
453 if (event->error_code == BadWindow 467 if (event->error_code == BadWindow
454 || event->error_code == BadPixmap 468 || event->error_code == BadPixmap
455 || event->error_code == BadCursor 469 || event->error_code == BadCursor
456 || event->error_code == BadFont 470 || event->error_code == BadFont
457 || event->error_code == BadDrawable 471 || event->error_code == BadDrawable
458 || event->error_code == BadColor 472 || event->error_code == BadColor
459 || event->error_code == BadGC 473 || event->error_code == BadGC
460 || event->error_code == BadIDChoice 474 || event->error_code == BadIDChoice
461 || event->error_code == BadValue 475 || event->error_code == BadValue
462 || event->error_code == BadAtom) 476 || event->error_code == BadAtom)
463 { 477 {
464 if (event->error_code == BadValue) 478 if (event->error_code == BadValue)
465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); 479 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
466 else if (event->error_code == BadAtom) 480 else if (event->error_code == BadAtom)
467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 481 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
468 else 482 else
469 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 483 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
470 484
471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); 485 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 } 486 }
473} 487}
474#endif 488#endif
475 489
476int ecb_cold 490int ecb_cold
477rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_xerror_handler (Display *display, XErrorEvent *event)
478{ 492{
479 if (GET_R->allowedxerror == -1) 493 if (GET_R && GET_R->allowedxerror == -1)
480 GET_R->allowedxerror = event->error_code; 494 GET_R->allowedxerror = event->error_code;
481 else 495 else
482 { 496 {
483 // 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,
484 // so just output the error and continue 498 // so just output the error and continue
… …
1363 unsigned long fg, bg; 1377 unsigned long fg, bg;
1364 const char *p; 1378 const char *p;
1365 char **s; 1379 char **s;
1366 XIMStyles *xim_styles; 1380 XIMStyles *xim_styles;
1367 1381
1368 set_environ (envv); 1382 set_environ (env);
1369 1383
1370 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1371 return false; 1385 return false;
1372 1386
1373 input_method = display->get_xim (locale, modifiers); 1387 input_method = display->get_xim (locale, modifiers);
1374 if (input_method == NULL) 1388 if (input_method == NULL)
1375 return false; 1389 return false;
… …
1683rxvt_term::update_background () 1697rxvt_term::update_background ()
1684{ 1698{
1685 if (update_background_ev.is_active ()) 1699 if (update_background_ev.is_active ())
1686 return; 1700 return;
1687 1701
1688 bg_invalidate ();
1689
1690 if (!mapped)
1691 return;
1692
1693 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1702 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1694 1703
1695 if (to_wait <= 0.) 1704 if (to_wait <= 0.)
1696 bg_render (); 1705 bg_render ();
1697 else 1706 else

Diff Legend

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