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.379 by root, Tue Jun 5 11:10:58 2012 UTC vs.
Revision 1.386 by sf-exg, Sun Dec 30 11:52:15 2012 UTC

… …
168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169#endif 169#endif
170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif 172#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif 175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#if USE_XIM 177#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
… …
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
… …
311 { 315 {
312#if USE_XIM 316#if USE_XIM
313 im_ev.stop (display); 317 im_ev.stop (display);
314#endif 318#endif
315 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
316#if ENABLE_TRANSPARENCY || ENABLE_PERL 320#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
317 rootwin_ev.stop (display); 321 rootwin_ev.stop (display);
318#endif 322#endif
319 termwin_ev.stop (display); 323 termwin_ev.stop (display);
320 vt_ev.stop (display); 324 vt_ev.stop (display);
321 } 325 }
… …
362} 366}
363 367
364/*----------------------------------------------------------------------*/ 368/*----------------------------------------------------------------------*/
365/* 369/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 370 * Exit gracefully, clearing the utmp entry and restoring tty attributes
367 * TODO: if debugging, this should free up any known resources if we can
368 */ 371 */
369static XErrorHandler old_xerror_handler; 372static XErrorHandler old_xerror_handler;
370 373
371static void 374static void
372rxvt_emergency_cleanup () 375rxvt_emergency_cleanup ()
… …
380print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
381{ 384{
382 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
384 char number[32]; 387 char number[32];
385 const char mtype[] = "XlibMessage"; 388
389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
390
391 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
392 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
386 393
387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); 394 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 395 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
390 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("+ %s: %s\n", mesg, buffer);
397
391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 399 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
393 sprintf (number, "%d", event->request_code);
394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
395 rxvt_warn ("(which is %s)\n", buffer);
396 400
397 if (event->request_code >= 128) 401 if (event->request_code >= 128)
398 { 402 {
403#if 0
404 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
405 int nexts;
406 char **exts = XListExtensions (dpy, &nexts);
407
408 while (nexts)
409 {
410 char *extname = exts [nexts - 1];
411 int major, first_event, first_error;
412
413 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
414 {
415 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
416 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
417
418 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
419 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
420 rxvt_warn ("+ (which is %s)\n", buffer);
421
422 break;
423 }
424
425 printf ("nextss %d %s\n", nexts, extname);//D
426 --nexts;
427 ++exts;
428 }
429#else
430 int nexts = 0;
431 char **exts = 0;
432#endif
433
434 if (!nexts)
435 {
436 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
437
399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 438 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 439 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
440
441#if 0
442 sprintf (number, "RENDER.%d", event->minor_code);
443 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
444 rxvt_warn ("+ (which is %s)\n", buffer);
445#endif
446 }
447
448 XFreeExtensionList (exts);
449 }
450 else
451 {
452 sprintf (number, "%d", event->request_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
401 } 455 }
402 456
403 if (event->error_code == BadWindow 457 if (event->error_code == BadWindow
404 || event->error_code == BadPixmap 458 || event->error_code == BadPixmap
405 || event->error_code == BadCursor 459 || event->error_code == BadCursor
… …
410 || event->error_code == BadIDChoice 464 || event->error_code == BadIDChoice
411 || event->error_code == BadValue 465 || event->error_code == BadValue
412 || event->error_code == BadAtom) 466 || event->error_code == BadAtom)
413 { 467 {
414 if (event->error_code == BadValue) 468 if (event->error_code == BadValue)
415 XGetErrorDatabaseText (dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ); 469 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
416 else if (event->error_code == BadAtom) 470 else if (event->error_code == BadAtom)
417 XGetErrorDatabaseText (dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ); 471 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
418 else 472 else
419 XGetErrorDatabaseText (dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); 473 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 474
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 475 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
422 } 476 }
423
424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426} 477}
427#endif 478#endif
428 479
429int ecb_cold 480int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 481rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
770 821
771 delete fontset[0]; 822 delete fontset[0];
772 fontset[0] = fs; 823 fontset[0] = fs;
773 824
774 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 825 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
775 prop.width += letterSpace; 826 prop.width = max (prop.width + letterSpace, 1);
776 827
777 fs->set_prop (prop, false); 828 fs->set_prop (prop, false);
778 829
779 fwidth = prop.width; 830 fwidth = prop.width;
780 fheight = prop.height + lineSpace; 831 fheight = prop.height + lineSpace;
… …
1636rxvt_term::update_background () 1687rxvt_term::update_background ()
1637{ 1688{
1638 if (update_background_ev.is_active ()) 1689 if (update_background_ev.is_active ())
1639 return; 1690 return;
1640 1691
1641 bg_invalidate (); 1692 bg_flags &= BG_INHIBIT_RENDER;
1642 1693
1643 if (!mapped) 1694 if (!mapped)
1644 return; 1695 return;
1645 1696
1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);

Diff Legend

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