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.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC

… …
153} 153}
154#endif 154#endif
155 155
156rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
157 : 157 :
158#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP 158#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb), 159 update_background_ev(this, &rxvt_term::update_background_cb),
163#endif 160#endif
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK 161#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif 163#endif
170#ifdef TEXT_BLINK 164#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb), 165 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 175#endif
182#ifdef POINTER_BLANK 176#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 177 pointer_ev (this, &rxvt_term::pointer_cb),
184#endif 178#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif
188#ifndef NO_BELL 179#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 180 bell_ev (this, &rxvt_term::bell_cb),
190#endif 181#endif
191 termwin_ev (this, &rxvt_term::x_cb),
192 vt_ev (this, &rxvt_term::x_cb),
193 child_ev (this, &rxvt_term::child_cb), 182 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb), 183 prepare_ev (this, &rxvt_term::prepare_cb),
195 flush_ev (this, &rxvt_term::flush_cb), 184 flush_ev (this, &rxvt_term::flush_cb),
196 destroy_ev (this, &rxvt_term::destroy_cb), 185 destroy_ev (this, &rxvt_term::destroy_cb),
197 pty_ev (this, &rxvt_term::pty_cb), 186 pty_ev (this, &rxvt_term::pty_cb),
198 incr_ev (this, &rxvt_term::incr_cb) 187 incr_ev (this, &rxvt_term::incr_cb)
199{ 188{
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 202
202 termlist.push_back (this); 203 termlist.push_back (this);
203 204
204#ifdef KEYSYM_RESOURCE 205#ifdef KEYSYM_RESOURCE
… …
622void 623void
623rxvt_init () 624rxvt_init ()
624{ 625{
625 ptytty::init (); 626 ptytty::init ();
626 627
627 if (!ev::ev_default_loop (0)) 628 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 629 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629 630
630 rxvt_environ = environ; 631 rxvt_environ = environ;
631 632
632 signal (SIGHUP, SIG_IGN); 633 signal (SIGHUP, SIG_IGN);
633 signal (SIGPIPE, SIG_IGN); 634 signal (SIGPIPE, SIG_IGN);
634 635
635 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 636 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 637 sig_handlers.sw_int.start (SIGINT); ev_unref ();
637 638
638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 639 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
639 /* signal (SIGURG, SIG_DFL); */ 640 /* signal (SIGURG, SIG_DFL); */
640 641
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
979 if (isdigit (*color)) 980 if (isdigit (*color))
980 { 981 {
981 i = atoi (color); 982 i = atoi (color);
982 983
983 if (i >= 8 && i <= 15) 984 if (i >= 8 && i <= 15)
985 {
984 { /* bright colors */ 986 /* bright colors */
985 i -= 8;
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
987 goto done; 988 goto done;
988 } 989 }
989 990
990 if (i >= 0 && i <= 7) 991 if (i >= 0 && i <= 7)
992 {
991 { /* normal colors */ 993 /* normal colors */
992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 994 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
993 goto done; 995 goto done;
994 } 996 }
995 } 997 }
996 998
… …
1001 * so just keep gobbling up the colormap 1003 * so just keep gobbling up the colormap
1002 */ 1004 */
1003 1005
1004 pix_colors_focused[idx] = xcol; 1006 pix_colors_focused[idx] = xcol;
1005 1007
1006 /* XSetWindowAttributes attr; */
1007 /* Cursor cursor; */
1008done: 1008done:
1009 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
1010 1010
1011 update_fade_color (idx); 1011 update_fade_color (idx);
1012 recolour_cursor (); 1012 recolour_cursor ();
… …
1036 */ 1036 */
1037void 1037void
1038rxvt_term::set_colorfgbg () 1038rxvt_term::set_colorfgbg ()
1039{ 1039{
1040 unsigned int i; 1040 unsigned int i;
1041 const char *xpmb = "\0"; 1041 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043 1043
1044 strcpy (fstr, "default"); 1044 strcpy (fstr, "default");
1045 strcpy (bstr, "default"); 1045 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
… …
1746} 1746}
1747 1747
1748#ifdef HAVE_BG_PIXMAP 1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1749# if TRACE_PIXMAPS
1750# undef update_background 1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line) 1751int rxvt_term::trace_update_background (const char *file, int line)
1752{ 1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1754 update_background ();
1755} 1755}
1756# endif 1756# endif
1757
1757int 1758int
1758rxvt_term::update_background () 1759rxvt_term::update_background ()
1759{ 1760{
1760 bgPixmap.invalidate (); 1761 bgPixmap.invalidate ();
1761 1762

Diff Legend

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