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.264 by root, Sat Nov 24 11:06:13 2007 UTC vs.
Revision 1.273 by ayin, Tue Dec 11 11:39:06 2007 UTC

… …
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);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
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 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
199{ 197
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 199
202 termlist.push_back (this); 200 termlist.push_back (this);
203 201
204#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
329} 327}
330 328
331void 329void
332rxvt_term::destroy () 330rxvt_term::destroy ()
333{ 331{
334 if (destroy_ev.active) 332 if (ev_is_active (&destroy_ev))
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
… …
600 ev::sig sw_term, sw_int; 598 ev::sig sw_term, sw_int;
601 599
602 /* 600 /*
603 * Catch a fatal signal and tidy up before quitting 601 * Catch a fatal signal and tidy up before quitting
604 */ 602 */
605 void
606 sig_term (ev::sig &w, int revents) 603 void sig_term (ev::sig &w, int revents);
604
605 sig_handlers ()
607 { 606 {
608 rxvt_emergency_cleanup (); 607 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) 608 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616 {
617 } 609 }
618} sig_handlers; 610} sig_handlers;
611
612void
613sig_handlers::sig_term (ev::sig &w, int revents)
614{
615 rxvt_emergency_cleanup ();
616 w.stop ();
617 kill (getpid (), w.signum);
618}
619 619
620char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
621 621
622void 622void
623rxvt_init () 623rxvt_init ()
… …
979 if (isdigit (*color)) 979 if (isdigit (*color))
980 { 980 {
981 i = atoi (color); 981 i = atoi (color);
982 982
983 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
984 { /* bright colors */ 985 /* bright colors */
985 i -= 8;
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
987 goto done; 987 goto done;
988 } 988 }
989 989
990 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
991 { /* normal colors */ 992 /* normal colors */
992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
993 goto done; 994 goto done;
994 } 995 }
995 } 996 }
996 997
… …
1001 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
1002 */ 1003 */
1003 1004
1004 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
1005 1006
1006 /* XSetWindowAttributes attr; */
1007 /* Cursor cursor; */
1008done: 1007done:
1009 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
1010 1009
1011 update_fade_color (idx); 1010 update_fade_color (idx);
1012 recolour_cursor (); 1011 recolour_cursor ();
… …
1036 */ 1035 */
1037void 1036void
1038rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
1039{ 1038{
1040 unsigned int i; 1039 unsigned int i;
1041 const char *xpmb = "\0"; 1040 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043 1042
1044 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
1045 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
… …
1746} 1745}
1747 1746
1748#ifdef HAVE_BG_PIXMAP 1747#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1748# if TRACE_PIXMAPS
1750# undef update_background 1749# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line) 1750int rxvt_term::trace_update_background (const char *file, int line)
1752{ 1751{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1753 update_background ();
1755} 1754}
1756# endif 1755# endif
1756
1757int 1757int
1758rxvt_term::update_background () 1758rxvt_term::update_background ()
1759{ 1759{
1760 bgPixmap.invalidate (); 1760 bgPixmap.invalidate ();
1761 1761

Diff Legend

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