… | |
… | |
41 | |
41 | |
42 | #include <limits> |
42 | #include <limits> |
43 | |
43 | |
44 | #include <csignal> |
44 | #include <csignal> |
45 | |
45 | |
|
|
46 | #include <fcntl.h> |
|
|
47 | |
|
|
48 | #ifdef HAVE_XSETLOCALE |
|
|
49 | # define X_LOCALE |
|
|
50 | # include <X11/Xlocale.h> |
|
|
51 | #else |
|
|
52 | # ifdef HAVE_SETLOCALE |
|
|
53 | # include <clocale> |
|
|
54 | # endif |
|
|
55 | #endif |
|
|
56 | |
|
|
57 | #ifdef HAVE_NL_LANGINFO |
|
|
58 | # include <langinfo.h> |
|
|
59 | #endif |
|
|
60 | |
46 | #ifdef DISPLAY_IS_IP |
61 | #ifdef DISPLAY_IS_IP |
47 | /* On Solaris link with -lsocket and -lnsl */ |
62 | /* On Solaris link with -lsocket and -lnsl */ |
48 | #include <sys/types.h> |
63 | #include <sys/types.h> |
49 | #include <sys/socket.h> |
64 | #include <sys/socket.h> |
50 | |
65 | |
… | |
… | |
141 | "rgb:00/cd/00", // 2: green (Green3) |
156 | "rgb:00/cd/00", // 2: green (Green3) |
142 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
157 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
143 | "rgb:00/00/cd", // 4: blue (Blue3) |
158 | "rgb:00/00/cd", // 4: blue (Blue3) |
144 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
159 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
145 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
160 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
146 | # ifdef XTERM_COLORS |
161 | # ifdef XTERM_COLORS |
147 | "rgb:e5/e5/e5", // 7: white (Grey90) |
162 | "rgb:e5/e5/e5", // 7: white (Grey90) |
148 | # else |
163 | # else |
149 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
164 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
150 | # endif |
165 | # endif |
151 | /* high-intensity colors */ |
166 | /* high-intensity colors */ |
152 | # ifdef XTERM_COLORS |
167 | # ifdef XTERM_COLORS |
153 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
168 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
… | |
… | |
237 | "rgb:e7/e7/e7", |
252 | "rgb:e7/e7/e7", |
238 | |
253 | |
239 | #ifndef NO_CURSORCOLOR |
254 | #ifndef NO_CURSORCOLOR |
240 | COLOR_CURSOR_BACKGROUND, |
255 | COLOR_CURSOR_BACKGROUND, |
241 | COLOR_CURSOR_FOREGROUND, |
256 | COLOR_CURSOR_FOREGROUND, |
242 | #endif /* ! NO_CURSORCOLOR */ |
257 | #endif /* ! NO_CURSORCOLOR */ |
243 | NULL, /* Color_pointer_fg */ |
258 | NULL, /* Color_pointer_fg */ |
244 | NULL, /* Color_pointer_bg */ |
259 | NULL, /* Color_pointer_bg */ |
245 | NULL, /* Color_border */ |
260 | NULL, /* Color_border */ |
246 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
261 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
247 | NULL, /* Color_BD */ |
262 | NULL, /* Color_BD */ |
248 | NULL, /* Color_IT */ |
263 | NULL, /* Color_IT */ |
249 | NULL, /* Color_UL */ |
264 | NULL, /* Color_UL */ |
250 | NULL, /* Color_RV */ |
265 | NULL, /* Color_RV */ |
251 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
266 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
252 | #if ENABLE_FRILLS |
267 | #if ENABLE_FRILLS |
253 | NULL, // Color_underline |
268 | NULL, // Color_underline |
254 | #endif |
269 | #endif |
255 | #ifdef OPTION_HC |
270 | #ifdef OPTION_HC |
256 | NULL, |
271 | NULL, |
257 | #endif |
272 | #endif |
258 | #ifdef KEEP_SCROLLCOLOR |
273 | #ifdef KEEP_SCROLLCOLOR |
259 | COLOR_SCROLLBAR, |
274 | COLOR_SCROLLBAR, |
260 | COLOR_SCROLLTROUGH, |
275 | COLOR_SCROLLTROUGH, |
261 | #endif /* KEEP_SCROLLCOLOR */ |
276 | #endif /* KEEP_SCROLLCOLOR */ |
262 | #if ENABLE_TRANSPARENCY |
277 | #if ENABLE_TRANSPARENCY |
263 | NULL, |
278 | NULL, |
264 | #endif |
279 | #endif |
265 | #if OFF_FOCUS_FADING |
280 | #if OFF_FOCUS_FADING |
266 | "rgb:00/00/00", |
281 | "rgb:00/00/00", |
… | |
… | |
356 | break; |
371 | break; |
357 | |
372 | |
358 | if (r_argc == argc) |
373 | if (r_argc == argc) |
359 | cmd_argv = NULL; |
374 | cmd_argv = NULL; |
360 | else if (!argv[r_argc + 1]) |
375 | else if (!argv[r_argc + 1]) |
361 | rxvt_fatal ("-e requires an argument\n"); |
376 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
362 | else |
377 | else |
363 | { |
378 | { |
364 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
379 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
365 | |
380 | |
366 | for (i = 0; i < argc - r_argc - 1; i++) |
381 | for (i = 0; i < argc - r_argc - 1; i++) |
… | |
… | |
525 | color_aliases (Color_fg); |
540 | color_aliases (Color_fg); |
526 | color_aliases (Color_bg); |
541 | color_aliases (Color_bg); |
527 | #ifndef NO_CURSORCOLOR |
542 | #ifndef NO_CURSORCOLOR |
528 | color_aliases (Color_cursor); |
543 | color_aliases (Color_cursor); |
529 | color_aliases (Color_cursor2); |
544 | color_aliases (Color_cursor2); |
530 | #endif /* NO_CURSORCOLOR */ |
545 | #endif /* NO_CURSORCOLOR */ |
531 | color_aliases (Color_pointer_fg); |
546 | color_aliases (Color_pointer_fg); |
532 | color_aliases (Color_pointer_bg); |
547 | color_aliases (Color_pointer_bg); |
533 | color_aliases (Color_border); |
548 | color_aliases (Color_border); |
534 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
549 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
535 | color_aliases (Color_BD); |
550 | color_aliases (Color_BD); |
536 | color_aliases (Color_UL); |
551 | color_aliases (Color_UL); |
537 | color_aliases (Color_RV); |
552 | color_aliases (Color_RV); |
538 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
553 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
539 | |
554 | |
540 | if (!rs[Rs_color + Color_border]) |
555 | if (!rs[Rs_color + Color_border]) |
541 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
556 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
542 | |
557 | |
543 | return cmd_argv; |
558 | return cmd_argv; |
… | |
… | |
563 | */ |
578 | */ |
564 | val = rxvt_network_display (rs[Rs_display_name]); |
579 | val = rxvt_network_display (rs[Rs_display_name]); |
565 | rs[Rs_display_name] = (const char *)val; |
580 | rs[Rs_display_name] = (const char *)val; |
566 | |
581 | |
567 | if (val == NULL) |
582 | if (val == NULL) |
568 | #endif /* DISPLAY_IS_IP */ |
583 | #endif /* DISPLAY_IS_IP */ |
569 | val = XDisplayString (dpy); |
584 | val = XDisplayString (dpy); |
570 | |
585 | |
571 | if (rs[Rs_display_name] == NULL) |
586 | if (rs[Rs_display_name] == NULL) |
572 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
587 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
573 | |
588 | |
… | |
… | |
613 | #ifdef HAVE_UNSETENV |
628 | #ifdef HAVE_UNSETENV |
614 | /* avoid passing old settings and confusing term size */ |
629 | /* avoid passing old settings and confusing term size */ |
615 | unsetenv ("LINES"); |
630 | unsetenv ("LINES"); |
616 | unsetenv ("COLUMNS"); |
631 | unsetenv ("COLUMNS"); |
617 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
632 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
618 | #endif /* HAVE_UNSETENV */ |
633 | #endif /* HAVE_UNSETENV */ |
619 | } |
634 | } |
620 | |
635 | |
621 | /*----------------------------------------------------------------------*/ |
636 | /*----------------------------------------------------------------------*/ |
622 | /* |
637 | /* |
623 | * This is more or less stolen straight from XFree86 xterm. |
638 | * This is more or less stolen straight from XFree86 xterm. |
… | |
… | |
644 | |
659 | |
645 | this->locale = "C"; |
660 | this->locale = "C"; |
646 | } |
661 | } |
647 | |
662 | |
648 | |
663 | |
649 | this->locale = rxvt_strdup (this->locale); |
664 | this->locale = strdup (this->locale); |
650 | SET_LOCALE (this->locale); |
665 | SET_LOCALE (this->locale); |
651 | mbstate.reset (); |
666 | mbstate.reset (); |
652 | #endif |
667 | #endif |
653 | |
668 | |
654 | #if HAVE_NL_LANGINFO |
669 | #if HAVE_NL_LANGINFO |
… | |
… | |
734 | int i; |
749 | int i; |
735 | |
750 | |
736 | #ifdef OFF_FOCUS_FADING |
751 | #ifdef OFF_FOCUS_FADING |
737 | pix_colors = pix_colors_focused; |
752 | pix_colors = pix_colors_focused; |
738 | #endif |
753 | #endif |
739 | |
754 | |
740 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
755 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
741 | { |
756 | { |
742 | const char *name = rs[Rs_color + i]; |
757 | const char *name = rs[Rs_color + i]; |
743 | |
758 | |
744 | if (!name) |
759 | if (!name) |
… | |
… | |
822 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
837 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
823 | cscroll.a) |
838 | cscroll.a) |
824 | )) |
839 | )) |
825 | alias_color (Color_topShadow, Color_White); |
840 | alias_color (Color_topShadow, Color_White); |
826 | } |
841 | } |
827 | #endif /* KEEP_SCROLLCOLOR */ |
842 | #endif /* KEEP_SCROLLCOLOR */ |
828 | |
843 | |
829 | #ifdef OFF_FOCUS_FADING |
844 | #ifdef OFF_FOCUS_FADING |
830 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
845 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
831 | update_fade_color (i); |
846 | update_fade_color (i); |
832 | #endif |
847 | #endif |
… | |
… | |
840 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
855 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
841 | { |
856 | { |
842 | int i = atoi (rs[Rs_color + idx]); |
857 | int i = atoi (rs[Rs_color + idx]); |
843 | |
858 | |
844 | if (i >= 8 && i <= 15) |
859 | if (i >= 8 && i <= 15) |
845 | { /* bright colors */ |
860 | /* bright colors */ |
846 | i -= 8; |
|
|
847 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
861 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; |
848 | return; |
862 | else if (i >= 0 && i <= 7) |
849 | } |
863 | /* normal colors */ |
850 | |
|
|
851 | if (i >= 0 && i <= 7) /* normal colors */ |
|
|
852 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
864 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
853 | } |
865 | } |
854 | } |
866 | } |
855 | |
867 | |
856 | /*----------------------------------------------------------------------*/ |
868 | /*----------------------------------------------------------------------*/ |
… | |
… | |
1216 | |
1228 | |
1217 | /* |
1229 | /* |
1218 | * Debugging |
1230 | * Debugging |
1219 | */ |
1231 | */ |
1220 | #ifdef DEBUG_TTYMODE |
1232 | #ifdef DEBUG_TTYMODE |
1221 | #ifdef HAVE_TERMIOS_H |
|
|
1222 | /* c_iflag bits */ |
1233 | /* c_iflag bits */ |
1223 | fprintf (stderr, "Input flags\n"); |
1234 | fprintf (stderr, "Input flags\n"); |
1224 | |
1235 | |
1225 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1236 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1226 | # define FOO(flag,name) \ |
1237 | # define FOO(flag,name) \ |
… | |
… | |
1289 | FOO (VLNEXT, "VLNEXT"); |
1300 | FOO (VLNEXT, "VLNEXT"); |
1290 | # endif |
1301 | # endif |
1291 | |
1302 | |
1292 | fprintf (stderr, "\n"); |
1303 | fprintf (stderr, "\n"); |
1293 | # undef FOO |
1304 | # undef FOO |
1294 | # endif /* HAVE_TERMIOS_H */ |
1305 | #endif /* DEBUG_TTYMODE */ |
1295 | #endif /* DEBUG_TTYMODE */ |
|
|
1296 | } |
1306 | } |
1297 | |
1307 | |
1298 | /*----------------------------------------------------------------------*/ |
1308 | /*----------------------------------------------------------------------*/ |
1299 | /* |
1309 | /* |
1300 | * Run the command in a subprocess and return a file descriptor for the |
1310 | * Run the command in a subprocess and return a file descriptor for the |
… | |
… | |
1403 | rxvt_term::run_child (const char *const *argv) |
1413 | rxvt_term::run_child (const char *const *argv) |
1404 | { |
1414 | { |
1405 | char *login; |
1415 | char *login; |
1406 | |
1416 | |
1407 | if (option (Opt_console)) |
1417 | if (option (Opt_console)) |
|
|
1418 | { |
1408 | { /* be virtual console, fail silently */ |
1419 | /* be virtual console, fail silently */ |
1409 | #ifdef TIOCCONS |
1420 | #ifdef TIOCCONS |
1410 | unsigned int on = 1; |
1421 | unsigned int on = 1; |
1411 | |
1422 | |
1412 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1423 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1413 | #elif defined (SRIOCSREDIR) |
1424 | #elif defined (SRIOCSREDIR) |
… | |
… | |
1415 | |
1426 | |
1416 | fd = open (CONSOLE, O_WRONLY, 0); |
1427 | fd = open (CONSOLE, O_WRONLY, 0); |
1417 | if (fd >= 0) |
1428 | if (fd >= 0) |
1418 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1429 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1419 | close (fd); |
1430 | close (fd); |
1420 | #endif /* SRIOCSREDIR */ |
1431 | #endif /* SRIOCSREDIR */ |
1421 | } |
1432 | } |
1422 | |
1433 | |
1423 | /* reset signals and spin off the command interpreter */ |
1434 | /* reset signals and spin off the command interpreter */ |
1424 | signal (SIGINT, SIG_DFL); |
1435 | signal (SIGINT, SIG_DFL); |
1425 | signal (SIGQUIT, SIG_DFL); |
1436 | signal (SIGQUIT, SIG_DFL); |
… | |
… | |
1432 | */ |
1443 | */ |
1433 | #ifdef SIGTSTP |
1444 | #ifdef SIGTSTP |
1434 | signal (SIGTSTP, SIG_IGN); |
1445 | signal (SIGTSTP, SIG_IGN); |
1435 | signal (SIGTTIN, SIG_IGN); |
1446 | signal (SIGTTIN, SIG_IGN); |
1436 | signal (SIGTTOU, SIG_IGN); |
1447 | signal (SIGTTOU, SIG_IGN); |
1437 | #endif /* SIGTSTP */ |
1448 | #endif /* SIGTSTP */ |
1438 | |
1449 | |
1439 | // unblock signals (signals are blocked by iom.C |
1450 | // unblock signals (signals are blocked by iom.C |
1440 | sigset_t ss; |
1451 | sigset_t ss; |
1441 | sigemptyset (&ss); |
1452 | sigemptyset (&ss); |
1442 | sigprocmask (SIG_SETMASK, &ss, 0); |
1453 | sigprocmask (SIG_SETMASK, &ss, 0); |