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.260 by root, Sun Nov 18 02:45:26 2007 UTC vs.
Revision 1.271 by root, Tue Dec 4 16:33:42 2007 UTC

… …
152 152
153} 153}
154#endif 154#endif
155 155
156rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
157 : 157{
158#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif
161#ifdef CURSOR_BLINK
162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
163#endif
164#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
166#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif
170#ifdef SELECTION_SCROLLING
171 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
175#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 176#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 177 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 178#endif
164#ifdef HAVE_SCROLLBARS 179#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb), 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166#endif 181#endif
167#ifdef CURSOR_BLINK 182#ifdef USE_XIM
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 183 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 184#endif
182#ifdef POINTER_BLANK 185#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 186 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 187#endif
188#ifndef NO_BELL 188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 190#endif
191 termwin_ev (this, &rxvt_term::x_cb), 191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 198 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
199{ 199
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 201
202 termlist.push_back (this); 202 termlist.push_back (this);
203 203
204#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
… …
284 delete [] pix_colors_focused; 284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
287#endif 287#endif
288 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
289 displays.put (display); 292 displays.put (display);
290 293
291 scr_release (); 294 scr_release ();
292 295
293 /* clear all resources */ 296 /* clear all resources */
… …
305 delete envv; 308 delete envv;
306 delete argv; 309 delete argv;
307 310
308#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
309 delete keyboard; 312 delete keyboard;
313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
310#endif 316#endif
311} 317}
312 318
313// child has exited, usually destroys 319// child has exited, usually destroys
314void 320void
… …
594 ev::sig sw_term, sw_int; 600 ev::sig sw_term, sw_int;
595 601
596 /* 602 /*
597 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
598 */ 604 */
599 void
600 sig_term (ev::sig &w, int revents) 605 void sig_term (ev::sig &w, int revents);
606
607 sig_handlers ()
601 { 608 {
602 rxvt_emergency_cleanup (); 609 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 w.stop ();
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 610 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 611 }
612} sig_handlers; 612} sig_handlers;
613 613
614void
615sig_handlers::sig_term (ev::sig &w, int revents)
616{
617 rxvt_emergency_cleanup ();
618 w.stop ();
619 kill (getpid (), w.signum);
620}
621
614char **rxvt_environ; // startup environment 622char **rxvt_environ; // startup environment
615 623
616void 624void
617rxvt_init () 625rxvt_init ()
618{ 626{
619 ptytty::init (); 627 ptytty::init ();
620 628
621 if (!ev::ev_default_loop (0)) 629 if (!ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 630 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 631
624 rxvt_environ = environ; 632 rxvt_environ = environ;
625 633
626 signal (SIGHUP, SIG_IGN); 634 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 635 signal (SIGPIPE, SIG_IGN);
628 636
629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 637 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 638 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631 639
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 640 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */ 641 /* signal (SIGURG, SIG_DFL); */
634 642
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
973 if (isdigit (*color)) 981 if (isdigit (*color))
974 { 982 {
975 i = atoi (color); 983 i = atoi (color);
976 984
977 if (i >= 8 && i <= 15) 985 if (i >= 8 && i <= 15)
986 {
978 { /* bright colors */ 987 /* bright colors */
979 i -= 8;
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 988 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
981 goto done; 989 goto done;
982 } 990 }
983 991
984 if (i >= 0 && i <= 7) 992 if (i >= 0 && i <= 7)
993 {
985 { /* normal colors */ 994 /* normal colors */
986 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 995 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
987 goto done; 996 goto done;
988 } 997 }
989 } 998 }
990 999
… …
995 * so just keep gobbling up the colormap 1004 * so just keep gobbling up the colormap
996 */ 1005 */
997 1006
998 pix_colors_focused[idx] = xcol; 1007 pix_colors_focused[idx] = xcol;
999 1008
1000 /* XSetWindowAttributes attr; */
1001 /* Cursor cursor; */
1002done: 1009done:
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 1010 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 1011
1005 update_fade_color (idx); 1012 update_fade_color (idx);
1006 recolour_cursor (); 1013 recolour_cursor ();
… …
1030 */ 1037 */
1031void 1038void
1032rxvt_term::set_colorfgbg () 1039rxvt_term::set_colorfgbg ()
1033{ 1040{
1034 unsigned int i; 1041 unsigned int i;
1035 const char *xpmb = "\0"; 1042 const char *xpmb = "";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1043 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037 1044
1038 strcpy (fstr, "default"); 1045 strcpy (fstr, "default");
1039 strcpy (bstr, "default"); 1046 strcpy (bstr, "default");
1040 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
… …
1740} 1747}
1741 1748
1742#ifdef HAVE_BG_PIXMAP 1749#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS 1750# if TRACE_PIXMAPS
1744# undef update_background 1751# undef update_background
1745int rxvt_term::trace_update_background (const char* file, int line) 1752int rxvt_term::trace_update_background (const char *file, int line)
1746{ 1753{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1754 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background (); 1755 update_background ();
1749} 1756}
1750# endif 1757# endif
1758
1751int 1759int
1752rxvt_term::update_background () 1760rxvt_term::update_background ()
1753{ 1761{
1754 bgPixmap.invalidate (); 1762 bgPixmap.invalidate ();
1755 1763

Diff Legend

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