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.208 by ayin, Mon Sep 3 08:48:00 2007 UTC vs.
Revision 1.229 by root, Fri Dec 14 02:22:24 2007 UTC

… …
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
77static char *
78rxvt_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
43const char *const def_colorName[] = 147const 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
179bool 283void
180rxvt_term::init_vars () 284rxvt_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
… …
199 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
200 304
201 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
202 306
203 oldcursor.row = oldcursor.col = -1; 307 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216 last_bot = last_state = -1; 308 last_bot = last_state = -1;
217 309
218 set_option (Opt_scrollBar); 310 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 311 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 312 set_option (Opt_jumpScroll);
… …
222 set_option (Opt_secondaryScreen); 314 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 315 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 316 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 317 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52); 318 set_option (Opt_iso14755_52);
227
228 return true;
229} 319}
230 320
231void 321void
232rxvt_term::init_secondary () 322rxvt_term::init_secondary ()
233{ 323{
… …
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 330 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 331 {
242 /* TODO: BOO HISS */ 332 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 333 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 334 }
245 else if (i > STDIN_FILENO) 335 else if (i != STDIN_FILENO)
246 { 336 {
247 dup2 (i, STDIN_FILENO); 337 dup2 (i, STDIN_FILENO);
248 close (i); 338 close (i);
249 } 339 }
250 340
… …
265/*----------------------------------------------------------------------*/ 355/*----------------------------------------------------------------------*/
266const char ** 356const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 357rxvt_term::init_resources (int argc, const char *const *argv)
268{ 358{
269 int i, r_argc; 359 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 360 const char **cmd_argv, **r_argv;
272 361
273 /* 362 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 363 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 364 */
276 for (r_argc = 0; r_argc < argc; r_argc++) 365 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e")) 366 if (!strcmp (argv[r_argc], "-e"))
278 break; 367 break;
279 368
369 if (r_argc == argc)
370 cmd_argv = NULL;
371 else if (!argv[r_argc + 1])
372 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
373 else
374 {
375 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
376
377 for (i = 0; i < argc - r_argc - 1; i++)
378 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
379
380 cmd_argv[i] = NULL;
381 }
382
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 383 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281 384
282 for (i = 0; i < r_argc; i++) 385 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i]; 386 r_argv[i] = (const char *)argv[i];
284 387
285 r_argv[i] = NULL; 388 r_argv[i] = NULL;
286 389
287 if (r_argc == argc)
288 cmd_argv = NULL;
289 else
290 {
291 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
292
293 for (i = 0; i < argc - r_argc - 1; i++)
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296 cmd_argv[i] = NULL;
297 }
298
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 390 rs[Rs_name] = rxvt_basename (argv[0]);
300 391
301 /* 392 /*
302 * Open display, get options/resources and create the window 393 * Open display, get options/resources and create the window
303 */ 394 */
304 395
… …
306 rs[Rs_display_name] = ":0"; 397 rs[Rs_display_name] = ":0";
307 398
308 get_options (r_argc, r_argv); 399 get_options (r_argc, r_argv);
309 400
310 if (!(display = displays.get (rs[Rs_display_name]))) 401 if (!(display = displays.get (rs[Rs_display_name])))
402 {
403 free (r_argv);
311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 404 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
405 }
312 406
313 // using a local pointer decreases code size a lot 407 // using a local pointer decreases code size a lot
314 xa = display->xa; 408 xa = display->xa;
315 409
316 set (display); 410 set (display);
… …
347 * set any defaults not already set 441 * set any defaults not already set
348 */ 442 */
349 if (cmd_argv && cmd_argv[0]) 443 if (cmd_argv && cmd_argv[0])
350 { 444 {
351 if (!rs[Rs_title]) 445 if (!rs[Rs_title])
352 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 446 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
353 if (!rs[Rs_iconName]) 447 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_title]; 448 rs[Rs_iconName] = rs[Rs_title];
355 } 449 }
356 else 450 else
357 { 451 {
… …
395 rs[Rs_cutchars] = CUTCHARS; 489 rs[Rs_cutchars] = CUTCHARS;
396 490
397#ifndef NO_BACKSPACE_KEY 491#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 492 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 493# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 494 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 495# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 496 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 497# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 rxvt_Str_trim (val);
408 rxvt_Str_escaped (val);
409 key_backspace = val;
410 }
411#endif 498#endif
412 499
413#ifndef NO_DELETE_KEY 500#ifndef NO_DELETE_KEY
414 if (!rs[Rs_delete_key]) 501 if (!rs[Rs_delete_key])
415# ifdef DEFAULT_DELETE 502# ifdef DEFAULT_DELETE
416 key_delete = DEFAULT_DELETE; 503 rs[Rs_delete_key] = DEFAULT_DELETE;
417# else 504# else
418 key_delete = "\033[3~"; 505 rs[Rs_delete_key] = "\033[3~";
419# endif
420 else
421 {
422 val = strdup (rs[Rs_delete_key]);
423 rxvt_Str_trim (val);
424 rxvt_Str_escaped (val);
425 key_delete = val;
426 }
427#endif 506# endif
428 if (rs[Rs_answerbackstring]) 507#endif
429 {
430 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
431 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
432 }
433 508
434#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 510 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
436#endif 511#endif
437 512
… …
461 color_aliases (Color_fg); 536 color_aliases (Color_fg);
462 color_aliases (Color_bg); 537 color_aliases (Color_bg);
463#ifndef NO_CURSORCOLOR 538#ifndef NO_CURSORCOLOR
464 color_aliases (Color_cursor); 539 color_aliases (Color_cursor);
465 color_aliases (Color_cursor2); 540 color_aliases (Color_cursor2);
466#endif /* NO_CURSORCOLOR */ 541#endif /* NO_CURSORCOLOR */
467 color_aliases (Color_pointer_fg); 542 color_aliases (Color_pointer_fg);
468 color_aliases (Color_pointer_bg); 543 color_aliases (Color_pointer_bg);
469 color_aliases (Color_border); 544 color_aliases (Color_border);
470#ifndef NO_BOLD_UNDERLINE_REVERSE 545#ifndef NO_BOLD_UNDERLINE_REVERSE
471 color_aliases (Color_BD); 546 color_aliases (Color_BD);
472 color_aliases (Color_UL); 547 color_aliases (Color_UL);
473 color_aliases (Color_RV); 548 color_aliases (Color_RV);
474#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 549#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
475 550
476 if (!rs[Rs_color + Color_border]) 551 if (!rs[Rs_color + Color_border])
477 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 552 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
478 553
479 return cmd_argv; 554 return cmd_argv;
… …
499 */ 574 */
500 val = rxvt_network_display (rs[Rs_display_name]); 575 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 576 rs[Rs_display_name] = (const char *)val;
502 577
503 if (val == NULL) 578 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 579#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (dpy); 580 val = XDisplayString (dpy);
506 581
507 if (rs[Rs_display_name] == NULL) 582 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 583 rs[Rs_display_name] = val; /* use broken `:0' value */
509 584
… …
549#ifdef HAVE_UNSETENV 624#ifdef HAVE_UNSETENV
550 /* avoid passing old settings and confusing term size */ 625 /* avoid passing old settings and confusing term size */
551 unsetenv ("LINES"); 626 unsetenv ("LINES");
552 unsetenv ("COLUMNS"); 627 unsetenv ("COLUMNS");
553 unsetenv ("TERMCAP"); /* terminfo should be okay */ 628 unsetenv ("TERMCAP"); /* terminfo should be okay */
554#endif /* HAVE_UNSETENV */ 629#endif /* HAVE_UNSETENV */
555} 630}
556 631
557/*----------------------------------------------------------------------*/ 632/*----------------------------------------------------------------------*/
558/* 633/*
559 * This is more or less stolen straight from XFree86 xterm. 634 * This is more or less stolen straight from XFree86 xterm.
… …
580 655
581 this->locale = "C"; 656 this->locale = "C";
582 } 657 }
583 658
584 659
585 this->locale = rxvt_strdup (this->locale); 660 this->locale = strdup (this->locale);
586 SET_LOCALE (this->locale); 661 SET_LOCALE (this->locale);
587 mbstate.reset (); 662 mbstate.reset ();
588#endif 663#endif
589 664
590#if HAVE_NL_LANGINFO 665#if HAVE_NL_LANGINFO
… …
647 priv_modes |= PrivMode_Keypress; 722 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 723 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 724 priv_modes |= PrivMode_smoothScroll;
650 725
651#ifndef NO_BACKSPACE_KEY 726#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 727 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 728 priv_modes |= PrivMode_HaveBackSpace;
654#endif 729#endif
655 730
656 /* add value for scrollBar */ 731 /* add value for scrollBar */
657 if (scrollBar.state) 732 if (scrollBar.state)
… …
670 int i; 745 int i;
671 746
672#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
673 pix_colors = pix_colors_focused; 748 pix_colors = pix_colors_focused;
674#endif 749#endif
675 750
676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 751 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
677 { 752 {
678 const char *name = rs[Rs_color + i]; 753 const char *name = rs[Rs_color + i];
679 754
680 if (!name) 755 if (!name)
… …
758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 833 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
759 cscroll.a) 834 cscroll.a)
760 )) 835 ))
761 alias_color (Color_topShadow, Color_White); 836 alias_color (Color_topShadow, Color_White);
762 } 837 }
763#endif /* KEEP_SCROLLCOLOR */ 838#endif /* KEEP_SCROLLCOLOR */
764 839
765#ifdef OFF_FOCUS_FADING 840#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 841 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i); 842 update_fade_color (i);
768#endif 843#endif
… …
776 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 851 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
777 { 852 {
778 int i = atoi (rs[Rs_color + idx]); 853 int i = atoi (rs[Rs_color + idx]);
779 854
780 if (i >= 8 && i <= 15) 855 if (i >= 8 && i <= 15)
781 { /* bright colors */ 856 /* bright colors */
782 i -= 8;
783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 857 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784 return; 858 else if (i >= 0 && i <= 7)
785 } 859 /* normal colors */
786
787 if (i >= 0 && i <= 7) /* normal colors */
788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 860 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789 } 861 }
790} 862}
791 863
792/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
… …
1152 1224
1153 /* 1225 /*
1154 * Debugging 1226 * Debugging
1155 */ 1227 */
1156#ifdef DEBUG_TTYMODE 1228#ifdef DEBUG_TTYMODE
1157#ifdef HAVE_TERMIOS_H
1158 /* c_iflag bits */ 1229 /* c_iflag bits */
1159 fprintf (stderr, "Input flags\n"); 1230 fprintf (stderr, "Input flags\n");
1160 1231
1161 /* cpp token stringize doesn't work on all machines <sigh> */ 1232 /* cpp token stringize doesn't work on all machines <sigh> */
1162# define FOO(flag,name) \ 1233# define FOO(flag,name) \
… …
1225 FOO (VLNEXT, "VLNEXT"); 1296 FOO (VLNEXT, "VLNEXT");
1226# endif 1297# endif
1227 1298
1228 fprintf (stderr, "\n"); 1299 fprintf (stderr, "\n");
1229# undef FOO 1300# undef FOO
1230# endif /* HAVE_TERMIOS_H */ 1301#endif /* DEBUG_TTYMODE */
1231#endif /* DEBUG_TTYMODE */
1232} 1302}
1233 1303
1234/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1235/* 1305/*
1236 * Run the command in a subprocess and return a file descriptor for the 1306 * Run the command in a subprocess and return a file descriptor for the
… …
1260 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1261 1331
1262 int er; 1332 int er;
1263 1333
1264#ifndef NO_BACKSPACE_KEY 1334#ifndef NO_BACKSPACE_KEY
1265 if (key_backspace[0] && !key_backspace[1]) 1335 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1266 er = key_backspace[0]; 1336 er = rs[Rs_backspace_key][0];
1267 else if (strcmp (key_backspace, "DEC") == 0) 1337 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1268 er = '\177'; /* the initial state anyway */ 1338 er = '\177'; /* the initial state anyway */
1269 else 1339 else
1270#endif 1340#endif
1271 er = -1; 1341 er = -1;
1272 1342
… …
1339rxvt_term::run_child (const char *const *argv) 1409rxvt_term::run_child (const char *const *argv)
1340{ 1410{
1341 char *login; 1411 char *login;
1342 1412
1343 if (option (Opt_console)) 1413 if (option (Opt_console))
1414 {
1344 { /* be virtual console, fail silently */ 1415 /* be virtual console, fail silently */
1345#ifdef TIOCCONS 1416#ifdef TIOCCONS
1346 unsigned int on = 1; 1417 unsigned int on = 1;
1347 1418
1348 ioctl (STDIN_FILENO, TIOCCONS, &on); 1419 ioctl (STDIN_FILENO, TIOCCONS, &on);
1349#elif defined (SRIOCSREDIR) 1420#elif defined (SRIOCSREDIR)
… …
1351 1422
1352 fd = open (CONSOLE, O_WRONLY, 0); 1423 fd = open (CONSOLE, O_WRONLY, 0);
1353 if (fd >= 0) 1424 if (fd >= 0)
1354 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1425 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1355 close (fd); 1426 close (fd);
1356#endif /* SRIOCSREDIR */ 1427#endif /* SRIOCSREDIR */
1357 } 1428 }
1358 1429
1359 /* reset signals and spin off the command interpreter */ 1430 /* reset signals and spin off the command interpreter */
1360 signal (SIGINT, SIG_DFL); 1431 signal (SIGINT, SIG_DFL);
1361 signal (SIGQUIT, SIG_DFL); 1432 signal (SIGQUIT, SIG_DFL);
… …
1368 */ 1439 */
1369#ifdef SIGTSTP 1440#ifdef SIGTSTP
1370 signal (SIGTSTP, SIG_IGN); 1441 signal (SIGTSTP, SIG_IGN);
1371 signal (SIGTTIN, SIG_IGN); 1442 signal (SIGTTIN, SIG_IGN);
1372 signal (SIGTTOU, SIG_IGN); 1443 signal (SIGTTOU, SIG_IGN);
1373#endif /* SIGTSTP */ 1444#endif /* SIGTSTP */
1374 1445
1375 // unblock signals (signals are blocked by iom.C 1446 // unblock signals (signals are blocked by iom.C
1376 sigset_t ss; 1447 sigset_t ss;
1377 sigemptyset (&ss); 1448 sigemptyset (&ss);
1378 sigprocmask (SIG_SETMASK, &ss, 0); 1449 sigprocmask (SIG_SETMASK, &ss, 0);
1379 1450
1380 /* command interpreter path */ 1451 /* command interpreter path */
1381 if (argv != NULL) 1452 if (argv)
1382 { 1453 {
1383# ifdef DEBUG_CMD 1454# ifdef DEBUG_CMD
1384 int i; 1455 int i;
1385 1456
1386 for (i = 0; argv[i]; i++) 1457 for (i = 0; argv[i]; i++)
… …
1395 const char *argv0, *shell; 1466 const char *argv0, *shell;
1396 1467
1397 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1468 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1398 shell = "/bin/sh"; 1469 shell = "/bin/sh";
1399 1470
1400 argv0 = (const char *)rxvt_r_basename (shell); 1471 argv0 = (const char *)rxvt_basename (shell);
1401 1472
1402 if (option (Opt_loginShell)) 1473 if (option (Opt_loginShell))
1403 { 1474 {
1404 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1475 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1405 1476
1406 login[0] = '-'; 1477 login[0] = '-';
1407 strcpy (&login[1], argv0); 1478 strcpy (&login[1], argv0);
1408 argv0 = login; 1479 argv0 = login;
1409 } 1480 }
1410 1481
1411 execlp (shell, argv0, NULL); 1482 execlp (shell, argv0, (char *)0);
1412 /* no error message: STDERR is closed! */ 1483 /* no error message: STDERR is closed! */
1413 } 1484 }
1414 1485
1415 return -1; 1486 return -1;
1416} 1487}

Diff Legend

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