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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.294 by root, Fri Jan 4 19:12:23 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2007 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43#include <termios.h>
45#endif
46 44
47#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 46# define X_LOCALE
49# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
50#else 48#else
… …
152 150
153} 151}
154#endif 152#endif
155 153
156rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
157 : 155{
158#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 158#endif
161#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 161#endif
164#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
165 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 164#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 167#endif
170#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 170#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 182#endif
176#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 185#endif
179#ifndef NO_BELL 186#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 188#endif
182 child_ev (this, &rxvt_term::child_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188{ 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 196
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 198
203 termlist.push_back (this); 199 termlist.push_back (this);
204 200
… …
280 } 276 }
281 277
282 clear (); 278 clear ();
283 } 279 }
284 280
285 delete [] pix_colors_focused;
286#if OFF_FOCUS_FADING
287 delete [] pix_colors_unfocused;
288#endif
289
290#ifdef HAVE_BG_PIXMAP 281#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy (); 282 bgPixmap.destroy ();
292#endif 283#endif
284 display->flush (); /* ideally .put should do this */
293 displays.put (display); 285 displays.put (display);
294 286
295 scr_release (); 287 scr_release ();
296 288
297 /* clear all resources */ 289 /* clear all resources */
… …
330} 322}
331 323
332void 324void
333rxvt_term::destroy () 325rxvt_term::destroy ()
334{ 326{
335 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
336 return; 328 return;
337 329
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 331
340#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
… …
355 incr_ev.stop (); 347 incr_ev.stop ();
356 termwin_ev.stop (display); 348 termwin_ev.stop (display);
357 vt_ev.stop (display); 349 vt_ev.stop (display);
358 } 350 }
359 351
360 prepare_ev.stop (); 352 flush_ev.stop ();
361 pty_ev.stop (); 353 pty_ev.stop ();
362#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
363 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
364#endif 356#endif
365#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
476 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
478} 470}
479 471
480/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
481bool 473void
482rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
483{ 475{
484 this->envv = envv; 476 this->envv = envv;
485 477
486 SET_R (this); 478 SET_R (this);
487 set_locale (""); 479 set_locale ("");
488 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
489 481
490 if (!init_vars ()) 482 init_vars ();
491 return false;
492 483
493 init_secondary (); 484 init_secondary ();
494 485
495 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
496 487
… …
525 516
526#ifdef ENABLE_TRANSPARENCY 517#ifdef ENABLE_TRANSPARENCY
527 if (option (Opt_transparent)) 518 if (option (Opt_transparent))
528 { 519 {
529 bgPixmap.set_transparent (); 520 bgPixmap.set_transparent ();
521
530#ifdef HAVE_AFTERIMAGE 522#ifdef HAVE_AFTERIMAGE
531 if (rs [Rs_blurradius]) 523 if (rs [Rs_blurradius])
532 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533#endif 525#endif
534 if (ISSET_PIXCOLOR (Color_tint)) 526 if (ISSET_PIXCOLOR (Color_tint))
535 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
536 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
537 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
538 531
539 bgPixmap.set_root_pixmap (); 532 bgPixmap.set_root_pixmap ();
540 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
541 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
542 } 535 }
543#endif 536#endif
544 537
545#ifdef BG_IMAGE_FROM_FILE 538#ifdef BG_IMAGE_FROM_FILE
546 if (rs[Rs_backgroundPixmap] != NULL) 539 if (rs[Rs_backgroundPixmap])
547 { 540 {
548 const char *p = rs[Rs_backgroundPixmap]; 541 const char *p = rs[Rs_backgroundPixmap];
549 542
550 if ((p = strchr (p, ';')) != NULL) 543 if ((p = strchr (p, ';')) != 0)
551 { 544 {
552 p++; 545 p++;
553 bgPixmap.set_geometry (p); 546 bgPixmap.set_geometry (p);
554 } 547 }
555 else 548 else
… …
574 free (cmd_argv); 567 free (cmd_argv);
575 568
576 if (pty->pty >= 0) 569 if (pty->pty >= 0)
577 pty_ev.start (pty->pty, ev::READ); 570 pty_ev.start (pty->pty, ev::READ);
578 571
579 prepare_ev.start ();
580
581 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
582 573
583#if ENABLE_XEMBED 574#if ENABLE_XEMBED
584 if (rs[Rs_embed]) 575 if (rs[Rs_embed])
585 { 576 {
… …
590 } 581 }
591#endif 582#endif
592 583
593 XMapWindow (dpy, vt); 584 XMapWindow (dpy, vt);
594 XMapWindow (dpy, parent[0]); 585 XMapWindow (dpy, parent[0]);
595
596 return true;
597} 586}
598 587
599static struct sig_handlers 588static struct sig_handlers
600{ 589{
601 ev::sig sw_term, sw_int; 590 ev::sig sw_term, sw_int;
602 591
603 /* 592 /*
604 * Catch a fatal signal and tidy up before quitting 593 * Catch a fatal signal and tidy up before quitting
605 */ 594 */
606 void
607 sig_term (ev::sig &w, int revents) 595 void sig_term (ev::sig &w, int revents);
596
597 sig_handlers ()
608 { 598 {
609 rxvt_emergency_cleanup (); 599 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610 w.stop ();
611 kill (getpid (), w.signum);
612 }
613
614 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 600 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 601 }
619} sig_handlers; 602} sig_handlers;
603
604void
605sig_handlers::sig_term (ev::sig &w, int revents)
606{
607 rxvt_emergency_cleanup ();
608 w.stop ();
609 kill (getpid (), w.signum);
610}
620 611
621char **rxvt_environ; // startup environment 612char **rxvt_environ; // startup environment
622 613
623void 614void
624rxvt_init () 615rxvt_init ()
… …
642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643 // TODO: handle this with exceptions and tolerate the memory loss 634 // TODO: handle this with exceptions and tolerate the memory loss
644 XSetIOErrorHandler (rxvt_xioerror_handler); 635 XSetIOErrorHandler (rxvt_xioerror_handler);
645 636
646 XrmInitialize (); 637 XrmInitialize ();
647}
648
649/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */
652void *
653rxvt_malloc (size_t size)
654{
655 void *p = malloc (size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_calloc (size_t number, size_t size)
665{
666 void *p = calloc (number, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672}
673
674void *
675rxvt_realloc (void *ptr, size_t size)
676{
677 void *p = realloc (ptr, size);
678
679 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n");
681
682 return p;
683} 638}
684 639
685/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
686/* 641/*
687 * window size/position calculations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
… …
828 ws.ws_xpixel = width; 783 ws.ws_xpixel = width;
829 ws.ws_ypixel = height; 784 ws.ws_ypixel = height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
831 786
832#if 0 787#if 0
833 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
836#endif 791#endif
837} 792}
838 793
… …
1719void 1674void
1720rxvt_term::get_window_origin (int &x, int &y) 1675rxvt_term::get_window_origin (int &x, int &y)
1721{ 1676{
1722 Window cr; 1677 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725} 1680}
1726 1681
1727Pixmap 1682Pixmap
1728rxvt_term::get_pixmap_property (int prop_id) 1683rxvt_term::get_pixmap_property (int prop_id)
1729{ 1684{
… …
1736 unsigned char *prop = NULL; 1691 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop); 1694 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP) 1695 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop; 1696 return *(Pixmap *)prop;
1743 }
1744 } 1697 }
1698
1745 return None; 1699 return None;
1746} 1700}
1747 1701
1748#ifdef HAVE_BG_PIXMAP 1702#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1703# if TRACE_PIXMAPS
1750# undef update_background 1704# undef update_background
1705void
1751int rxvt_term::trace_update_background (const char *file, int line) 1706rxvt_term::trace_update_background (const char *file, int line)
1752{ 1707{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1709 update_background ();
1755} 1710}
1756# endif 1711# endif
1757 1712
1758int 1713void
1759rxvt_term::update_background () 1714rxvt_term::update_background ()
1760{ 1715{
1716 if (update_background_ev.is_active ())
1717 return;
1718
1761 bgPixmap.invalidate (); 1719 bgPixmap.invalidate ();
1762 1720
1721 ev_tstamp refresh;
1722
1723 if (!bgPixmap.need_client_side_rendering ())
1724 refresh = .05;
1725 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1763 /* no chance of real time refresh if we are blurring! */ 1726 /* no chance of real time refresh if we are blurring! */
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1727 refresh = .50;
1765 bgPixmap.render ();
1766 else 1728 else
1767 { 1729 refresh = .07;
1768 update_background_ev.stop ();
1769 1730
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05); 1731 update_background_ev.start (refresh);
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */
1774 else
1775 update_background_ev.start (.07);
1776 }
1777
1778 return 0;
1779} 1732}
1780 1733
1781void 1734void
1782rxvt_term::update_background_cb (ev::timer &w, int revents) 1735rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{ 1736{
1737 make_current ();
1738
1739 update_background_ev.stop ();
1784 bgPixmap.render (); 1740 bgPixmap.render ();
1741 refresh_check ();
1785} 1742}
1786 1743
1787#endif /* HAVE_BG_PIXMAP */ 1744#endif /* HAVE_BG_PIXMAP */
1788 1745
1789/*----------------------- end-of-file (C source) -----------------------*/ 1746/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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