| … | |
… | |
| 40 | #include "init.h" |
40 | #include "init.h" |
| 41 | |
41 | |
| 42 | #include <limits> |
42 | #include <limits> |
| 43 | |
43 | |
| 44 | #include <csignal> |
44 | #include <csignal> |
|
|
45 | |
|
|
46 | #include <fcntl.h> |
| 45 | |
47 | |
| 46 | #ifdef HAVE_XSETLOCALE |
48 | #ifdef HAVE_XSETLOCALE |
| 47 | # define X_LOCALE |
49 | # define X_LOCALE |
| 48 | # include <X11/Xlocale.h> |
50 | # include <X11/Xlocale.h> |
| 49 | #else |
51 | #else |
| … | |
… | |
| 853 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
855 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
| 854 | { |
856 | { |
| 855 | int i = atoi (rs[Rs_color + idx]); |
857 | int i = atoi (rs[Rs_color + idx]); |
| 856 | |
858 | |
| 857 | if (i >= 8 && i <= 15) |
859 | if (i >= 8 && i <= 15) |
| 858 | { /* bright colors */ |
860 | /* bright colors */ |
| 859 | i -= 8; |
|
|
| 860 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
861 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; |
| 861 | return; |
862 | else if (i >= 0 && i <= 7) |
| 862 | } |
863 | /* normal colors */ |
| 863 | |
|
|
| 864 | if (i >= 0 && i <= 7) /* normal colors */ |
|
|
| 865 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
864 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
| 866 | } |
865 | } |
| 867 | } |
866 | } |
| 868 | |
867 | |
| 869 | /*----------------------------------------------------------------------*/ |
868 | /*----------------------------------------------------------------------*/ |
| … | |
… | |
| 1229 | |
1228 | |
| 1230 | /* |
1229 | /* |
| 1231 | * Debugging |
1230 | * Debugging |
| 1232 | */ |
1231 | */ |
| 1233 | #ifdef DEBUG_TTYMODE |
1232 | #ifdef DEBUG_TTYMODE |
| 1234 | #ifdef HAVE_TERMIOS_H |
|
|
| 1235 | /* c_iflag bits */ |
1233 | /* c_iflag bits */ |
| 1236 | fprintf (stderr, "Input flags\n"); |
1234 | fprintf (stderr, "Input flags\n"); |
| 1237 | |
1235 | |
| 1238 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1236 | /* cpp token stringize doesn't work on all machines <sigh> */ |
| 1239 | # define FOO(flag,name) \ |
1237 | # define FOO(flag,name) \ |
| … | |
… | |
| 1302 | FOO (VLNEXT, "VLNEXT"); |
1300 | FOO (VLNEXT, "VLNEXT"); |
| 1303 | # endif |
1301 | # endif |
| 1304 | |
1302 | |
| 1305 | fprintf (stderr, "\n"); |
1303 | fprintf (stderr, "\n"); |
| 1306 | # undef FOO |
1304 | # undef FOO |
| 1307 | # endif /* HAVE_TERMIOS_H */ |
|
|
| 1308 | #endif /* DEBUG_TTYMODE */ |
1305 | #endif /* DEBUG_TTYMODE */ |
| 1309 | } |
1306 | } |
| 1310 | |
1307 | |
| 1311 | /*----------------------------------------------------------------------*/ |
1308 | /*----------------------------------------------------------------------*/ |
| 1312 | /* |
1309 | /* |
| … | |
… | |
| 1416 | rxvt_term::run_child (const char *const *argv) |
1413 | rxvt_term::run_child (const char *const *argv) |
| 1417 | { |
1414 | { |
| 1418 | char *login; |
1415 | char *login; |
| 1419 | |
1416 | |
| 1420 | if (option (Opt_console)) |
1417 | if (option (Opt_console)) |
|
|
1418 | { |
| 1421 | { /* be virtual console, fail silently */ |
1419 | /* be virtual console, fail silently */ |
| 1422 | #ifdef TIOCCONS |
1420 | #ifdef TIOCCONS |
| 1423 | unsigned int on = 1; |
1421 | unsigned int on = 1; |
| 1424 | |
1422 | |
| 1425 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1423 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
| 1426 | #elif defined (SRIOCSREDIR) |
1424 | #elif defined (SRIOCSREDIR) |
