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.272 by root, Tue Dec 11 03:30:49 2007 UTC vs.
Revision 1.297 by sasha, Fri Jan 4 21:31: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
… …
157{ 155{
158#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 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.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 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.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 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.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 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
… …
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.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
175#endif 173#endif
176#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
178#endif 176#endif
179#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#endif 179#endif
182#ifdef USE_XIM 180#ifdef USE_XIM
… …
187#endif 185#endif
188#ifndef NO_BELL 186#ifndef NO_BELL
189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 188#endif
191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
279 } 276 }
280 277
281 clear (); 278 clear ();
282 } 279 }
283 280
284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP 281#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy (); 282 bgPixmap.destroy ();
291#endif 283#endif
284 display->flush (); /* ideally .put should do this */
292 displays.put (display); 285 displays.put (display);
293 286
294 scr_release (); 287 scr_release ();
295 288
296 /* clear all resources */ 289 /* clear all resources */
… …
329} 322}
330 323
331void 324void
332rxvt_term::destroy () 325rxvt_term::destroy ()
333{ 326{
334 if (ev_is_active (&destroy_ev)) 327 if (destroy_ev.is_active ())
335 return; 328 return;
336 329
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 331
339#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
… …
354 incr_ev.stop (); 347 incr_ev.stop ();
355 termwin_ev.stop (display); 348 termwin_ev.stop (display);
356 vt_ev.stop (display); 349 vt_ev.stop (display);
357 } 350 }
358 351
359 prepare_ev.stop (); 352 flush_ev.stop ();
360 pty_ev.stop (); 353 pty_ev.stop ();
361#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
363#endif 356#endif
364#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
475 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
477} 470}
478 471
479/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
480bool 473void
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{ 475{
483 this->envv = envv; 476 this->envv = envv;
484 477
485 SET_R (this); 478 SET_R (this);
486 set_locale (""); 479 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
488 481
489 if (!init_vars ()) 482 init_vars ();
490 return false;
491 483
492 init_secondary (); 484 init_secondary ();
493 485
494 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
495 487
… …
524 516
525#ifdef ENABLE_TRANSPARENCY 517#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent)) 518 if (option (Opt_transparent))
527 { 519 {
528 bgPixmap.set_transparent (); 520 bgPixmap.set_transparent ();
521
529#ifdef HAVE_AFTERIMAGE 522#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius]) 523 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif 525#endif
533 if (ISSET_PIXCOLOR (Color_tint)) 526 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
535 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
537 531
538 bgPixmap.set_root_pixmap (); 532 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
541 } 535 }
542#endif 536#endif
543 537
544#ifdef BG_IMAGE_FROM_FILE 538#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL) 539 if (rs[Rs_backgroundPixmap])
546 { 540 {
547 const char *p = rs[Rs_backgroundPixmap]; 541 const char *p = rs[Rs_backgroundPixmap];
548 542
549 if ((p = strchr (p, ';')) != NULL) 543 if ((p = strchr (p, ';')) != 0)
550 { 544 {
551 p++; 545 p++;
552 bgPixmap.set_geometry (p); 546 bgPixmap.set_geometry (p);
553 } 547 }
554 else 548 else
… …
573 free (cmd_argv); 567 free (cmd_argv);
574 568
575 if (pty->pty >= 0) 569 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ); 570 pty_ev.start (pty->pty, ev::READ);
577 571
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
581 573
582#if ENABLE_XEMBED 574#if ENABLE_XEMBED
583 if (rs[Rs_embed]) 575 if (rs[Rs_embed])
584 { 576 {
… …
589 } 581 }
590#endif 582#endif
591 583
592 XMapWindow (dpy, vt); 584 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]); 585 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 586}
597 587
598static struct sig_handlers 588static struct sig_handlers
599{ 589{
600 ev::sig sw_term, sw_int; 590 ev::sig sw_term, sw_int;
… …
645 XSetIOErrorHandler (rxvt_xioerror_handler); 635 XSetIOErrorHandler (rxvt_xioerror_handler);
646 636
647 XrmInitialize (); 637 XrmInitialize ();
648} 638}
649 639
650/* ------------------------------------------------------------------------- *
651 * MEMORY ALLOCATION WRAPPERS *
652 * ------------------------------------------------------------------------- */
653void *
654rxvt_malloc (size_t size)
655{
656 void *p = malloc (size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_calloc (size_t number, size_t size)
666{
667 void *p = calloc (number, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673}
674
675void *
676rxvt_realloc (void *ptr, size_t size)
677{
678 void *p = realloc (ptr, size);
679
680 if (!p)
681 rxvt_fatal ("memory allocation failure. aborting.\n");
682
683 return p;
684}
685
686/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
687/* 641/*
688 * window size/position calculations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
690 */ 644 */
… …
829 ws.ws_xpixel = width; 783 ws.ws_xpixel = width;
830 ws.ws_ypixel = height; 784 ws.ws_ypixel = height;
831 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
832 786
833#if 0 787#if 0
834 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
835 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
836 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
837#endif 791#endif
838} 792}
839 793
… …
1720void 1674void
1721rxvt_term::get_window_origin (int &x, int &y) 1675rxvt_term::get_window_origin (int &x, int &y)
1722{ 1676{
1723 Window cr; 1677 Window cr;
1724 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1725/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1726} 1680}
1727 1681
1728Pixmap 1682Pixmap
1729rxvt_term::get_pixmap_property (int prop_id) 1683rxvt_term::get_pixmap_property (int prop_id)
1730{ 1684{
… …
1737 unsigned char *prop = NULL; 1691 unsigned char *prop = NULL;
1738 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1739 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1740 &nitems, &bytes_after, &prop); 1694 &nitems, &bytes_after, &prop);
1741 if (result == Success && prop && atype == XA_PIXMAP) 1695 if (result == Success && prop && atype == XA_PIXMAP)
1742 {
1743 return *(Pixmap *)prop; 1696 return *(Pixmap *)prop;
1744 }
1745 } 1697 }
1698
1746 return None; 1699 return None;
1747} 1700}
1748 1701
1749#ifdef HAVE_BG_PIXMAP 1702#ifdef HAVE_BG_PIXMAP
1750# if TRACE_PIXMAPS 1703# if TRACE_PIXMAPS
1751# undef update_background 1704# undef update_background
1705void
1752int rxvt_term::trace_update_background (const char *file, int line) 1706rxvt_term::trace_update_background (const char *file, int line)
1753{ 1707{
1754 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1755 update_background (); 1709 update_background ();
1756} 1710}
1757# endif 1711# endif
1758 1712
1759int 1713void
1760rxvt_term::update_background () 1714rxvt_term::update_background ()
1761{ 1715{
1716 if (update_background_ev.is_active ())
1717 return;
1718
1762 bgPixmap.invalidate (); 1719 bgPixmap.invalidate ();
1763 1720
1764 /* no chance of real time refresh if we are blurring! */ 1721 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1765 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1722
1723 if (to_wait <= 0.)
1766 bgPixmap.render (); 1724 bgPixmap.render ();
1767 else 1725 else
1768 {
1769 update_background_ev.stop ();
1770
1771 if (!bgPixmap.need_client_side_rendering())
1772 update_background_ev.start (.05); 1726 update_background_ev.start (to_wait);
1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1774 update_background_ev.start (.20); /* very slow !!! */
1775 else
1776 update_background_ev.start (.07);
1777 }
1778
1779 return 0;
1780} 1727}
1781 1728
1782void 1729void
1783rxvt_term::update_background_cb (ev::timer &w, int revents) 1730rxvt_term::update_background_cb (ev::timer &w, int revents)
1784{ 1731{
1732 make_current ();
1733
1734 update_background_ev.stop ();
1785 bgPixmap.render (); 1735 bgPixmap.render ();
1736 refresh_check ();
1786} 1737}
1787 1738
1788#endif /* HAVE_BG_PIXMAP */ 1739#endif /* HAVE_BG_PIXMAP */
1789 1740
1790/*----------------------- end-of-file (C source) -----------------------*/ 1741/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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