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.258 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.268 by root, Tue Nov 27 17:52:51 2007 UTC

… …
181#endif 181#endif
182#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
184#endif 184#endif
185#ifdef USE_XIM 185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb), 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 (this, &rxvt_term::bell_cb),
190#endif 190#endif
191 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
192 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
193 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
195 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
196 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
197 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
198 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
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
… …
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 */
… …
306 delete argv; 309 delete argv;
307 310
308#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
309 delete keyboard; 312 delete keyboard;
310#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
311} 317}
312 318
313// child has exited, usually destroys 319// child has exited, usually destroys
314void 320void
315rxvt_term::child_cb (ev::child &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
… …
370 376
371 destroy_ev.start (); 377 destroy_ev.start ();
372} 378}
373 379
374void 380void
375rxvt_term::destroy_cb (ev::check &w, int revents) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 382{
377 make_current (); 383 make_current ();
378 384
379 delete this; 385 delete this;
380} 386}
… …
616void 622void
617rxvt_init () 623rxvt_init ()
618{ 624{
619 ptytty::init (); 625 ptytty::init ();
620 626
621 if (!ev::ev_default_loop (0)) 627 if (!ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 629
624 rxvt_environ = environ; 630 rxvt_environ = environ;
625 631
626 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
628 634
629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631 637
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
634 640
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
973 if (isdigit (*color)) 979 if (isdigit (*color))
974 { 980 {
975 i = atoi (color); 981 i = atoi (color);
976 982
977 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
978 { /* bright colors */ 985 /* bright colors */
979 i -= 8;
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
981 goto done; 987 goto done;
982 } 988 }
983 989
984 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
985 { /* normal colors */ 992 /* normal colors */
986 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
987 goto done; 994 goto done;
988 } 995 }
989 } 996 }
990 997
… …
995 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
996 */ 1003 */
997 1004
998 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
999 1006
1000 /* XSetWindowAttributes attr; */
1001 /* Cursor cursor; */
1002done: 1007done:
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 1009
1005 update_fade_color (idx); 1010 update_fade_color (idx);
1006 recolour_cursor (); 1011 recolour_cursor ();
… …
1030 */ 1035 */
1031void 1036void
1032rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
1033{ 1038{
1034 unsigned int i; 1039 unsigned int i;
1035 const char *xpmb = "\0"; 1040 const char *xpmb = "";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037 1042
1038 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
1039 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
1040 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
… …
1738 } 1743 }
1739 return None; 1744 return None;
1740} 1745}
1741 1746
1742#ifdef HAVE_BG_PIXMAP 1747#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756
1743int 1757int
1744rxvt_term::update_background () 1758rxvt_term::update_background ()
1745{ 1759{
1746 bgPixmap.invalidate (); 1760 bgPixmap.invalidate ();
1747 1761

Diff Legend

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