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.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs.
Revision 1.268 by root, Tue Nov 27 17:52:51 2007 UTC

… …
309 delete argv; 309 delete argv;
310 310
311#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
312 delete keyboard; 312 delete keyboard;
313#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
314} 317}
315 318
316// child has exited, usually destroys 319// child has exited, usually destroys
317void 320void
318rxvt_term::child_cb (ev::child &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
… …
619void 622void
620rxvt_init () 623rxvt_init ()
621{ 624{
622 ptytty::init (); 625 ptytty::init ();
623 626
624 if (!ev::ev_default_loop (0)) 627 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 629
627 rxvt_environ = environ; 630 rxvt_environ = environ;
628 631
629 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
631 634
632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634 637
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
637 640
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
976 if (isdigit (*color)) 979 if (isdigit (*color))
977 { 980 {
978 i = atoi (color); 981 i = atoi (color);
979 982
980 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
981 { /* bright colors */ 985 /* bright colors */
982 i -= 8;
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
984 goto done; 987 goto done;
985 } 988 }
986 989
987 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
988 { /* normal colors */ 992 /* normal colors */
989 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
990 goto done; 994 goto done;
991 } 995 }
992 } 996 }
993 997
… …
998 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
999 */ 1003 */
1000 1004
1001 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
1002 1006
1003 /* XSetWindowAttributes attr; */
1004 /* Cursor cursor; */
1005done: 1007done:
1006 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
1007 1009
1008 update_fade_color (idx); 1010 update_fade_color (idx);
1009 recolour_cursor (); 1011 recolour_cursor ();
… …
1033 */ 1035 */
1034void 1036void
1035rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
1036{ 1038{
1037 unsigned int i; 1039 unsigned int i;
1038 const char *xpmb = "\0"; 1040 const char *xpmb = "";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040 1042
1041 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
1042 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
… …
1743} 1745}
1744 1746
1745#ifdef HAVE_BG_PIXMAP 1747#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS 1748# if TRACE_PIXMAPS
1747# undef update_background 1749# undef update_background
1748int rxvt_term::trace_update_background (const char* file, int line) 1750int rxvt_term::trace_update_background (const char *file, int line)
1749{ 1751{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background (); 1753 update_background ();
1752} 1754}
1753# endif 1755# endif
1756
1754int 1757int
1755rxvt_term::update_background () 1758rxvt_term::update_background ()
1756{ 1759{
1757 bgPixmap.invalidate (); 1760 bgPixmap.invalidate ();
1758 1761

Diff Legend

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