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.291 by root, Mon Dec 24 06:51:37 2007 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);
… …
287#endif 284#endif
288 285
289#ifdef HAVE_BG_PIXMAP 286#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy (); 287 bgPixmap.destroy ();
291#endif 288#endif
289 display->flush (); /* ideally .put should do this */
292 displays.put (display); 290 displays.put (display);
293 291
294 scr_release (); 292 scr_release ();
295 293
296 /* clear all resources */ 294 /* clear all resources */
… …
329} 327}
330 328
331void 329void
332rxvt_term::destroy () 330rxvt_term::destroy ()
333{ 331{
334 if (ev_is_active (&destroy_ev)) 332 if (destroy_ev.is_active ())
335 return; 333 return;
336 334
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 336
339#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
354 incr_ev.stop (); 352 incr_ev.stop ();
355 termwin_ev.stop (display); 353 termwin_ev.stop (display);
356 vt_ev.stop (display); 354 vt_ev.stop (display);
357 } 355 }
358 356
359 prepare_ev.stop (); 357 flush_ev.stop ();
360 pty_ev.stop (); 358 pty_ev.stop ();
361#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
363#endif 361#endif
364#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
475 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
477} 475}
478 476
479/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
480bool 478void
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{ 480{
483 this->envv = envv; 481 this->envv = envv;
484 482
485 SET_R (this); 483 SET_R (this);
486 set_locale (""); 484 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
488 486
489 if (!init_vars ()) 487 init_vars ();
490 return false;
491 488
492 init_secondary (); 489 init_secondary ();
493 490
494 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
495 492
… …
524 521
525#ifdef ENABLE_TRANSPARENCY 522#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent)) 523 if (option (Opt_transparent))
527 { 524 {
528 bgPixmap.set_transparent (); 525 bgPixmap.set_transparent ();
526
529#ifdef HAVE_AFTERIMAGE 527#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius]) 528 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif 530#endif
533 if (ISSET_PIXCOLOR (Color_tint)) 531 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
535 if (rs [Rs_shade]) 534 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]); 535 bgPixmap.set_shade (rs [Rs_shade]);
537 536
538 bgPixmap.set_root_pixmap (); 537 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask); 538 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root); 539 rootwin_ev.start (display, display->root);
541 } 540 }
542#endif 541#endif
543 542
544#ifdef BG_IMAGE_FROM_FILE 543#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL) 544 if (rs[Rs_backgroundPixmap])
546 { 545 {
547 const char *p = rs[Rs_backgroundPixmap]; 546 const char *p = rs[Rs_backgroundPixmap];
548 547
549 if ((p = strchr (p, ';')) != NULL) 548 if ((p = strchr (p, ';')) != 0)
550 { 549 {
551 p++; 550 p++;
552 bgPixmap.set_geometry (p); 551 bgPixmap.set_geometry (p);
553 } 552 }
554 else 553 else
… …
573 free (cmd_argv); 572 free (cmd_argv);
574 573
575 if (pty->pty >= 0) 574 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ); 575 pty_ev.start (pty->pty, ev::READ);
577 576
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
581 578
582#if ENABLE_XEMBED 579#if ENABLE_XEMBED
583 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
584 { 581 {
… …
589 } 586 }
590#endif 587#endif
591 588
592 XMapWindow (dpy, vt); 589 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]); 590 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 591}
597 592
598static struct sig_handlers 593static struct sig_handlers
599{ 594{
600 ev::sig sw_term, sw_int; 595 ev::sig sw_term, sw_int;
… …
645 XSetIOErrorHandler (rxvt_xioerror_handler); 640 XSetIOErrorHandler (rxvt_xioerror_handler);
646 641
647 XrmInitialize (); 642 XrmInitialize ();
648} 643}
649 644
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/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
687/* 646/*
688 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 648 * if width/height are non-zero then override calculated width/height
690 */ 649 */
… …
829 ws.ws_xpixel = width; 788 ws.ws_xpixel = width;
830 ws.ws_ypixel = height; 789 ws.ws_ypixel = height;
831 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 790 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
832 791
833#if 0 792#if 0
834 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 793 // TIOCSWINSZ is supposed to do this automatically and correctly
835 if (cmd_pid) /* force through to the command */ 794 if (cmd_pid) /* force through to the command */
836 kill (-cmd_pid, SIGWINCH); 795 kill (-cmd_pid, SIGWINCH);
837#endif 796#endif
838} 797}
839 798
… …
1720void 1679void
1721rxvt_term::get_window_origin (int &x, int &y) 1680rxvt_term::get_window_origin (int &x, int &y)
1722{ 1681{
1723 Window cr; 1682 Window cr;
1724 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1683 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1725/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1684/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1726} 1685}
1727 1686
1728Pixmap 1687Pixmap
1729rxvt_term::get_pixmap_property (int prop_id) 1688rxvt_term::get_pixmap_property (int prop_id)
1730{ 1689{
… …
1747} 1706}
1748 1707
1749#ifdef HAVE_BG_PIXMAP 1708#ifdef HAVE_BG_PIXMAP
1750# if TRACE_PIXMAPS 1709# if TRACE_PIXMAPS
1751# undef update_background 1710# undef update_background
1711void
1752int rxvt_term::trace_update_background (const char *file, int line) 1712rxvt_term::trace_update_background (const char *file, int line)
1753{ 1713{
1754 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1714 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1755 update_background (); 1715 update_background ();
1756} 1716}
1757# endif 1717# endif
1758 1718
1759int 1719void
1760rxvt_term::update_background () 1720rxvt_term::update_background ()
1761{ 1721{
1762 bgPixmap.invalidate (); 1722 bgPixmap.invalidate ();
1763 1723
1764 /* no chance of real time refresh if we are blurring! */ 1724 /* no chance of real time refresh if we are blurring! */
1765 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1725 if (bgPixmap.invalid_since + 0.50 < ev::now ()
1726 && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1727 {
1728 update_background_ev.stop ();
1766 bgPixmap.render (); 1729 bgPixmap.render ();
1730 }
1767 else 1731 else
1768 { 1732 {
1769 update_background_ev.stop (); 1733 ev_tstamp refresh;
1770 1734
1771 if (!bgPixmap.need_client_side_rendering()) 1735 if (!bgPixmap.need_client_side_rendering ())
1772 update_background_ev.start (.05); 1736 refresh = .05;
1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1737 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1774 update_background_ev.start (.20); /* very slow !!! */ 1738 refresh = .20; /* very slow !!! */
1775 else 1739 else
1740 refresh = .07;
1741
1776 update_background_ev.start (.07); 1742 update_background_ev.start (refresh);
1777 } 1743 }
1778
1779 return 0;
1780} 1744}
1781 1745
1782void 1746void
1783rxvt_term::update_background_cb (ev::timer &w, int revents) 1747rxvt_term::update_background_cb (ev::timer &w, int revents)
1784{ 1748{
1749 make_current ();
1785 bgPixmap.render (); 1750 bgPixmap.render ();
1751 refresh_check ();
1786} 1752}
1787 1753
1788#endif /* HAVE_BG_PIXMAP */ 1754#endif /* HAVE_BG_PIXMAP */
1789 1755
1790/*----------------------- end-of-file (C source) -----------------------*/ 1756/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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