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.288 by ayin, Tue Dec 18 01:36:24 2007 UTC vs.
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 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-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */ 284 display->flush (); /* ideally .put should do this */
290 displays.put (display); 285 displays.put (display);
286 }
291 287
292 scr_release (); 288 scr_release ();
293 289
294 /* clear all resources */ 290 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 291 for (int i = 0; i < allocated.size (); i++)
… …
472 DisplayString (display)); 468 DisplayString (display));
473 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
475} 471}
476 472
477/*----------------------------------------------------------------------*/
478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589}
590
591static struct sig_handlers 473static struct sig_handlers
592{ 474{
593 ev::sig sw_term, sw_int; 475 ev::sig sw_term, sw_int;
594 476
595 /* 477 /*
… …
1677void 1559void
1678rxvt_term::get_window_origin (int &x, int &y) 1560rxvt_term::get_window_origin (int &x, int &y)
1679{ 1561{
1680 Window cr; 1562 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1682/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683} 1565}
1684 1566
1685Pixmap 1567Pixmap
1686rxvt_term::get_pixmap_property (int prop_id) 1568rxvt_term::get_pixmap_property (int prop_id)
1687{ 1569{
… …
1694 unsigned char *prop = NULL; 1576 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop); 1579 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP) 1580 if (result == Success && prop && atype == XA_PIXMAP)
1699 {
1700 return *(Pixmap *)prop; 1581 return *(Pixmap *)prop;
1701 }
1702 } 1582 }
1583
1703 return None; 1584 return None;
1704} 1585}
1705 1586
1706#ifdef HAVE_BG_PIXMAP 1587#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS 1588# if TRACE_PIXMAPS
1708# undef update_background 1589# undef update_background
1590void
1709int rxvt_term::trace_update_background (const char *file, int line) 1591rxvt_term::trace_update_background (const char *file, int line)
1710{ 1592{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background (); 1594 update_background ();
1713} 1595}
1714# endif 1596# endif
1715 1597
1716int 1598void
1717rxvt_term::update_background () 1599rxvt_term::update_background ()
1718{ 1600{
1601 if (update_background_ev.is_active ())
1602 return;
1603
1719 bgPixmap.invalidate (); 1604 bgPixmap.invalidate ();
1720 1605
1721 /* no chance of real time refresh if we are blurring! */ 1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1607
1608 if (to_wait <= 0.)
1723 bgPixmap.render (); 1609 bgPixmap.render ();
1724 else 1610 else
1725 {
1726 ev_tstamp refresh;
1727 update_background_ev.stop ();
1728
1729 if (!bgPixmap.need_client_side_rendering ())
1730 refresh = .05;
1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732 refresh = .20; /* very slow !!! */
1733 else
1734 refresh = .07;
1735 update_background_ev.start (refresh); 1611 update_background_ev.start (to_wait);
1736 }
1737
1738 return 0;
1739} 1612}
1740 1613
1741void 1614void
1742rxvt_term::update_background_cb (ev::timer &w, int revents) 1615rxvt_term::update_background_cb (ev::timer &w, int revents)
1743{ 1616{
1744 make_current (); 1617 make_current ();
1618
1619 update_background_ev.stop ();
1745 bgPixmap.render (); 1620 bgPixmap.render ();
1746 refresh_check (); 1621 refresh_check ();
1747} 1622}
1748 1623
1749#endif /* HAVE_BG_PIXMAP */ 1624#endif /* HAVE_BG_PIXMAP */

Diff Legend

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