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.209 by ayin, Sat Sep 8 20:54:50 2007 UTC vs.
Revision 1.226 by ayin, Tue Dec 11 17:42:04 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> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 16 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
42 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
61#ifdef DISPLAY_IS_IP
62/* On Solaris link with -lsocket and -lnsl */
63#include <sys/types.h>
64#include <sys/socket.h>
65
66/* these next two are probably only on Sun (not Solaris) */
67#ifdef HAVE_SYS_SOCKIO_H
68#include <sys/sockio.h>
69#endif
70#ifdef HAVE_SYS_BYTEORDER_H
71#include <sys/byteorder.h>
72#endif
73
74#include <netinet/in.h>
75#include <arpa/inet.h>
76#include <net/if.h>
77#include <net/if_arp.h>
78
79static char *
80rxvt_network_display (const char *display)
81{
82 char buffer[1024], *rval = NULL;
83 struct ifconf ifc;
84 struct ifreq *ifr;
85 int i, skfd;
86
87 if (display[0] != ':' && strncmp (display, "unix:", 5))
88 return (char *) display; /* nothing to do */
89
90 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
91 ifc.ifc_buf = buffer;
92
93 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
94 {
95 perror ("socket");
96 return NULL;
97 }
98
99 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
100 {
101 perror ("SIOCGIFCONF");
102 close (skfd);
103 return NULL;
104 }
105
106 for (i = 0, ifr = ifc.ifc_req;
107 i < (ifc.ifc_len / sizeof (struct ifreq));
108 i++, ifr++)
109 {
110 struct ifreq ifr2;
111
112 strcpy (ifr2.ifr_name, ifr->ifr_name);
113
114 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
115 {
116 unsigned long addr;
117 struct sockaddr_in *p_addr;
118
119 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
120 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
121
122 /*
123 * not "0.0.0.0" or "127.0.0.1" - so format the address
124 */
125 if (addr && addr != 0x7F000001)
126 {
127 char *colon = strchr (display, ':');
128
129 if (colon == NULL)
130 colon = ":0.0";
131
132 rval = rxvt_malloc (strlen (colon) + 16);
133 sprintf (rval, "%d.%d.%d.%d%s",
134 (int) ((addr >> 030) & 0xFF),
135 (int) ((addr >> 020) & 0xFF),
136 (int) ((addr >> 010) & 0xFF),
137 (int) (addr & 0xFF), colon);
138 break;
139 }
140 }
141 }
142
143 close (skfd);
144
145 return rval;
146}
147#endif
148
43const char *const def_colorName[] = 149const char *const def_colorName[] =
44 { 150 {
45 COLOR_FOREGROUND, 151 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 152 COLOR_BACKGROUND,
47 /* low-intensity colors */ 153 /* low-intensity colors */
… …
50 "rgb:00/cd/00", // 2: green (Green3) 156 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 157 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 158 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 159 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 160 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 161# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 162 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 163# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 164 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 165# endif
60 /* high-intensity colors */ 166 /* high-intensity colors */
61# ifdef XTERM_COLORS 167# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 168 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
147 253
148#ifndef NO_CURSORCOLOR 254#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 255 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 256 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 257#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 258 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 259 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 260 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 261#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 262 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 263 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 264 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 265 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 266#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 267#if ENABLE_FRILLS
162 NULL, // Color_underline 268 NULL, // Color_underline
163#endif 269#endif
164#ifdef OPTION_HC 270#ifdef OPTION_HC
165 NULL, 271 NULL,
166#endif 272#endif
167#ifdef KEEP_SCROLLCOLOR 273#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 274 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 275 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 276#endif /* KEEP_SCROLLCOLOR */
171#if ENABLE_TRANSPARENCY 277#if ENABLE_TRANSPARENCY
172 NULL, 278 NULL,
173#endif 279#endif
174#if OFF_FOCUS_FADING 280#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 281 "rgb:00/00/00",
… …
199 numpix_colors = TOTAL_COLORS; 305 numpix_colors = TOTAL_COLORS;
200 306
201 refresh_type = SLOW_REFRESH; 307 refresh_type = SLOW_REFRESH;
202 308
203 oldcursor.row = oldcursor.col = -1; 309 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; 310 last_bot = last_state = -1;
217 311
218 set_option (Opt_scrollBar); 312 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 313 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 314 set_option (Opt_jumpScroll);
… …
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 335 {
242 /* TODO: BOO HISS */ 336 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 337 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 338 }
245 else if (i > STDIN_FILENO) 339 else if (i != STDIN_FILENO)
246 { 340 {
247 dup2 (i, STDIN_FILENO); 341 dup2 (i, STDIN_FILENO);
248 close (i); 342 close (i);
249 } 343 }
250 344
… …
265/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
266const char ** 360const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 361rxvt_term::init_resources (int argc, const char *const *argv)
268{ 362{
269 int i, r_argc; 363 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 364 const char **cmd_argv, **r_argv;
272 365
273 /* 366 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 367 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 368 */
276 for (r_argc = 0; r_argc < argc; r_argc++) 369 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e")) 370 if (!strcmp (argv[r_argc], "-e"))
278 break; 371 break;
279 372
373 if (r_argc == argc)
374 cmd_argv = NULL;
375 else if (!argv[r_argc + 1])
376 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
377 else
378 {
379 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
380
381 for (i = 0; i < argc - r_argc - 1; i++)
382 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
383
384 cmd_argv[i] = NULL;
385 }
386
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281 388
282 for (i = 0; i < r_argc; i++) 389 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i]; 390 r_argv[i] = (const char *)argv[i];
284 391
285 r_argv[i] = NULL; 392 r_argv[i] = NULL;
286 393
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]); 394 rs[Rs_name] = rxvt_basename (argv[0]);
300 395
301 /* 396 /*
302 * Open display, get options/resources and create the window 397 * Open display, get options/resources and create the window
303 */ 398 */
304 399
… …
306 rs[Rs_display_name] = ":0"; 401 rs[Rs_display_name] = ":0";
307 402
308 get_options (r_argc, r_argv); 403 get_options (r_argc, r_argv);
309 404
310 if (!(display = displays.get (rs[Rs_display_name]))) 405 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 408 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
409 }
312 410
313 // using a local pointer decreases code size a lot 411 // using a local pointer decreases code size a lot
314 xa = display->xa; 412 xa = display->xa;
315 413
316 set (display); 414 set (display);
… …
347 * set any defaults not already set 445 * set any defaults not already set
348 */ 446 */
349 if (cmd_argv && cmd_argv[0]) 447 if (cmd_argv && cmd_argv[0])
350 { 448 {
351 if (!rs[Rs_title]) 449 if (!rs[Rs_title])
352 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 450 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
353 if (!rs[Rs_iconName]) 451 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_title]; 452 rs[Rs_iconName] = rs[Rs_title];
355 } 453 }
356 else 454 else
357 { 455 {
… …
395 rs[Rs_cutchars] = CUTCHARS; 493 rs[Rs_cutchars] = CUTCHARS;
396 494
397#ifndef NO_BACKSPACE_KEY 495#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 496 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 497# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 498 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 499# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 500 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 501# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 key_backspace = val;
408 }
409#endif 502#endif
410 503
411#ifndef NO_DELETE_KEY 504#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 505 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 506# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 507 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 508# else
416 key_delete = "\033[3~"; 509 rs[Rs_delete_key] = "\033[3~";
417# endif 510# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 key_delete = val;
422 }
423#endif 511#endif
424 512
425#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 514 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
427#endif 515#endif
… …
452 color_aliases (Color_fg); 540 color_aliases (Color_fg);
453 color_aliases (Color_bg); 541 color_aliases (Color_bg);
454#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
455 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
456 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
457#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
458 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
459 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
460 color_aliases (Color_border); 548 color_aliases (Color_border);
461#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
462 color_aliases (Color_BD); 550 color_aliases (Color_BD);
463 color_aliases (Color_UL); 551 color_aliases (Color_UL);
464 color_aliases (Color_RV); 552 color_aliases (Color_RV);
465#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
466 554
467 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
468 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
469 557
470 return cmd_argv; 558 return cmd_argv;
… …
490 */ 578 */
491 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
492 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
493 581
494 if (val == NULL) 582 if (val == NULL)
495#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
496 val = XDisplayString (dpy); 584 val = XDisplayString (dpy);
497 585
498 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
499 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
500 588
… …
540#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
541 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
542 unsetenv ("LINES"); 630 unsetenv ("LINES");
543 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
544 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
545#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
546} 634}
547 635
548/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
549/* 637/*
550 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
571 659
572 this->locale = "C"; 660 this->locale = "C";
573 } 661 }
574 662
575 663
576 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
577 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
578 mbstate.reset (); 666 mbstate.reset ();
579#endif 667#endif
580 668
581#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
638 priv_modes |= PrivMode_Keypress; 726 priv_modes |= PrivMode_Keypress;
639 if (!option (Opt_jumpScroll)) 727 if (!option (Opt_jumpScroll))
640 priv_modes |= PrivMode_smoothScroll; 728 priv_modes |= PrivMode_smoothScroll;
641 729
642#ifndef NO_BACKSPACE_KEY 730#ifndef NO_BACKSPACE_KEY
643 if (strcmp (key_backspace, "DEC") == 0) 731 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
644 priv_modes |= PrivMode_HaveBackSpace; 732 priv_modes |= PrivMode_HaveBackSpace;
645#endif 733#endif
646 734
647 /* add value for scrollBar */ 735 /* add value for scrollBar */
648 if (scrollBar.state) 736 if (scrollBar.state)
… …
661 int i; 749 int i;
662 750
663#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
664 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
665#endif 753#endif
666 754
667 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
668 { 756 {
669 const char *name = rs[Rs_color + i]; 757 const char *name = rs[Rs_color + i];
670 758
671 if (!name) 759 if (!name)
… …
749 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),
750 cscroll.a) 838 cscroll.a)
751 )) 839 ))
752 alias_color (Color_topShadow, Color_White); 840 alias_color (Color_topShadow, Color_White);
753 } 841 }
754#endif /* KEEP_SCROLLCOLOR */ 842#endif /* KEEP_SCROLLCOLOR */
755 843
756#ifdef OFF_FOCUS_FADING 844#ifdef OFF_FOCUS_FADING
757 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
758 update_fade_color (i); 846 update_fade_color (i);
759#endif 847#endif
… …
767 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 855 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
768 { 856 {
769 int i = atoi (rs[Rs_color + idx]); 857 int i = atoi (rs[Rs_color + idx]);
770 858
771 if (i >= 8 && i <= 15) 859 if (i >= 8 && i <= 15)
772 { /* bright colors */ 860 /* bright colors */
773 i -= 8;
774 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 861 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
775 return; 862 else if (i >= 0 && i <= 7)
776 } 863 /* normal colors */
777
778 if (i >= 0 && i <= 7) /* normal colors */
779 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 864 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
780 } 865 }
781} 866}
782 867
783/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
1143 1228
1144 /* 1229 /*
1145 * Debugging 1230 * Debugging
1146 */ 1231 */
1147#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1148#ifdef HAVE_TERMIOS_H
1149 /* c_iflag bits */ 1233 /* c_iflag bits */
1150 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1151 1235
1152 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1153# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1216 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1217# endif 1301# endif
1218 1302
1219 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1220# undef FOO 1304# undef FOO
1221# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1222#endif /* DEBUG_TTYMODE */
1223} 1306}
1224 1307
1225/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1226/* 1309/*
1227 * 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
… …
1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1252 1335
1253 int er; 1336 int er;
1254 1337
1255#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1256 if (key_backspace[0] && !key_backspace[1]) 1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1257 er = key_backspace[0]; 1340 er = rs[Rs_backspace_key][0];
1258 else if (strcmp (key_backspace, "DEC") == 0) 1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1259 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1260 else 1343 else
1261#endif 1344#endif
1262 er = -1; 1345 er = -1;
1263 1346
… …
1330rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1331{ 1414{
1332 char *login; 1415 char *login;
1333 1416
1334 if (option (Opt_console)) 1417 if (option (Opt_console))
1418 {
1335 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1336#ifdef TIOCCONS 1420#ifdef TIOCCONS
1337 unsigned int on = 1; 1421 unsigned int on = 1;
1338 1422
1339 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1340#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1342 1426
1343 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1344 if (fd >= 0) 1428 if (fd >= 0)
1345 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1346 close (fd); 1430 close (fd);
1347#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1348 } 1432 }
1349 1433
1350 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1351 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1352 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1359 */ 1443 */
1360#ifdef SIGTSTP 1444#ifdef SIGTSTP
1361 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1362 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1363 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1364#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1365 1449
1366 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1367 sigset_t ss; 1451 sigset_t ss;
1368 sigemptyset (&ss); 1452 sigemptyset (&ss);
1369 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1370 1454
1371 /* command interpreter path */ 1455 /* command interpreter path */
1372 if (argv != NULL) 1456 if (argv)
1373 { 1457 {
1374# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1375 int i; 1459 int i;
1376 1460
1377 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1386 const char *argv0, *shell; 1470 const char *argv0, *shell;
1387 1471
1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1389 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1390 1474
1391 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1392 1476
1393 if (option (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1394 { 1478 {
1395 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1396 1480
1397 login[0] = '-'; 1481 login[0] = '-';
1398 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1399 argv0 = login; 1483 argv0 = login;
1400 } 1484 }
1401 1485
1402 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1403 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1404 } 1488 }
1405 1489
1406 return -1; 1490 return -1;
1407} 1491}

Diff Legend

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