… | |
… | |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
7 | * - original version |
7 | * - original version |
8 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
8 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
9 | * - extensive modifications |
9 | * - extensive modifications |
|
|
10 | * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> |
|
|
11 | * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> |
|
|
12 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
10 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
11 | * - extensive modifications |
14 | * - extensive modifications |
12 | * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> |
|
|
13 | * - QNX support |
|
|
14 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
15 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
15 | * |
16 | * |
16 | * 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 |
17 | * 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 |
18 | * the Free Software Foundation; either version 2 of the License, or |
19 | * the Free Software Foundation; either version 2 of the License, or |
19 | * (at your option) any later version. |
20 | * (at your option) any later version. |
… | |
… | |
38 | |
39 | |
39 | #include <limits> |
40 | #include <limits> |
40 | |
41 | |
41 | #include <csignal> |
42 | #include <csignal> |
42 | |
43 | |
|
|
44 | #include <fcntl.h> |
|
|
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 | |
|
|
59 | #ifdef DISPLAY_IS_IP |
|
|
60 | /* On Solaris link with -lsocket and -lnsl */ |
|
|
61 | #include <sys/types.h> |
|
|
62 | #include <sys/socket.h> |
|
|
63 | |
|
|
64 | /* these next two are probably only on Sun (not Solaris) */ |
|
|
65 | #ifdef HAVE_SYS_SOCKIO_H |
|
|
66 | #include <sys/sockio.h> |
|
|
67 | #endif |
|
|
68 | #ifdef HAVE_SYS_BYTEORDER_H |
|
|
69 | #include <sys/byteorder.h> |
|
|
70 | #endif |
|
|
71 | |
|
|
72 | #include <netinet/in.h> |
|
|
73 | #include <arpa/inet.h> |
|
|
74 | #include <net/if.h> |
|
|
75 | #include <net/if_arp.h> |
|
|
76 | |
|
|
77 | static char * |
|
|
78 | rxvt_network_display (const char *display) |
|
|
79 | { |
|
|
80 | char buffer[1024], *rval = NULL; |
|
|
81 | struct ifconf ifc; |
|
|
82 | struct ifreq *ifr; |
|
|
83 | int i, skfd; |
|
|
84 | |
|
|
85 | if (display[0] != ':' && strncmp (display, "unix:", 5)) |
|
|
86 | return (char *) display; /* nothing to do */ |
|
|
87 | |
|
|
88 | ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */ |
|
|
89 | ifc.ifc_buf = buffer; |
|
|
90 | |
|
|
91 | if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) |
|
|
92 | { |
|
|
93 | perror ("socket"); |
|
|
94 | return NULL; |
|
|
95 | } |
|
|
96 | |
|
|
97 | if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0) |
|
|
98 | { |
|
|
99 | perror ("SIOCGIFCONF"); |
|
|
100 | close (skfd); |
|
|
101 | return NULL; |
|
|
102 | } |
|
|
103 | |
|
|
104 | for (i = 0, ifr = ifc.ifc_req; |
|
|
105 | i < (ifc.ifc_len / sizeof (struct ifreq)); |
|
|
106 | i++, ifr++) |
|
|
107 | { |
|
|
108 | struct ifreq ifr2; |
|
|
109 | |
|
|
110 | strcpy (ifr2.ifr_name, ifr->ifr_name); |
|
|
111 | |
|
|
112 | if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0) |
|
|
113 | { |
|
|
114 | unsigned long addr; |
|
|
115 | struct sockaddr_in *p_addr; |
|
|
116 | |
|
|
117 | p_addr = (struct sockaddr_in *) &ifr2.ifr_addr; |
|
|
118 | addr = htonl ((unsigned long)p_addr->sin_addr.s_addr); |
|
|
119 | |
|
|
120 | /* |
|
|
121 | * not "0.0.0.0" or "127.0.0.1" - so format the address |
|
|
122 | */ |
|
|
123 | if (addr && addr != 0x7F000001) |
|
|
124 | { |
|
|
125 | char *colon = strchr (display, ':'); |
|
|
126 | |
|
|
127 | if (colon == NULL) |
|
|
128 | colon = ":0.0"; |
|
|
129 | |
|
|
130 | rval = rxvt_malloc (strlen (colon) + 16); |
|
|
131 | sprintf (rval, "%d.%d.%d.%d%s", |
|
|
132 | (int) ((addr >> 030) & 0xFF), |
|
|
133 | (int) ((addr >> 020) & 0xFF), |
|
|
134 | (int) ((addr >> 010) & 0xFF), |
|
|
135 | (int) (addr & 0xFF), colon); |
|
|
136 | break; |
|
|
137 | } |
|
|
138 | } |
|
|
139 | } |
|
|
140 | |
|
|
141 | close (skfd); |
|
|
142 | |
|
|
143 | return rval; |
|
|
144 | } |
|
|
145 | #endif |
|
|
146 | |
43 | const char *const def_colorName[] = |
147 | const char *const def_colorName[] = |
44 | { |
148 | { |
45 | COLOR_FOREGROUND, |
149 | COLOR_FOREGROUND, |
46 | COLOR_BACKGROUND, |
150 | COLOR_BACKGROUND, |
47 | /* low-intensity colors */ |
151 | /* low-intensity colors */ |
… | |
… | |
50 | "rgb:00/cd/00", // 2: green (Green3) |
154 | "rgb:00/cd/00", // 2: green (Green3) |
51 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
155 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
52 | "rgb:00/00/cd", // 4: blue (Blue3) |
156 | "rgb:00/00/cd", // 4: blue (Blue3) |
53 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
157 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
54 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
158 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
55 | # ifdef XTERM_COLORS |
159 | # ifdef XTERM_COLORS |
56 | "rgb:e5/e5/e5", // 7: white (Grey90) |
160 | "rgb:e5/e5/e5", // 7: white (Grey90) |
57 | # else |
161 | # else |
58 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
162 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
59 | # endif |
163 | # endif |
60 | /* high-intensity colors */ |
164 | /* high-intensity colors */ |
61 | # ifdef XTERM_COLORS |
165 | # ifdef XTERM_COLORS |
62 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
166 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
… | |
… | |
146 | "rgb:e7/e7/e7", |
250 | "rgb:e7/e7/e7", |
147 | |
251 | |
148 | #ifndef NO_CURSORCOLOR |
252 | #ifndef NO_CURSORCOLOR |
149 | COLOR_CURSOR_BACKGROUND, |
253 | COLOR_CURSOR_BACKGROUND, |
150 | COLOR_CURSOR_FOREGROUND, |
254 | COLOR_CURSOR_FOREGROUND, |
151 | #endif /* ! NO_CURSORCOLOR */ |
255 | #endif /* ! NO_CURSORCOLOR */ |
152 | NULL, /* Color_pointer_fg */ |
256 | NULL, /* Color_pointer_fg */ |
153 | NULL, /* Color_pointer_bg */ |
257 | NULL, /* Color_pointer_bg */ |
154 | NULL, /* Color_border */ |
258 | NULL, /* Color_border */ |
155 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
259 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
156 | NULL, /* Color_BD */ |
260 | NULL, /* Color_BD */ |
157 | NULL, /* Color_IT */ |
261 | NULL, /* Color_IT */ |
158 | NULL, /* Color_UL */ |
262 | NULL, /* Color_UL */ |
159 | NULL, /* Color_RV */ |
263 | NULL, /* Color_RV */ |
160 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
264 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
161 | #if ENABLE_FRILLS |
265 | #if ENABLE_FRILLS |
162 | NULL, // Color_underline |
266 | NULL, // Color_underline |
163 | #endif |
267 | #endif |
164 | #ifdef OPTION_HC |
268 | #ifdef OPTION_HC |
165 | NULL, |
269 | NULL, |
166 | #endif |
270 | #endif |
167 | #ifdef KEEP_SCROLLCOLOR |
271 | #ifdef KEEP_SCROLLCOLOR |
168 | COLOR_SCROLLBAR, |
272 | COLOR_SCROLLBAR, |
169 | COLOR_SCROLLTROUGH, |
273 | COLOR_SCROLLTROUGH, |
170 | #endif /* KEEP_SCROLLCOLOR */ |
274 | #endif /* KEEP_SCROLLCOLOR */ |
171 | #if ENABLE_TRANSPARENCY |
275 | #if ENABLE_TRANSPARENCY |
172 | NULL, |
276 | NULL, |
173 | #endif |
277 | #endif |
174 | #if OFF_FOCUS_FADING |
278 | #if OFF_FOCUS_FADING |
175 | "rgb:00/00/00", |
279 | "rgb:00/00/00", |
176 | #endif |
280 | #endif |
177 | }; |
281 | }; |
178 | |
282 | |
179 | bool |
283 | void |
180 | rxvt_term::init_vars () |
284 | rxvt_term::init_vars () |
181 | { |
285 | { |
182 | pix_colors = // |
286 | pix_colors = // |
183 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
287 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
184 | #ifdef OFF_FOCUS_FADING |
288 | #ifdef OFF_FOCUS_FADING |
185 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
289 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
186 | #endif |
290 | #endif |
187 | |
|
|
188 | |
291 | |
189 | MEvent.time = CurrentTime; |
292 | MEvent.time = CurrentTime; |
190 | MEvent.button = AnyButton; |
293 | MEvent.button = AnyButton; |
191 | want_refresh = 1; |
294 | want_refresh = 1; |
192 | priv_modes = SavedModes = PrivMode_Default; |
295 | priv_modes = SavedModes = PrivMode_Default; |
… | |
… | |
194 | nrow = 24; |
297 | nrow = 24; |
195 | int_bwidth = INTERNALBORDERWIDTH; |
298 | int_bwidth = INTERNALBORDERWIDTH; |
196 | ext_bwidth = EXTERNALBORDERWIDTH; |
299 | ext_bwidth = EXTERNALBORDERWIDTH; |
197 | lineSpace = LINESPACE; |
300 | lineSpace = LINESPACE; |
198 | saveLines = SAVELINES; |
301 | saveLines = SAVELINES; |
199 | numpix_colors = TOTAL_COLORS; |
|
|
200 | |
302 | |
201 | refresh_type = SLOW_REFRESH; |
303 | refresh_type = SLOW_REFRESH; |
202 | |
304 | |
203 | oldcursor.row = oldcursor.col = -1; |
305 | oldcursor.row = oldcursor.col = -1; |
204 | last_bot = last_state = -1; |
306 | last_bot = last_state = -1; |
… | |
… | |
210 | set_option (Opt_secondaryScreen); |
312 | set_option (Opt_secondaryScreen); |
211 | set_option (Opt_secondaryScroll); |
313 | set_option (Opt_secondaryScroll); |
212 | set_option (Opt_pastableTabs); |
314 | set_option (Opt_pastableTabs); |
213 | set_option (Opt_intensityStyles); |
315 | set_option (Opt_intensityStyles); |
214 | set_option (Opt_iso14755_52); |
316 | set_option (Opt_iso14755_52); |
215 | |
|
|
216 | return true; |
|
|
217 | } |
317 | } |
218 | |
318 | |
219 | void |
319 | void |
220 | rxvt_term::init_secondary () |
320 | rxvt_term::init_secondary () |
221 | { |
321 | { |
… | |
… | |
228 | if ((i = open ("/dev/null", O_RDONLY)) < 0) |
328 | if ((i = open ("/dev/null", O_RDONLY)) < 0) |
229 | { |
329 | { |
230 | /* TODO: BOO HISS */ |
330 | /* TODO: BOO HISS */ |
231 | dup2 (STDERR_FILENO, STDIN_FILENO); |
331 | dup2 (STDERR_FILENO, STDIN_FILENO); |
232 | } |
332 | } |
233 | else if (i > STDIN_FILENO) |
333 | else if (i != STDIN_FILENO) |
234 | { |
334 | { |
235 | dup2 (i, STDIN_FILENO); |
335 | dup2 (i, STDIN_FILENO); |
236 | close (i); |
336 | close (i); |
237 | } |
337 | } |
238 | |
338 | |
… | |
… | |
262 | */ |
362 | */ |
263 | for (r_argc = 0; r_argc < argc; r_argc++) |
363 | for (r_argc = 0; r_argc < argc; r_argc++) |
264 | if (!strcmp (argv[r_argc], "-e")) |
364 | if (!strcmp (argv[r_argc], "-e")) |
265 | break; |
365 | break; |
266 | |
366 | |
|
|
367 | if (r_argc == argc) |
|
|
368 | cmd_argv = NULL; |
|
|
369 | else if (!argv[r_argc + 1]) |
|
|
370 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
371 | else |
|
|
372 | { |
|
|
373 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
|
|
374 | |
|
|
375 | for (i = 0; i < argc - r_argc - 1; i++) |
|
|
376 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
|
|
377 | |
|
|
378 | cmd_argv[i] = NULL; |
|
|
379 | } |
|
|
380 | |
267 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
381 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
268 | |
382 | |
269 | for (i = 0; i < r_argc; i++) |
383 | for (i = 0; i < r_argc; i++) |
270 | r_argv[i] = (const char *)argv[i]; |
384 | r_argv[i] = (const char *)argv[i]; |
271 | |
385 | |
272 | r_argv[i] = NULL; |
386 | r_argv[i] = NULL; |
273 | |
|
|
274 | if (r_argc == argc) |
|
|
275 | cmd_argv = NULL; |
|
|
276 | else |
|
|
277 | { |
|
|
278 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
|
|
279 | |
|
|
280 | for (i = 0; i < argc - r_argc - 1; i++) |
|
|
281 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
|
|
282 | |
|
|
283 | cmd_argv[i] = NULL; |
|
|
284 | } |
|
|
285 | |
387 | |
286 | rs[Rs_name] = rxvt_basename (argv[0]); |
388 | rs[Rs_name] = rxvt_basename (argv[0]); |
287 | |
389 | |
288 | /* |
390 | /* |
289 | * Open display, get options/resources and create the window |
391 | * Open display, get options/resources and create the window |
… | |
… | |
293 | rs[Rs_display_name] = ":0"; |
395 | rs[Rs_display_name] = ":0"; |
294 | |
396 | |
295 | get_options (r_argc, r_argv); |
397 | get_options (r_argc, r_argv); |
296 | |
398 | |
297 | if (!(display = displays.get (rs[Rs_display_name]))) |
399 | if (!(display = displays.get (rs[Rs_display_name]))) |
|
|
400 | { |
|
|
401 | free (r_argv); |
298 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
402 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
|
|
403 | } |
299 | |
404 | |
300 | // using a local pointer decreases code size a lot |
405 | // using a local pointer decreases code size a lot |
301 | xa = display->xa; |
406 | xa = display->xa; |
302 | |
407 | |
303 | set (display); |
408 | set (display); |
… | |
… | |
429 | color_aliases (Color_fg); |
534 | color_aliases (Color_fg); |
430 | color_aliases (Color_bg); |
535 | color_aliases (Color_bg); |
431 | #ifndef NO_CURSORCOLOR |
536 | #ifndef NO_CURSORCOLOR |
432 | color_aliases (Color_cursor); |
537 | color_aliases (Color_cursor); |
433 | color_aliases (Color_cursor2); |
538 | color_aliases (Color_cursor2); |
434 | #endif /* NO_CURSORCOLOR */ |
539 | #endif /* NO_CURSORCOLOR */ |
435 | color_aliases (Color_pointer_fg); |
540 | color_aliases (Color_pointer_fg); |
436 | color_aliases (Color_pointer_bg); |
541 | color_aliases (Color_pointer_bg); |
437 | color_aliases (Color_border); |
542 | color_aliases (Color_border); |
438 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
543 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
439 | color_aliases (Color_BD); |
544 | color_aliases (Color_BD); |
440 | color_aliases (Color_UL); |
545 | color_aliases (Color_UL); |
441 | color_aliases (Color_RV); |
546 | color_aliases (Color_RV); |
442 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
547 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
443 | |
548 | |
444 | if (!rs[Rs_color + Color_border]) |
549 | if (!rs[Rs_color + Color_border]) |
445 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
550 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
446 | |
551 | |
447 | return cmd_argv; |
552 | return cmd_argv; |
… | |
… | |
467 | */ |
572 | */ |
468 | val = rxvt_network_display (rs[Rs_display_name]); |
573 | val = rxvt_network_display (rs[Rs_display_name]); |
469 | rs[Rs_display_name] = (const char *)val; |
574 | rs[Rs_display_name] = (const char *)val; |
470 | |
575 | |
471 | if (val == NULL) |
576 | if (val == NULL) |
472 | #endif /* DISPLAY_IS_IP */ |
577 | #endif /* DISPLAY_IS_IP */ |
473 | val = XDisplayString (dpy); |
578 | val = XDisplayString (dpy); |
474 | |
579 | |
475 | if (rs[Rs_display_name] == NULL) |
580 | if (rs[Rs_display_name] == NULL) |
476 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
581 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
477 | |
582 | |
… | |
… | |
517 | #ifdef HAVE_UNSETENV |
622 | #ifdef HAVE_UNSETENV |
518 | /* avoid passing old settings and confusing term size */ |
623 | /* avoid passing old settings and confusing term size */ |
519 | unsetenv ("LINES"); |
624 | unsetenv ("LINES"); |
520 | unsetenv ("COLUMNS"); |
625 | unsetenv ("COLUMNS"); |
521 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
626 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
522 | #endif /* HAVE_UNSETENV */ |
627 | #endif /* HAVE_UNSETENV */ |
523 | } |
628 | } |
524 | |
629 | |
525 | /*----------------------------------------------------------------------*/ |
630 | /*----------------------------------------------------------------------*/ |
526 | /* |
631 | /* |
527 | * This is more or less stolen straight from XFree86 xterm. |
632 | * This is more or less stolen straight from XFree86 xterm. |
… | |
… | |
548 | |
653 | |
549 | this->locale = "C"; |
654 | this->locale = "C"; |
550 | } |
655 | } |
551 | |
656 | |
552 | |
657 | |
553 | this->locale = rxvt_strdup (this->locale); |
658 | this->locale = strdup (this->locale); |
554 | SET_LOCALE (this->locale); |
659 | SET_LOCALE (this->locale); |
555 | mbstate.reset (); |
660 | mbstate.reset (); |
556 | #endif |
661 | #endif |
557 | |
662 | |
558 | #if HAVE_NL_LANGINFO |
663 | #if HAVE_NL_LANGINFO |
… | |
… | |
638 | int i; |
743 | int i; |
639 | |
744 | |
640 | #ifdef OFF_FOCUS_FADING |
745 | #ifdef OFF_FOCUS_FADING |
641 | pix_colors = pix_colors_focused; |
746 | pix_colors = pix_colors_focused; |
642 | #endif |
747 | #endif |
643 | |
748 | |
644 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
749 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
645 | { |
750 | { |
646 | const char *name = rs[Rs_color + i]; |
751 | const char *name = rs[Rs_color + i]; |
647 | |
752 | |
648 | if (!name) |
753 | if (!name) |
… | |
… | |
726 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
831 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
727 | cscroll.a) |
832 | cscroll.a) |
728 | )) |
833 | )) |
729 | alias_color (Color_topShadow, Color_White); |
834 | alias_color (Color_topShadow, Color_White); |
730 | } |
835 | } |
731 | #endif /* KEEP_SCROLLCOLOR */ |
836 | #endif /* KEEP_SCROLLCOLOR */ |
732 | |
837 | |
733 | #ifdef OFF_FOCUS_FADING |
838 | #ifdef OFF_FOCUS_FADING |
734 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
839 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
735 | update_fade_color (i); |
840 | update_fade_color (i); |
736 | #endif |
841 | #endif |
… | |
… | |
744 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
849 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
745 | { |
850 | { |
746 | int i = atoi (rs[Rs_color + idx]); |
851 | int i = atoi (rs[Rs_color + idx]); |
747 | |
852 | |
748 | if (i >= 8 && i <= 15) |
853 | if (i >= 8 && i <= 15) |
749 | { /* bright colors */ |
854 | /* bright colors */ |
750 | i -= 8; |
|
|
751 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
855 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; |
752 | return; |
856 | else if (i >= 0 && i <= 7) |
753 | } |
857 | /* normal colors */ |
754 | |
|
|
755 | if (i >= 0 && i <= 7) /* normal colors */ |
|
|
756 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
858 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
757 | } |
859 | } |
758 | } |
860 | } |
759 | |
861 | |
760 | /*----------------------------------------------------------------------*/ |
862 | /*----------------------------------------------------------------------*/ |
… | |
… | |
1120 | |
1222 | |
1121 | /* |
1223 | /* |
1122 | * Debugging |
1224 | * Debugging |
1123 | */ |
1225 | */ |
1124 | #ifdef DEBUG_TTYMODE |
1226 | #ifdef DEBUG_TTYMODE |
1125 | #ifdef HAVE_TERMIOS_H |
|
|
1126 | /* c_iflag bits */ |
1227 | /* c_iflag bits */ |
1127 | fprintf (stderr, "Input flags\n"); |
1228 | fprintf (stderr, "Input flags\n"); |
1128 | |
1229 | |
1129 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1230 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1130 | # define FOO(flag,name) \ |
1231 | # define FOO(flag,name) \ |
… | |
… | |
1193 | FOO (VLNEXT, "VLNEXT"); |
1294 | FOO (VLNEXT, "VLNEXT"); |
1194 | # endif |
1295 | # endif |
1195 | |
1296 | |
1196 | fprintf (stderr, "\n"); |
1297 | fprintf (stderr, "\n"); |
1197 | # undef FOO |
1298 | # undef FOO |
1198 | # endif /* HAVE_TERMIOS_H */ |
1299 | #endif /* DEBUG_TTYMODE */ |
1199 | #endif /* DEBUG_TTYMODE */ |
|
|
1200 | } |
1300 | } |
1201 | |
1301 | |
1202 | /*----------------------------------------------------------------------*/ |
1302 | /*----------------------------------------------------------------------*/ |
1203 | /* |
1303 | /* |
1204 | * Run the command in a subprocess and return a file descriptor for the |
1304 | * Run the command in a subprocess and return a file descriptor for the |
… | |
… | |
1307 | rxvt_term::run_child (const char *const *argv) |
1407 | rxvt_term::run_child (const char *const *argv) |
1308 | { |
1408 | { |
1309 | char *login; |
1409 | char *login; |
1310 | |
1410 | |
1311 | if (option (Opt_console)) |
1411 | if (option (Opt_console)) |
|
|
1412 | { |
1312 | { /* be virtual console, fail silently */ |
1413 | /* be virtual console, fail silently */ |
1313 | #ifdef TIOCCONS |
1414 | #ifdef TIOCCONS |
1314 | unsigned int on = 1; |
1415 | unsigned int on = 1; |
1315 | |
1416 | |
1316 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1417 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1317 | #elif defined (SRIOCSREDIR) |
1418 | #elif defined (SRIOCSREDIR) |
… | |
… | |
1319 | |
1420 | |
1320 | fd = open (CONSOLE, O_WRONLY, 0); |
1421 | fd = open (CONSOLE, O_WRONLY, 0); |
1321 | if (fd >= 0) |
1422 | if (fd >= 0) |
1322 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1423 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1323 | close (fd); |
1424 | close (fd); |
1324 | #endif /* SRIOCSREDIR */ |
1425 | #endif /* SRIOCSREDIR */ |
1325 | } |
1426 | } |
1326 | |
1427 | |
1327 | /* reset signals and spin off the command interpreter */ |
1428 | /* reset signals and spin off the command interpreter */ |
1328 | signal (SIGINT, SIG_DFL); |
1429 | signal (SIGINT, SIG_DFL); |
1329 | signal (SIGQUIT, SIG_DFL); |
1430 | signal (SIGQUIT, SIG_DFL); |
… | |
… | |
1336 | */ |
1437 | */ |
1337 | #ifdef SIGTSTP |
1438 | #ifdef SIGTSTP |
1338 | signal (SIGTSTP, SIG_IGN); |
1439 | signal (SIGTSTP, SIG_IGN); |
1339 | signal (SIGTTIN, SIG_IGN); |
1440 | signal (SIGTTIN, SIG_IGN); |
1340 | signal (SIGTTOU, SIG_IGN); |
1441 | signal (SIGTTOU, SIG_IGN); |
1341 | #endif /* SIGTSTP */ |
1442 | #endif /* SIGTSTP */ |
1342 | |
1443 | |
1343 | // unblock signals (signals are blocked by iom.C |
1444 | // unblock signals (signals are blocked by iom.C |
1344 | sigset_t ss; |
1445 | sigset_t ss; |
1345 | sigemptyset (&ss); |
1446 | sigemptyset (&ss); |
1346 | sigprocmask (SIG_SETMASK, &ss, 0); |
1447 | sigprocmask (SIG_SETMASK, &ss, 0); |
1347 | |
1448 | |
1348 | /* command interpreter path */ |
1449 | /* command interpreter path */ |
1349 | if (argv != NULL) |
1450 | if (argv) |
1350 | { |
1451 | { |
1351 | # ifdef DEBUG_CMD |
1452 | # ifdef DEBUG_CMD |
1352 | int i; |
1453 | int i; |
1353 | |
1454 | |
1354 | for (i = 0; argv[i]; i++) |
1455 | for (i = 0; argv[i]; i++) |
… | |
… | |
1374 | login[0] = '-'; |
1475 | login[0] = '-'; |
1375 | strcpy (&login[1], argv0); |
1476 | strcpy (&login[1], argv0); |
1376 | argv0 = login; |
1477 | argv0 = login; |
1377 | } |
1478 | } |
1378 | |
1479 | |
1379 | execlp (shell, argv0, NULL); |
1480 | execlp (shell, argv0, (char *)0); |
1380 | /* no error message: STDERR is closed! */ |
1481 | /* no error message: STDERR is closed! */ |
1381 | } |
1482 | } |
1382 | |
1483 | |
1383 | return -1; |
1484 | return -1; |
1384 | } |
1485 | } |