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.285 by root, Fri Dec 14 06:32:38 2007 UTC vs.
Revision 1.301 by ayin, Sat Jan 19 13:00:10 2008 UTC

… …
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif 179#endif
180#ifdef USE_XIM 180#ifdef USE_XIM
… …
225 for (int i = RS_styleCount; --i; ) 225 for (int i = RS_styleCount; --i; )
226 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
227 delete fontset[i]; 227 delete fontset[i];
228#endif 228#endif
229 delete fontset[0]; 229 delete fontset[0];
230
231#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy ();
233#endif
230 234
231 if (display) 235 if (display)
232 { 236 {
233 selection_clear (); 237 selection_clear ();
234 238
… …
274 pix_colors_unfocused [i].free (this); 278 pix_colors_unfocused [i].free (this);
275#endif 279#endif
276 } 280 }
277 281
278 clear (); 282 clear ();
279 }
280 283
281 delete [] pix_colors_focused; 284 display->flush (); /* ideally .put should do this */
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 displays.put (display); 285 displays.put (display);
286 }
290 287
291 scr_release (); 288 scr_release ();
292 289
293 /* clear all resources */ 290 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 291 for (int i = 0; i < allocated.size (); i++)
… …
471 DisplayString (display)); 468 DisplayString (display));
472 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
474} 471}
475 472
476/*----------------------------------------------------------------------*/
477void
478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
479{
480 this->envv = envv;
481
482 SET_R (this);
483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
485
486 init_vars ();
487
488 init_secondary ();
489
490 const char **cmd_argv = init_resources (argc, argv);
491
492#ifdef KEYSYM_RESOURCE
493 keyboard->register_done ();
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (option (Opt_scrollBar))
498 scrollBar.setIdle (); /* set existence for size calculations */
499#endif
500
501 pty = ptytty::create ();
502
503 create_windows (argc, argv);
504
505 init_xlocale ();
506
507 scr_reset (); // initialize screen
508
509#if 0
510 XSynchronize (dpy, True);
511#endif
512
513#ifdef HAVE_SCROLLBARS
514 if (option (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */
516#endif
517#ifdef HAVE_BG_PIXMAP
518 {
519 bgPixmap.set_target (this);
520
521#ifdef ENABLE_TRANSPARENCY
522 if (option (Opt_transparent))
523 {
524 bgPixmap.set_transparent ();
525#ifdef HAVE_AFTERIMAGE
526 if (rs [Rs_blurradius])
527 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528#endif
529 if (ISSET_PIXCOLOR (Color_tint))
530 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap] != NULL)
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != NULL)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588}
589
590static struct sig_handlers 473static struct sig_handlers
591{ 474{
592 ev::sig sw_term, sw_int; 475 ev::sig sw_term, sw_int;
593 476
594 /* 477 /*
… …
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636 // TODO: handle this with exceptions and tolerate the memory loss 519 // TODO: handle this with exceptions and tolerate the memory loss
637 XSetIOErrorHandler (rxvt_xioerror_handler); 520 XSetIOErrorHandler (rxvt_xioerror_handler);
638 521
639 XrmInitialize (); 522 XrmInitialize ();
640}
641
642/* ------------------------------------------------------------------------- *
643 * MEMORY ALLOCATION WRAPPERS *
644 * ------------------------------------------------------------------------- */
645void *
646rxvt_malloc (size_t size)
647{
648 void *p = malloc (size);
649
650 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n");
652
653 return p;
654}
655
656void *
657rxvt_calloc (size_t number, size_t size)
658{
659 void *p = calloc (number, size);
660
661 if (!p)
662 rxvt_fatal ("memory allocation failure. aborting.\n");
663
664 return p;
665}
666
667void *
668rxvt_realloc (void *ptr, size_t size)
669{
670 void *p = realloc (ptr, size);
671
672 if (!p)
673 rxvt_fatal ("memory allocation failure. aborting.\n");
674
675 return p;
676} 523}
677 524
678/*----------------------------------------------------------------------*/ 525/*----------------------------------------------------------------------*/
679/* 526/*
680 * window size/position calculations for XSizeHint and other storage. 527 * window size/position calculations for XSizeHint and other storage.
… …
1712void 1559void
1713rxvt_term::get_window_origin (int &x, int &y) 1560rxvt_term::get_window_origin (int &x, int &y)
1714{ 1561{
1715 Window cr; 1562 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1718} 1565}
1719 1566
1720Pixmap 1567Pixmap
1721rxvt_term::get_pixmap_property (int prop_id) 1568rxvt_term::get_pixmap_property (int prop_id)
1722{ 1569{
… …
1729 unsigned char *prop = NULL; 1576 unsigned char *prop = NULL;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop); 1579 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP) 1580 if (result == Success && prop && atype == XA_PIXMAP)
1734 {
1735 return *(Pixmap *)prop; 1581 return *(Pixmap *)prop;
1736 }
1737 } 1582 }
1583
1738 return None; 1584 return None;
1739} 1585}
1740 1586
1741#ifdef HAVE_BG_PIXMAP 1587#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS 1588# if TRACE_PIXMAPS
1743# undef update_background 1589# undef update_background
1590void
1744int rxvt_term::trace_update_background (const char *file, int line) 1591rxvt_term::trace_update_background (const char *file, int line)
1745{ 1592{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background (); 1594 update_background ();
1748} 1595}
1749# endif 1596# endif
1750 1597
1751int 1598void
1752rxvt_term::update_background () 1599rxvt_term::update_background ()
1753{ 1600{
1601 if (update_background_ev.is_active ())
1602 return;
1603
1754 bgPixmap.invalidate (); 1604 bgPixmap.invalidate ();
1755 1605
1756 /* no chance of real time refresh if we are blurring! */ 1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1607
1608 if (to_wait <= 0.)
1758 bgPixmap.render (); 1609 bgPixmap.render ();
1759 else 1610 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering ())
1764 update_background_ev.start (.05); 1611 update_background_ev.start (to_wait);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772} 1612}
1773 1613
1774void 1614void
1775rxvt_term::update_background_cb (ev::timer &w, int revents) 1615rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{ 1616{
1777 make_current (); 1617 make_current ();
1618
1619 update_background_ev.stop ();
1778 bgPixmap.render (); 1620 bgPixmap.render ();
1779 refresh_check (); 1621 refresh_check ();
1780} 1622}
1781 1623
1782#endif /* HAVE_BG_PIXMAP */ 1624#endif /* HAVE_BG_PIXMAP */

Diff Legend

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