… | |
… | |
41 | |
41 | |
42 | #include <limits> |
42 | #include <limits> |
43 | |
43 | |
44 | #include <csignal> |
44 | #include <csignal> |
45 | |
45 | |
|
|
46 | #ifdef HAVE_XSETLOCALE |
|
|
47 | # define X_LOCALE |
|
|
48 | # include <X11/Xlocale.h> |
|
|
49 | #else |
|
|
50 | # ifdef HAVE_SETLOCALE |
|
|
51 | # include <clocale> |
|
|
52 | # endif |
|
|
53 | #endif |
|
|
54 | |
|
|
55 | #ifdef HAVE_NL_LANGINFO |
|
|
56 | # include <langinfo.h> |
|
|
57 | #endif |
|
|
58 | |
46 | #ifdef DISPLAY_IS_IP |
59 | #ifdef DISPLAY_IS_IP |
47 | /* On Solaris link with -lsocket and -lnsl */ |
60 | /* On Solaris link with -lsocket and -lnsl */ |
48 | #include <sys/types.h> |
61 | #include <sys/types.h> |
49 | #include <sys/socket.h> |
62 | #include <sys/socket.h> |
50 | |
63 | |
… | |
… | |
141 | "rgb:00/cd/00", // 2: green (Green3) |
154 | "rgb:00/cd/00", // 2: green (Green3) |
142 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
155 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
143 | "rgb:00/00/cd", // 4: blue (Blue3) |
156 | "rgb:00/00/cd", // 4: blue (Blue3) |
144 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
157 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
145 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
158 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
146 | # ifdef XTERM_COLORS |
159 | # ifdef XTERM_COLORS |
147 | "rgb:e5/e5/e5", // 7: white (Grey90) |
160 | "rgb:e5/e5/e5", // 7: white (Grey90) |
148 | # else |
161 | # else |
149 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
162 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
150 | # endif |
163 | # endif |
151 | /* high-intensity colors */ |
164 | /* high-intensity colors */ |
152 | # ifdef XTERM_COLORS |
165 | # ifdef XTERM_COLORS |
153 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
166 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
… | |
… | |
237 | "rgb:e7/e7/e7", |
250 | "rgb:e7/e7/e7", |
238 | |
251 | |
239 | #ifndef NO_CURSORCOLOR |
252 | #ifndef NO_CURSORCOLOR |
240 | COLOR_CURSOR_BACKGROUND, |
253 | COLOR_CURSOR_BACKGROUND, |
241 | COLOR_CURSOR_FOREGROUND, |
254 | COLOR_CURSOR_FOREGROUND, |
242 | #endif /* ! NO_CURSORCOLOR */ |
255 | #endif /* ! NO_CURSORCOLOR */ |
243 | NULL, /* Color_pointer_fg */ |
256 | NULL, /* Color_pointer_fg */ |
244 | NULL, /* Color_pointer_bg */ |
257 | NULL, /* Color_pointer_bg */ |
245 | NULL, /* Color_border */ |
258 | NULL, /* Color_border */ |
246 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
259 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
247 | NULL, /* Color_BD */ |
260 | NULL, /* Color_BD */ |
248 | NULL, /* Color_IT */ |
261 | NULL, /* Color_IT */ |
249 | NULL, /* Color_UL */ |
262 | NULL, /* Color_UL */ |
250 | NULL, /* Color_RV */ |
263 | NULL, /* Color_RV */ |
251 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
264 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
252 | #if ENABLE_FRILLS |
265 | #if ENABLE_FRILLS |
253 | NULL, // Color_underline |
266 | NULL, // Color_underline |
254 | #endif |
267 | #endif |
255 | #ifdef OPTION_HC |
268 | #ifdef OPTION_HC |
256 | NULL, |
269 | NULL, |
257 | #endif |
270 | #endif |
258 | #ifdef KEEP_SCROLLCOLOR |
271 | #ifdef KEEP_SCROLLCOLOR |
259 | COLOR_SCROLLBAR, |
272 | COLOR_SCROLLBAR, |
260 | COLOR_SCROLLTROUGH, |
273 | COLOR_SCROLLTROUGH, |
261 | #endif /* KEEP_SCROLLCOLOR */ |
274 | #endif /* KEEP_SCROLLCOLOR */ |
262 | #if ENABLE_TRANSPARENCY |
275 | #if ENABLE_TRANSPARENCY |
263 | NULL, |
276 | NULL, |
264 | #endif |
277 | #endif |
265 | #if OFF_FOCUS_FADING |
278 | #if OFF_FOCUS_FADING |
266 | "rgb:00/00/00", |
279 | "rgb:00/00/00", |
… | |
… | |
356 | break; |
369 | break; |
357 | |
370 | |
358 | if (r_argc == argc) |
371 | if (r_argc == argc) |
359 | cmd_argv = NULL; |
372 | cmd_argv = NULL; |
360 | else if (!argv[r_argc + 1]) |
373 | else if (!argv[r_argc + 1]) |
361 | rxvt_fatal ("-e requires an argument\n"); |
374 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
362 | else |
375 | else |
363 | { |
376 | { |
364 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
377 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
365 | |
378 | |
366 | for (i = 0; i < argc - r_argc - 1; i++) |
379 | for (i = 0; i < argc - r_argc - 1; i++) |
… | |
… | |
386 | rs[Rs_display_name] = ":0"; |
399 | rs[Rs_display_name] = ":0"; |
387 | |
400 | |
388 | get_options (r_argc, r_argv); |
401 | get_options (r_argc, r_argv); |
389 | |
402 | |
390 | if (!(display = displays.get (rs[Rs_display_name]))) |
403 | if (!(display = displays.get (rs[Rs_display_name]))) |
|
|
404 | { |
|
|
405 | free (r_argv); |
391 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
406 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
|
|
407 | } |
392 | |
408 | |
393 | // using a local pointer decreases code size a lot |
409 | // using a local pointer decreases code size a lot |
394 | xa = display->xa; |
410 | xa = display->xa; |
395 | |
411 | |
396 | set (display); |
412 | set (display); |
… | |
… | |
522 | color_aliases (Color_fg); |
538 | color_aliases (Color_fg); |
523 | color_aliases (Color_bg); |
539 | color_aliases (Color_bg); |
524 | #ifndef NO_CURSORCOLOR |
540 | #ifndef NO_CURSORCOLOR |
525 | color_aliases (Color_cursor); |
541 | color_aliases (Color_cursor); |
526 | color_aliases (Color_cursor2); |
542 | color_aliases (Color_cursor2); |
527 | #endif /* NO_CURSORCOLOR */ |
543 | #endif /* NO_CURSORCOLOR */ |
528 | color_aliases (Color_pointer_fg); |
544 | color_aliases (Color_pointer_fg); |
529 | color_aliases (Color_pointer_bg); |
545 | color_aliases (Color_pointer_bg); |
530 | color_aliases (Color_border); |
546 | color_aliases (Color_border); |
531 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
547 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
532 | color_aliases (Color_BD); |
548 | color_aliases (Color_BD); |
533 | color_aliases (Color_UL); |
549 | color_aliases (Color_UL); |
534 | color_aliases (Color_RV); |
550 | color_aliases (Color_RV); |
535 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
551 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
536 | |
552 | |
537 | if (!rs[Rs_color + Color_border]) |
553 | if (!rs[Rs_color + Color_border]) |
538 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
554 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
539 | |
555 | |
540 | return cmd_argv; |
556 | return cmd_argv; |
… | |
… | |
560 | */ |
576 | */ |
561 | val = rxvt_network_display (rs[Rs_display_name]); |
577 | val = rxvt_network_display (rs[Rs_display_name]); |
562 | rs[Rs_display_name] = (const char *)val; |
578 | rs[Rs_display_name] = (const char *)val; |
563 | |
579 | |
564 | if (val == NULL) |
580 | if (val == NULL) |
565 | #endif /* DISPLAY_IS_IP */ |
581 | #endif /* DISPLAY_IS_IP */ |
566 | val = XDisplayString (dpy); |
582 | val = XDisplayString (dpy); |
567 | |
583 | |
568 | if (rs[Rs_display_name] == NULL) |
584 | if (rs[Rs_display_name] == NULL) |
569 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
585 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
570 | |
586 | |
… | |
… | |
610 | #ifdef HAVE_UNSETENV |
626 | #ifdef HAVE_UNSETENV |
611 | /* avoid passing old settings and confusing term size */ |
627 | /* avoid passing old settings and confusing term size */ |
612 | unsetenv ("LINES"); |
628 | unsetenv ("LINES"); |
613 | unsetenv ("COLUMNS"); |
629 | unsetenv ("COLUMNS"); |
614 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
630 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
615 | #endif /* HAVE_UNSETENV */ |
631 | #endif /* HAVE_UNSETENV */ |
616 | } |
632 | } |
617 | |
633 | |
618 | /*----------------------------------------------------------------------*/ |
634 | /*----------------------------------------------------------------------*/ |
619 | /* |
635 | /* |
620 | * This is more or less stolen straight from XFree86 xterm. |
636 | * This is more or less stolen straight from XFree86 xterm. |
… | |
… | |
641 | |
657 | |
642 | this->locale = "C"; |
658 | this->locale = "C"; |
643 | } |
659 | } |
644 | |
660 | |
645 | |
661 | |
646 | this->locale = rxvt_strdup (this->locale); |
662 | this->locale = strdup (this->locale); |
647 | SET_LOCALE (this->locale); |
663 | SET_LOCALE (this->locale); |
648 | mbstate.reset (); |
664 | mbstate.reset (); |
649 | #endif |
665 | #endif |
650 | |
666 | |
651 | #if HAVE_NL_LANGINFO |
667 | #if HAVE_NL_LANGINFO |
… | |
… | |
731 | int i; |
747 | int i; |
732 | |
748 | |
733 | #ifdef OFF_FOCUS_FADING |
749 | #ifdef OFF_FOCUS_FADING |
734 | pix_colors = pix_colors_focused; |
750 | pix_colors = pix_colors_focused; |
735 | #endif |
751 | #endif |
736 | |
752 | |
737 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
753 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
738 | { |
754 | { |
739 | const char *name = rs[Rs_color + i]; |
755 | const char *name = rs[Rs_color + i]; |
740 | |
756 | |
741 | if (!name) |
757 | if (!name) |
… | |
… | |
819 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
835 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
820 | cscroll.a) |
836 | cscroll.a) |
821 | )) |
837 | )) |
822 | alias_color (Color_topShadow, Color_White); |
838 | alias_color (Color_topShadow, Color_White); |
823 | } |
839 | } |
824 | #endif /* KEEP_SCROLLCOLOR */ |
840 | #endif /* KEEP_SCROLLCOLOR */ |
825 | |
841 | |
826 | #ifdef OFF_FOCUS_FADING |
842 | #ifdef OFF_FOCUS_FADING |
827 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
843 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
828 | update_fade_color (i); |
844 | update_fade_color (i); |
829 | #endif |
845 | #endif |
… | |
… | |
837 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
853 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
838 | { |
854 | { |
839 | int i = atoi (rs[Rs_color + idx]); |
855 | int i = atoi (rs[Rs_color + idx]); |
840 | |
856 | |
841 | if (i >= 8 && i <= 15) |
857 | if (i >= 8 && i <= 15) |
842 | { /* bright colors */ |
858 | /* bright colors */ |
843 | i -= 8; |
|
|
844 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
859 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; |
845 | return; |
860 | else if (i >= 0 && i <= 7) |
846 | } |
861 | /* normal colors */ |
847 | |
|
|
848 | if (i >= 0 && i <= 7) /* normal colors */ |
|
|
849 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
862 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
850 | } |
863 | } |
851 | } |
864 | } |
852 | |
865 | |
853 | /*----------------------------------------------------------------------*/ |
866 | /*----------------------------------------------------------------------*/ |
… | |
… | |
1286 | FOO (VLNEXT, "VLNEXT"); |
1299 | FOO (VLNEXT, "VLNEXT"); |
1287 | # endif |
1300 | # endif |
1288 | |
1301 | |
1289 | fprintf (stderr, "\n"); |
1302 | fprintf (stderr, "\n"); |
1290 | # undef FOO |
1303 | # undef FOO |
1291 | # endif /* HAVE_TERMIOS_H */ |
1304 | # endif /* HAVE_TERMIOS_H */ |
1292 | #endif /* DEBUG_TTYMODE */ |
1305 | #endif /* DEBUG_TTYMODE */ |
1293 | } |
1306 | } |
1294 | |
1307 | |
1295 | /*----------------------------------------------------------------------*/ |
1308 | /*----------------------------------------------------------------------*/ |
1296 | /* |
1309 | /* |
1297 | * 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 |
… | |
… | |
1412 | |
1425 | |
1413 | fd = open (CONSOLE, O_WRONLY, 0); |
1426 | fd = open (CONSOLE, O_WRONLY, 0); |
1414 | if (fd >= 0) |
1427 | if (fd >= 0) |
1415 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1428 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1416 | close (fd); |
1429 | close (fd); |
1417 | #endif /* SRIOCSREDIR */ |
1430 | #endif /* SRIOCSREDIR */ |
1418 | } |
1431 | } |
1419 | |
1432 | |
1420 | /* reset signals and spin off the command interpreter */ |
1433 | /* reset signals and spin off the command interpreter */ |
1421 | signal (SIGINT, SIG_DFL); |
1434 | signal (SIGINT, SIG_DFL); |
1422 | signal (SIGQUIT, SIG_DFL); |
1435 | signal (SIGQUIT, SIG_DFL); |
… | |
… | |
1429 | */ |
1442 | */ |
1430 | #ifdef SIGTSTP |
1443 | #ifdef SIGTSTP |
1431 | signal (SIGTSTP, SIG_IGN); |
1444 | signal (SIGTSTP, SIG_IGN); |
1432 | signal (SIGTTIN, SIG_IGN); |
1445 | signal (SIGTTIN, SIG_IGN); |
1433 | signal (SIGTTOU, SIG_IGN); |
1446 | signal (SIGTTOU, SIG_IGN); |
1434 | #endif /* SIGTSTP */ |
1447 | #endif /* SIGTSTP */ |
1435 | |
1448 | |
1436 | // unblock signals (signals are blocked by iom.C |
1449 | // unblock signals (signals are blocked by iom.C |
1437 | sigset_t ss; |
1450 | sigset_t ss; |
1438 | sigemptyset (&ss); |
1451 | sigemptyset (&ss); |
1439 | sigprocmask (SIG_SETMASK, &ss, 0); |
1452 | sigprocmask (SIG_SETMASK, &ss, 0); |