ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.218 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
41 39
42#include <limits> 40#include <limits>
43 41
44#include <csignal> 42#include <csignal>
45 43
44#include <fcntl.h>
45
46#ifdef HAVE_XSETLOCALE 46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 47# define X_LOCALE
48# include <X11/Xlocale.h> 48# include <X11/Xlocale.h>
49#else 49#else
50# ifdef HAVE_SETLOCALE 50# ifdef HAVE_SETLOCALE
… …
154 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
155 "rgb:cd/cd/00", // 3: yellow (Yellow3) 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
156 "rgb:00/00/cd", // 4: blue (Blue3) 156 "rgb:00/00/cd", // 4: blue (Blue3)
157 "rgb:cd/00/cd", // 5: magenta (Magenta3) 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
158 "rgb:00/cd/cd", // 6: cyan (Cyan3) 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
159# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
160 "rgb:e5/e5/e5", // 7: white (Grey90) 160 "rgb:e5/e5/e5", // 7: white (Grey90)
161# else 161# else
162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163# endif 163# endif
164 /* high-intensity colors */ 164 /* high-intensity colors */
165# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
166 "rgb:4d/4d/4d", // 8: bright black (Grey30) 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
250 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
251 251
252#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
256 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
257 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
258 NULL, /* Color_border */ 258 NULL, /* Color_border */
259#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
260 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
261 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
262 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
263 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265#if ENABLE_FRILLS 265#if ENABLE_FRILLS
266 NULL, // Color_underline 266 NULL, // Color_underline
267#endif 267#endif
268#ifdef OPTION_HC 268#ifdef OPTION_HC
269 NULL, 269 NULL,
270#endif 270#endif
271#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
275#if ENABLE_TRANSPARENCY 275#if ENABLE_TRANSPARENCY
276 NULL, 276 NULL,
277#endif 277#endif
278#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 279 "rgb:00/00/00",
280#endif 280#endif
281 }; 281 };
282 282
283bool 283void
284rxvt_term::init_vars () 284rxvt_term::init_vars ()
285{ 285{
286 pix_colors = // 286 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 287
293 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
295 want_refresh = 1; 290 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
… …
298 nrow = 24; 293 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
302 saveLines = SAVELINES; 297 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 298
305 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
306 300
307 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1; 302 last_bot = last_state = -1;
… …
314 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
319
320 return true;
321} 313}
322 314
323void 315void
324rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
325{ 317{
… …
369 break; 361 break;
370 362
371 if (r_argc == argc) 363 if (r_argc == argc)
372 cmd_argv = NULL; 364 cmd_argv = NULL;
373 else if (!argv[r_argc + 1]) 365 else if (!argv[r_argc + 1])
374 rxvt_fatal ("-e requires an argument\n"); 366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else 367 else
376 { 368 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378 370
379 for (i = 0; i < argc - r_argc - 1; i++) 371 for (i = 0; i < argc - r_argc - 1; i++)
… …
416 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 410#endif
419 411
420#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif 416#endif
423 free (r_argv); 417 free (r_argv);
424 418
425 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
… …
538 color_aliases (Color_fg); 532 color_aliases (Color_fg);
539 color_aliases (Color_bg); 533 color_aliases (Color_bg);
540#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
541 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
542 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
543#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
544 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
545 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
546 color_aliases (Color_border); 540 color_aliases (Color_border);
547#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
548 color_aliases (Color_BD); 542 color_aliases (Color_BD);
549 color_aliases (Color_UL); 543 color_aliases (Color_UL);
550 color_aliases (Color_RV); 544 color_aliases (Color_RV);
551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552 546
553 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555 549
556 return cmd_argv; 550 return cmd_argv;
… …
576 */ 570 */
577 val = rxvt_network_display (rs[Rs_display_name]); 571 val = rxvt_network_display (rs[Rs_display_name]);
578 rs[Rs_display_name] = (const char *)val; 572 rs[Rs_display_name] = (const char *)val;
579 573
580 if (val == NULL) 574 if (val == NULL)
581#endif /* DISPLAY_IS_IP */ 575#endif /* DISPLAY_IS_IP */
582 val = XDisplayString (dpy); 576 val = XDisplayString (dpy);
583 577
584 if (rs[Rs_display_name] == NULL) 578 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 579 rs[Rs_display_name] = val; /* use broken `:0' value */
586 580
… …
626#ifdef HAVE_UNSETENV 620#ifdef HAVE_UNSETENV
627 /* avoid passing old settings and confusing term size */ 621 /* avoid passing old settings and confusing term size */
628 unsetenv ("LINES"); 622 unsetenv ("LINES");
629 unsetenv ("COLUMNS"); 623 unsetenv ("COLUMNS");
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 624 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 625#endif /* HAVE_UNSETENV */
632} 626}
633 627
634/*----------------------------------------------------------------------*/ 628/*----------------------------------------------------------------------*/
635/* 629/*
636 * This is more or less stolen straight from XFree86 xterm. 630 * This is more or less stolen straight from XFree86 xterm.
… …
657 651
658 this->locale = "C"; 652 this->locale = "C";
659 } 653 }
660 654
661 655
662 this->locale = rxvt_strdup (this->locale); 656 this->locale = strdup (this->locale);
663 SET_LOCALE (this->locale); 657 SET_LOCALE (this->locale);
664 mbstate.reset (); 658 mbstate.reset ();
665#endif 659#endif
666 660
667#if HAVE_NL_LANGINFO 661#if HAVE_NL_LANGINFO
… …
747 int i; 741 int i;
748 742
749#ifdef OFF_FOCUS_FADING 743#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 744 pix_colors = pix_colors_focused;
751#endif 745#endif
752 746
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 747 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 { 748 {
755 const char *name = rs[Rs_color + i]; 749 const char *name = rs[Rs_color + i];
756 750
757 if (!name) 751 if (!name)
… …
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 829 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 830 cscroll.a)
837 )) 831 ))
838 alias_color (Color_topShadow, Color_White); 832 alias_color (Color_topShadow, Color_White);
839 } 833 }
840#endif /* KEEP_SCROLLCOLOR */ 834#endif /* KEEP_SCROLLCOLOR */
841 835
842#ifdef OFF_FOCUS_FADING 836#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 837 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 838 update_fade_color (i);
845#endif 839#endif
… …
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 847 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854 { 848 {
855 int i = atoi (rs[Rs_color + idx]); 849 int i = atoi (rs[Rs_color + idx]);
856 850
857 if (i >= 8 && i <= 15) 851 if (i >= 8 && i <= 15)
858 { /* bright colors */ 852 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 853 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 854 else if (i >= 0 && i <= 7)
862 } 855 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 857 }
867} 858}
868 859
869/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
… …
1151rxvt_get_ttymode (ttymode_t *tio, int erase) 1142rxvt_get_ttymode (ttymode_t *tio, int erase)
1152{ 1143{
1153 /* 1144 /*
1154 * standard System V termios interface 1145 * standard System V termios interface
1155 */ 1146 */
1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1147 if (tcgetattr (STDIN_FILENO, tio) < 0)
1157 { 1148 {
1158 // return error - use system defaults, 1149 // return error - use system defaults,
1159 // where possible, and zero elsewhere 1150 // where possible, and zero elsewhere
1160 memset (tio, 0, sizeof (ttymode_t)); 1151 memset (tio, 0, sizeof (ttymode_t));
1161 1152
… …
1229 1220
1230 /* 1221 /*
1231 * Debugging 1222 * Debugging
1232 */ 1223 */
1233#ifdef DEBUG_TTYMODE 1224#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */ 1225 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n"); 1226 fprintf (stderr, "Input flags\n");
1237 1227
1238 /* cpp token stringize doesn't work on all machines <sigh> */ 1228 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \ 1229# define FOO(flag,name) \
… …
1302 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1303# endif 1293# endif
1304 1294
1305 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1306# undef FOO 1296# undef FOO
1307# endif /* HAVE_TERMIOS_H */ 1297#endif /* DEBUG_TTYMODE */
1308#endif /* DEBUG_TTYMODE */
1309} 1298}
1310 1299
1311/*----------------------------------------------------------------------*/ 1300/*----------------------------------------------------------------------*/
1312/* 1301/*
1313 * Run the command in a subprocess and return a file descriptor for the 1302 * Run the command in a subprocess and return a file descriptor for the
… …
1346 else 1335 else
1347#endif 1336#endif
1348 er = -1; 1337 er = -1;
1349 1338
1350 rxvt_get_ttymode (&tio, er); 1339 rxvt_get_ttymode (&tio, er);
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1340 /* init terminal attributes */
1341 cfsetospeed (&tio, BAUDRATE);
1342 cfsetispeed (&tio, BAUDRATE);
1343 tcsetattr (pty->tty, TCSANOW, &tio);
1352 pty->set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1353 1345
1354 /* set initial window size */ 1346 /* set initial window size */
1355 tt_winch (); 1347 tt_winch ();
1356 1348
… …
1416rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1417{ 1409{
1418 char *login; 1410 char *login;
1419 1411
1420 if (option (Opt_console)) 1412 if (option (Opt_console))
1413 {
1421 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1415#ifdef TIOCCONS
1423 unsigned int on = 1; 1416 unsigned int on = 1;
1424 1417
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1428 1421
1429 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1423 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432 close (fd); 1425 close (fd);
1433#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1434 } 1427 }
1435 1428
1436 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1445 */ 1438 */
1446#ifdef SIGTSTP 1439#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1451 1444
1452 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss; 1446 sigset_t ss;
1454 sigemptyset (&ss); 1447 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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