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.265 by ayin, Mon Nov 26 10:08:36 2007 UTC vs.
Revision 1.287 by ayin, Tue Dec 18 01:26:42 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
… …
152 150
153} 151}
154#endif 152#endif
155 153
156rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
157 : 155{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
163#endif 176#endif
164#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166#endif 179#endif
167#ifdef CURSOR_BLINK 180#ifdef USE_XIM
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 182#endif
182#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 185#endif
188#ifndef NO_BELL 186#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 188#endif
191 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 196
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 198
202 termlist.push_back (this); 199 termlist.push_back (this);
203 200
204#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
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 (destroy_ev.active) 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
… …
573 free (cmd_argv); 570 free (cmd_argv);
574 571
575 if (pty->pty >= 0) 572 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ); 573 pty_ev.start (pty->pty, ev::READ);
577 574
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
581 576
582#if ENABLE_XEMBED 577#if ENABLE_XEMBED
583 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
584 { 579 {
… …
589 } 584 }
590#endif 585#endif
591 586
592 XMapWindow (dpy, vt); 587 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]); 588 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 589}
597 590
598static struct sig_handlers 591static struct sig_handlers
599{ 592{
600 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
601 594
602 /* 595 /*
603 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
604 */ 597 */
605 void
606 sig_term (ev::sig &w, int revents) 598 void sig_term (ev::sig &w, int revents);
599
600 sig_handlers ()
607 { 601 {
608 rxvt_emergency_cleanup (); 602 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
609 w.stop ();
610 kill (getpid (), w.signum);
611 }
612
613 sig_handlers ()
614 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 603 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616 {
617 } 604 }
618} sig_handlers; 605} sig_handlers;
606
607void
608sig_handlers::sig_term (ev::sig &w, int revents)
609{
610 rxvt_emergency_cleanup ();
611 w.stop ();
612 kill (getpid (), w.signum);
613}
619 614
620char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
621 616
622void 617void
623rxvt_init () 618rxvt_init ()
… …
827 ws.ws_xpixel = width; 822 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 823 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830 825
831#if 0 826#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 827 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 828 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 829 kill (-cmd_pid, SIGWINCH);
835#endif 830#endif
836} 831}
837 832
… …
981 i = atoi (color); 976 i = atoi (color);
982 977
983 if (i >= 8 && i <= 15) 978 if (i >= 8 && i <= 15)
984 { 979 {
985 /* bright colors */ 980 /* bright colors */
986 i -= 8;
987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
988 goto done; 982 goto done;
989 } 983 }
990 984
991 if (i >= 0 && i <= 7) 985 if (i >= 0 && i <= 7)
992 { 986 {
… …
1036 */ 1030 */
1037void 1031void
1038rxvt_term::set_colorfgbg () 1032rxvt_term::set_colorfgbg ()
1039{ 1033{
1040 unsigned int i; 1034 unsigned int i;
1041 const char *xpmb = "\0"; 1035 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043 1037
1044 strcpy (fstr, "default"); 1038 strcpy (fstr, "default");
1045 strcpy (bstr, "default"); 1039 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 1040 for (i = Color_Black; i <= Color_White; i++)
… …
1746} 1740}
1747 1741
1748#ifdef HAVE_BG_PIXMAP 1742#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1743# if TRACE_PIXMAPS
1750# undef update_background 1744# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line) 1745int rxvt_term::trace_update_background (const char *file, int line)
1752{ 1746{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1747 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1748 update_background ();
1755} 1749}
1756# endif 1750# endif
1751
1757int 1752int
1758rxvt_term::update_background () 1753rxvt_term::update_background ()
1759{ 1754{
1760 bgPixmap.invalidate (); 1755 bgPixmap.invalidate ();
1761 1756
1762 /* no chance of real time refresh if we are blurring! */ 1757 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1764 bgPixmap.render (); 1759 bgPixmap.render ();
1765 else 1760 else
1766 { 1761 {
1762 ev_tstamp refresh;
1767 update_background_ev.stop (); 1763 update_background_ev.stop ();
1768 1764
1769 if (!bgPixmap.need_client_side_rendering()) 1765 if (!bgPixmap.need_client_side_rendering ())
1770 update_background_ev.start (.05); 1766 refresh = .05;
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1767 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */ 1768 refresh = .20; /* very slow !!! */
1773 else 1769 else
1770 refresh = .07;
1774 update_background_ev.start (.07); 1771 update_background_ev.start (refresh);
1775 } 1772 }
1776 1773
1777 return 0; 1774 return 0;
1778} 1775}
1779 1776
1780void 1777void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1778rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1779{
1780 make_current ();
1783 bgPixmap.render (); 1781 bgPixmap.render ();
1782 refresh_check ();
1784} 1783}
1785 1784
1786#endif /* HAVE_BG_PIXMAP */ 1785#endif /* HAVE_BG_PIXMAP */
1787 1786
1788/*----------------------- end-of-file (C source) -----------------------*/ 1787/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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