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.285 by root, Fri Dec 14 06:32:38 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
… …
329} 326}
330 327
331void 328void
332rxvt_term::destroy () 329rxvt_term::destroy ()
333{ 330{
334 if (destroy_ev.active) 331 if (destroy_ev.is_active ())
335 return; 332 return;
336 333
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 335
339#if ENABLE_OVERLAY 336#if ENABLE_OVERLAY
… …
354 incr_ev.stop (); 351 incr_ev.stop ();
355 termwin_ev.stop (display); 352 termwin_ev.stop (display);
356 vt_ev.stop (display); 353 vt_ev.stop (display);
357 } 354 }
358 355
359 prepare_ev.stop (); 356 flush_ev.stop ();
360 pty_ev.stop (); 357 pty_ev.stop ();
361#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
363#endif 360#endif
364#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
… …
475 rxvt_emergency_cleanup (); 472 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 473 _exit (EXIT_FAILURE);
477} 474}
478 475
479/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
480bool 477void
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{ 479{
483 this->envv = envv; 480 this->envv = envv;
484 481
485 SET_R (this); 482 SET_R (this);
486 set_locale (""); 483 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :( 484 set_environ (envv); // few things in X do not call setlocale :(
488 485
489 if (!init_vars ()) 486 init_vars ();
490 return false;
491 487
492 init_secondary (); 488 init_secondary ();
493 489
494 const char **cmd_argv = init_resources (argc, argv); 490 const char **cmd_argv = init_resources (argc, argv);
495 491
… …
573 free (cmd_argv); 569 free (cmd_argv);
574 570
575 if (pty->pty >= 0) 571 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ); 572 pty_ev.start (pty->pty, ev::READ);
577 573
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
581 575
582#if ENABLE_XEMBED 576#if ENABLE_XEMBED
583 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
584 { 578 {
… …
589 } 583 }
590#endif 584#endif
591 585
592 XMapWindow (dpy, vt); 586 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]); 587 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 588}
597 589
598static struct sig_handlers 590static struct sig_handlers
599{ 591{
600 ev::sig sw_term, sw_int; 592 ev::sig sw_term, sw_int;
601 593
602 /* 594 /*
603 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
604 */ 596 */
605 void
606 sig_term (ev::sig &w, int revents) 597 void sig_term (ev::sig &w, int revents);
598
599 sig_handlers ()
607 { 600 {
608 rxvt_emergency_cleanup (); 601 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) 602 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616 {
617 } 603 }
618} sig_handlers; 604} sig_handlers;
605
606void
607sig_handlers::sig_term (ev::sig &w, int revents)
608{
609 rxvt_emergency_cleanup ();
610 w.stop ();
611 kill (getpid (), w.signum);
612}
619 613
620char **rxvt_environ; // startup environment 614char **rxvt_environ; // startup environment
621 615
622void 616void
623rxvt_init () 617rxvt_init ()
… …
827 ws.ws_xpixel = width; 821 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 822 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830 824
831#if 0 825#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 826 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 827 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 828 kill (-cmd_pid, SIGWINCH);
835#endif 829#endif
836} 830}
837 831
… …
981 i = atoi (color); 975 i = atoi (color);
982 976
983 if (i >= 8 && i <= 15) 977 if (i >= 8 && i <= 15)
984 { 978 {
985 /* bright colors */ 979 /* bright colors */
986 i -= 8;
987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
988 goto done; 981 goto done;
989 } 982 }
990 983
991 if (i >= 0 && i <= 7) 984 if (i >= 0 && i <= 7)
992 { 985 {
… …
1036 */ 1029 */
1037void 1030void
1038rxvt_term::set_colorfgbg () 1031rxvt_term::set_colorfgbg ()
1039{ 1032{
1040 unsigned int i; 1033 unsigned int i;
1041 const char *xpmb = "\0"; 1034 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1035 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043 1036
1044 strcpy (fstr, "default"); 1037 strcpy (fstr, "default");
1045 strcpy (bstr, "default"); 1038 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
… …
1746} 1739}
1747 1740
1748#ifdef HAVE_BG_PIXMAP 1741#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1742# if TRACE_PIXMAPS
1750# undef update_background 1743# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line) 1744int rxvt_term::trace_update_background (const char *file, int line)
1752{ 1745{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1746 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1747 update_background ();
1755} 1748}
1756# endif 1749# endif
1750
1757int 1751int
1758rxvt_term::update_background () 1752rxvt_term::update_background ()
1759{ 1753{
1760 bgPixmap.invalidate (); 1754 bgPixmap.invalidate ();
1761 1755
… …
1764 bgPixmap.render (); 1758 bgPixmap.render ();
1765 else 1759 else
1766 { 1760 {
1767 update_background_ev.stop (); 1761 update_background_ev.stop ();
1768 1762
1769 if (!bgPixmap.need_client_side_rendering()) 1763 if (!bgPixmap.need_client_side_rendering ())
1770 update_background_ev.start (.05); 1764 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */ 1766 update_background_ev.start (.20); /* very slow !!! */
1773 else 1767 else
1774 update_background_ev.start (.07); 1768 update_background_ev.start (.07);
… …
1778} 1772}
1779 1773
1780void 1774void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1775rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1776{
1777 make_current ();
1783 bgPixmap.render (); 1778 bgPixmap.render ();
1779 refresh_check ();
1784} 1780}
1785 1781
1786#endif /* HAVE_BG_PIXMAP */ 1782#endif /* HAVE_BG_PIXMAP */
1787 1783
1788/*----------------------- end-of-file (C source) -----------------------*/ 1784/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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