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.176 by root, Sat Jan 20 00:40:23 2007 UTC vs.
Revision 1.238 by ayin, Fri Jan 4 17:57:28 2008 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 */
48 "rgb:00/00/00", // 0: black (Black) 152 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 153 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (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 TINTING 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 = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 287
192 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 290 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 292 ncol = 80;
198 nrow = 24; 293 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 297 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 298
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
207 300
208 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 302
215 last_bot = last_state = -1; 303 set_option (Opt_scrollBar);
216 304 set_option (Opt_scrollTtyOutput);
217 return true; 305 set_option (Opt_jumpScroll);
306 set_option (Opt_skipScroll);
307 set_option (Opt_secondaryScreen);
308 set_option (Opt_secondaryScroll);
309 set_option (Opt_pastableTabs);
310 set_option (Opt_intensityStyles);
311 set_option (Opt_iso14755_52);
218} 312}
219 313
220void 314void
221rxvt_term::init_secondary () 315rxvt_term::init_secondary ()
222{ 316{
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 324 {
231 /* TODO: BOO HISS */ 325 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 326 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 327 }
234 else if (i > STDIN_FILENO) 328 else if (i != STDIN_FILENO)
235 { 329 {
236 dup2 (i, STDIN_FILENO); 330 dup2 (i, STDIN_FILENO);
237 close (i); 331 close (i);
238 } 332 }
239 333
… …
254/*----------------------------------------------------------------------*/ 348/*----------------------------------------------------------------------*/
255const char ** 349const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 350rxvt_term::init_resources (int argc, const char *const *argv)
257{ 351{
258 int i, r_argc; 352 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 353 const char **cmd_argv, **r_argv;
261 354
262 /* 355 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 356 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 357 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 358 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 359 if (!strcmp (argv[r_argc], "-e"))
267 break; 360 break;
268 361
362 if (r_argc == argc)
363 cmd_argv = NULL;
364 else if (!argv[r_argc + 1])
365 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
366 else
367 {
368 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
369
370 for (i = 0; i < argc - r_argc - 1; i++)
371 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
372
373 cmd_argv[i] = NULL;
374 }
375
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 376 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 377
271 for (i = 0; i < r_argc; i++) 378 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 379 r_argv[i] = (const char *)argv[i];
273 380
274 r_argv[i] = NULL; 381 r_argv[i] = NULL;
275 382
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 383 rs[Rs_name] = rxvt_basename (argv[0]);
289 384
290 /* 385 /*
291 * Open display, get options/resources and create the window 386 * Open display, get options/resources and create the window
292 */ 387 */
293 388
… …
295 rs[Rs_display_name] = ":0"; 390 rs[Rs_display_name] = ":0";
296 391
297 get_options (r_argc, r_argv); 392 get_options (r_argc, r_argv);
298 393
299 if (!(display = displays.get (rs[Rs_display_name]))) 394 if (!(display = displays.get (rs[Rs_display_name])))
395 {
396 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 397 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
398 }
301 399
302 // using a local pointer decreases code size a lot 400 // using a local pointer decreases code size a lot
303 xa = display->xa; 401 xa = display->xa;
304 402
305 set (display); 403 set (display);
… …
308#if XFT 406#if XFT
309 if (rs[Rs_depth]) 407 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 408 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 409#endif
312 410
411#ifdef HAVE_AFTERIMAGE
412 set_application_name ((char*)rs[Rs_name]);
413 set_output_threshold (OUTPUT_LEVEL_WARNING);
414 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
415#endif
313 free (r_argv); 416 free (r_argv);
314 417
315 for (int i = NUM_RESOURCES; i--; ) 418 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 419 if (rs [i] == resval_undef)
317 rs [i] = 0; 420 rs [i] = 0;
… …
333 * set any defaults not already set 436 * set any defaults not already set
334 */ 437 */
335 if (cmd_argv && cmd_argv[0]) 438 if (cmd_argv && cmd_argv[0])
336 { 439 {
337 if (!rs[Rs_title]) 440 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 441 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 442 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 443 rs[Rs_iconName] = rs[Rs_title];
341 } 444 }
342 else 445 else
343 { 446 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 484 rs[Rs_cutchars] = CUTCHARS;
382 485
383#ifndef NO_BACKSPACE_KEY 486#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 487 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 488# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 489 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 490# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 491 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 492# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 493#endif
398 494
399#ifndef NO_DELETE_KEY 495#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 496 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 497# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 498 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 499# else
404 key_delete = "\033[3~"; 500 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 501# endif
414 if (rs[Rs_answerbackstring]) 502#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 503
420#ifdef HAVE_SCROLLBARS 504#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 505 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 506#endif
423 507
424#ifdef XTERM_REVERSE_VIDEO 508#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 509 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 510 if (option (Opt_reverseVideo))
427 { 511 {
428 if (!rs[Rs_color + Color_fg]) 512 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 513 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 514
431 if (!rs[Rs_color + Color_bg]) 515 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 521 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 522 rs[Rs_color + i] = def_colorName[i];
439 523
440#ifndef XTERM_REVERSE_VIDEO 524#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 525 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 526 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 527 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 528#endif
445 529
446 /* convenient aliases for setting fg/bg to colors */ 530 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 531 color_aliases (Color_fg);
448 color_aliases (Color_bg); 532 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 533#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 534 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 535 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 536#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 537 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 538 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 539 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 540#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 541 color_aliases (Color_BD);
458 color_aliases (Color_UL); 542 color_aliases (Color_UL);
459 color_aliases (Color_RV); 543 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 544#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 545
462 if (!rs[Rs_color + Color_border]) 546 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 547 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 548
465 return cmd_argv; 549 return cmd_argv;
… …
468/*----------------------------------------------------------------------*/ 552/*----------------------------------------------------------------------*/
469void 553void
470rxvt_term::init_env () 554rxvt_term::init_env ()
471{ 555{
472 int i; 556 int i;
473 unsigned int u;
474 char *val; 557 char *val;
475 558
476#ifdef DISPLAY_IS_IP 559#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 560 /* Fixup display_name for export over pty to any interested terminal
478 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 561 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 569 */
487 val = rxvt_network_display (rs[Rs_display_name]); 570 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 571 rs[Rs_display_name] = (const char *)val;
489 572
490 if (val == NULL) 573 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 574#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 575 val = XDisplayString (dpy);
493 576
494 if (rs[Rs_display_name] == NULL) 577 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 578 rs[Rs_display_name] = val; /* use broken `:0' value */
496 579
497 i = strlen (val); 580 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 581 env_display = (char *)rxvt_malloc (i + 9);
499 582
500 sprintf (env_display, "DISPLAY=%s", val); 583 sprintf (env_display, "DISPLAY=%s", val);
501 584
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 585 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 586
… …
524 else 607 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 608 putenv ("COLORTERM=" COLORTERMENVFULL);
526 609
527 if (rs[Rs_term_name] != NULL) 610 if (rs[Rs_term_name] != NULL)
528 { 611 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 612 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 613 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 614 putenv (env_term);
532 } 615 }
533 else 616 else
534 putenv ("TERM=" TERMENV); 617 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 619#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 620 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 621 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 622 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 623 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 624#endif /* HAVE_UNSETENV */
542} 625}
543 626
544/*----------------------------------------------------------------------*/ 627/*----------------------------------------------------------------------*/
545/* 628/*
546 * This is more or less stolen straight from XFree86 xterm. 629 * This is more or less stolen straight from XFree86 xterm.
… …
567 650
568 this->locale = "C"; 651 this->locale = "C";
569 } 652 }
570 653
571 654
572 this->locale = rxvt_strdup (this->locale); 655 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 656 SET_LOCALE (this->locale);
574 mbstate.reset (); 657 mbstate.reset ();
575#endif 658#endif
576 659
577#if HAVE_NL_LANGINFO 660#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 704 * Initialize the command connection.
622 * This should be called after the X server connection is established. 705 * This should be called after the X server connection is established.
623 */ 706 */
624 707
625#ifdef META8_OPTION 708#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 709 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 710#endif
628 711
629 get_ourmods (); 712 get_ourmods ();
630 713
631 if (!OPTION (Opt_scrollTtyOutput)) 714 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 715 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 716 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 717 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 718 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 719 priv_modes |= PrivMode_smoothScroll;
637 720
638#ifndef NO_BACKSPACE_KEY 721#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 722 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 723 priv_modes |= PrivMode_HaveBackSpace;
641#endif 724#endif
642 725
643 /* add value for scrollBar */ 726 /* add value for scrollBar */
644 if (scrollBar.state) 727 if (scrollBar.state)
… …
657 int i; 740 int i;
658 741
659#ifdef OFF_FOCUS_FADING 742#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 743 pix_colors = pix_colors_focused;
661#endif 744#endif
662 745
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 747 {
665 const char *name = rs[Rs_color + i]; 748 const char *name = rs[Rs_color + i];
666 749
667 if (!name) 750 if (!name)
… …
670 rxvt_color xcol; 753 rxvt_color xcol;
671 754
672 if (!set_color (xcol, name)) 755 if (!set_color (xcol, name))
673 { 756 {
674#ifndef XTERM_REVERSE_VIDEO 757#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 758 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 759 name = def_colorName [1 - i];
677 else 760 else
678#endif 761#endif
679 name = def_colorName [i]; 762 name = def_colorName [i];
680 763
… …
745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 828 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746 cscroll.a) 829 cscroll.a)
747 )) 830 ))
748 alias_color (Color_topShadow, Color_White); 831 alias_color (Color_topShadow, Color_White);
749 } 832 }
750#endif /* KEEP_SCROLLCOLOR */ 833#endif /* KEEP_SCROLLCOLOR */
751 834
752#ifdef OFF_FOCUS_FADING 835#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 836 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i); 837 update_fade_color (i);
755#endif 838#endif
… …
763 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 846 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764 { 847 {
765 int i = atoi (rs[Rs_color + idx]); 848 int i = atoi (rs[Rs_color + idx]);
766 849
767 if (i >= 8 && i <= 15) 850 if (i >= 8 && i <= 15)
768 { /* bright colors */ 851 /* bright colors */
769 i -= 8;
770 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 852 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771 return; 853 else if (i >= 0 && i <= 7)
772 } 854 /* normal colors */
773
774 if (i >= 0 && i <= 7) /* normal colors */
775 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 855 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776 } 856 }
777} 857}
778 858
779/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 951rxvt_term::create_windows (int argc, const char *const *argv)
872{ 952{
873 XClassHint classHint; 953 XClassHint classHint;
874 XWMHints wmHint; 954 XWMHints wmHint;
875#if ENABLE_FRILLS 955#if ENABLE_FRILLS
876 MWMHints mwmhints; 956 MWMHints mwmhints = { };
877#endif 957#endif
878 XGCValues gcvalue; 958 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 959 XSetWindowAttributes attributes;
880 Window top, parent; 960 Window top, parent;
881 961
… …
887 if (!set_fonts ()) 967 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 968 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 969
890 parent = display->root; 970 parent = display->root;
891 971
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 972 attributes.override_redirect = !!option (Opt_override_redirect);
893 973
894#if ENABLE_FRILLS 974#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 975 if (option (Opt_borderLess))
896 { 976 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 977 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 978 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 979 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900 attributes.override_redirect = true; 980 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 981 }
903 else 982 else
904 { 983 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 984 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 985 }
908 } 986 }
909 else
910 mwmhints.flags = 0;
911#endif 987#endif
912 988
913#if ENABLE_XEMBED 989#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 990 if (rs[Rs_embed])
915 { 991 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
952 1028
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1030 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1031 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1032 wmHint.window_group = top;
957 1033
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1034 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
960 1036
… …
998 1074
999 termwin_ev.start (display, top); 1075 termwin_ev.start (display, top);
1000 1076
1001 /* vt cursor: Black-on-White is standard, but this is more popular */ 1077 /* vt cursor: Black-on-White is standard, but this is more popular */
1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1003
1004#ifdef HAVE_SCROLLBARS
1005 /* cursor scrollBar: Black-on-White */
1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1007#endif
1008 1079
1009 /* the vt window */ 1080 /* the vt window */
1010 vt = XCreateSimpleWindow (dpy, top, 1081 vt = XCreateSimpleWindow (dpy, top,
1011 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
1012 width, height, 1083 width, height,
… …
1017 attributes.bit_gravity = NorthWestGravity; 1088 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1089 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1090
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1092
1022 if (OPTION (Opt_pointerBlank)) 1093 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1094 vt_emask |= PointerMotionMask;
1024 else 1095 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1096 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1097
1027 vt_select_input (); 1098 vt_select_input ();
1028 1099
1029 vt_ev.start (display, vt); 1100 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1101
1048 /* graphics context for the vt window */ 1102 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1103 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1104 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1105 gcvalue.graphics_exposures = 0;
… …
1054 GCForeground | GCBackground | GCGraphicsExposures, 1108 GCForeground | GCBackground | GCGraphicsExposures,
1055 &gcvalue); 1109 &gcvalue);
1056 1110
1057 drawable = new rxvt_drawable (this, vt); 1111 drawable = new rxvt_drawable (this, vt);
1058 1112
1059#ifdef RXVT_SCROLLBAR
1060 gcvalue.foreground = pix_colors[Color_topShadow];
1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1066#endif
1067
1068#ifdef OFF_FOCUS_FADING 1113#ifdef OFF_FOCUS_FADING
1069 // initially we are in unfocused state 1114 // initially we are in unfocused state
1070 if (rs[Rs_fade]) 1115 if (rs[Rs_fade])
1071 pix_colors = pix_colors_unfocused; 1116 pix_colors = pix_colors_unfocused;
1072#endif 1117#endif
… …
1077 1122
1078/* ------------------------------------------------------------------------- * 1123/* ------------------------------------------------------------------------- *
1079 * GET TTY CURRENT STATE * 1124 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */ 1125 * ------------------------------------------------------------------------- */
1081void 1126void
1082rxvt_get_ttymode (ttymode_t *tio, int erase) 1127rxvt_get_ttymode (struct termios *tio, int erase)
1083{ 1128{
1084#ifdef HAVE_TERMIOS_H
1085 /* 1129 /*
1086 * standard System V termios interface 1130 * standard System V termios interface
1087 */ 1131 */
1088 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1132 if (tcgetattr (STDIN_FILENO, tio) < 0)
1089 { 1133 {
1090 // return error - use system defaults, 1134 // return error - use system defaults,
1091 // where possible, and zero elsewhere 1135 // where possible, and zero elsewhere
1092 memset (tio, 0, sizeof (ttymode_t)); 1136 memset (tio, 0, sizeof (struct termios));
1093 1137
1094 tio->c_cc[VINTR] = CINTR; 1138 tio->c_cc[VINTR] = CINTR;
1095 tio->c_cc[VQUIT] = CQUIT; 1139 tio->c_cc[VQUIT] = CQUIT;
1096 tio->c_cc[VERASE] = CERASE; 1140 tio->c_cc[VERASE] = CERASE;
1097#ifdef VERASE2 1141#ifdef VERASE2
… …
1156 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1200 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1157# if defined (ECHOCTL) && defined (ECHOKE) 1201# if defined (ECHOCTL) && defined (ECHOKE)
1158 | ECHOCTL | ECHOKE 1202 | ECHOCTL | ECHOKE
1159# endif 1203# endif
1160 | ECHOE | ECHOK); 1204 | ECHOE | ECHOK);
1161# else /* HAVE_TERMIOS_H */
1162
1163 /*
1164 * sgtty interface
1165 */
1166
1167 /* get parameters -- gtty */
1168 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1169 {
1170 tio->sg.sg_erase = CERASE; /* ^H */
1171 tio->sg.sg_kill = CKILL; /* ^U */
1172 }
1173
1174 if (erase != -1)
1175 tio->sg.sg_erase = (char)erase;
1176
1177 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1178
1179 /* get special characters */
1180 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1181 {
1182 tio->tc.t_intrc = CINTR; /* ^C */
1183 tio->tc.t_quitc = CQUIT; /* ^\ */
1184 tio->tc.t_startc = CSTART; /* ^Q */
1185 tio->tc.t_stopc = CSTOP; /* ^S */
1186 tio->tc.t_eofc = CEOF; /* ^D */
1187 tio->tc.t_brkc = -1;
1188 }
1189
1190 /* get local special chars */
1191 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1192 {
1193 tio->lc.t_suspc = CSUSP; /* ^Z */
1194 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1195 tio->lc.t_rprntc = CRPRNT; /* ^R */
1196 tio->lc.t_flushc = CFLUSH; /* ^O */
1197 tio->lc.t_werasc = CWERASE; /* ^W */
1198 tio->lc.t_lnextc = CLNEXT; /* ^V */
1199 }
1200 /* get line discipline */
1201 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1202# ifdef NTTYDISC
1203 tio->line = NTTYDISC;
1204# endif /* NTTYDISC */
1205
1206 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1207#endif /* HAVE_TERMIOS_H */
1208 1205
1209 /* 1206 /*
1210 * Debugging 1207 * Debugging
1211 */ 1208 */
1212#ifdef DEBUG_TTYMODE 1209#ifdef DEBUG_TTYMODE
1213#ifdef HAVE_TERMIOS_H
1214 /* c_iflag bits */ 1210 /* c_iflag bits */
1215 fprintf (stderr, "Input flags\n"); 1211 fprintf (stderr, "Input flags\n");
1216 1212
1217 /* cpp token stringize doesn't work on all machines <sigh> */ 1213 /* cpp token stringize doesn't work on all machines <sigh> */
1218# define FOO(flag,name) \ 1214# define FOO(flag,name) \
… …
1281 FOO (VLNEXT, "VLNEXT"); 1277 FOO (VLNEXT, "VLNEXT");
1282# endif 1278# endif
1283 1279
1284 fprintf (stderr, "\n"); 1280 fprintf (stderr, "\n");
1285# undef FOO 1281# undef FOO
1286# endif /* HAVE_TERMIOS_H */ 1282#endif /* DEBUG_TTYMODE */
1287#endif /* DEBUG_TTYMODE */
1288} 1283}
1289 1284
1290/*----------------------------------------------------------------------*/ 1285/*----------------------------------------------------------------------*/
1291/* 1286/*
1292 * Run the command in a subprocess and return a file descriptor for the 1287 * Run the command in a subprocess and return a file descriptor for the
… …
1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1311 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1317 1312
1318 int er; 1313 int er;
1319 1314
1320#ifndef NO_BACKSPACE_KEY 1315#ifndef NO_BACKSPACE_KEY
1321 if (key_backspace[0] && !key_backspace[1]) 1316 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1322 er = key_backspace[0]; 1317 er = rs[Rs_backspace_key][0];
1323 else if (strcmp (key_backspace, "DEC") == 0) 1318 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1324 er = '\177'; /* the initial state anyway */ 1319 er = '\177'; /* the initial state anyway */
1325 else 1320 else
1326#endif 1321#endif
1327 er = -1; 1322 er = -1;
1328 1323
1329 rxvt_get_ttymode (&tio, er); 1324 rxvt_get_ttymode (&tio, er);
1325 /* init terminal attributes */
1326 cfsetospeed (&tio, BAUDRATE);
1327 cfsetispeed (&tio, BAUDRATE);
1328 tcsetattr (pty->tty, TCSANOW, &tio);
1330 pty->set_utf8_mode (enc_utf8); 1329 pty->set_utf8_mode (enc_utf8);
1331 SET_TTYMODE (pty->tty, &tio); /* init terminal attributes */
1332 1330
1333 /* set initial window size */ 1331 /* set initial window size */
1334 tt_winch (); 1332 tt_winch ();
1335 1333
1336#if ENABLE_FRILLS 1334#if ENABLE_FRILLS
… …
1370 } 1368 }
1371 1369
1372 _exit (EXIT_FAILURE); 1370 _exit (EXIT_FAILURE);
1373 1371
1374 default: 1372 default:
1375 if (!OPTION (Opt_utmpInhibit)) 1373 if (!option (Opt_utmpInhibit))
1376 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1374 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1377 1375
1378 pty->close_tty (); 1376 pty->close_tty ();
1379 1377
1380 child_ev.start (cmd_pid); 1378 child_ev.start (cmd_pid);
1381 1379
… …
1394int 1392int
1395rxvt_term::run_child (const char *const *argv) 1393rxvt_term::run_child (const char *const *argv)
1396{ 1394{
1397 char *login; 1395 char *login;
1398 1396
1399 if (OPTION (Opt_console)) 1397 if (option (Opt_console))
1398 {
1400 { /* be virtual console, fail silently */ 1399 /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1400#ifdef TIOCCONS
1402 unsigned int on = 1; 1401 unsigned int on = 1;
1403 1402
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1403 ioctl (STDIN_FILENO, TIOCCONS, &on);
1405#elif defined (SRIOCSREDIR) 1404#elif defined (SRIOCSREDIR)
… …
1407 1406
1408 fd = open (CONSOLE, O_WRONLY, 0); 1407 fd = open (CONSOLE, O_WRONLY, 0);
1409 if (fd >= 0) 1408 if (fd >= 0)
1410 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1409 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1411 close (fd); 1410 close (fd);
1412#endif /* SRIOCSREDIR */ 1411#endif /* SRIOCSREDIR */
1413 } 1412 }
1414 1413
1415 /* reset signals and spin off the command interpreter */ 1414 /* reset signals and spin off the command interpreter */
1416 signal (SIGINT, SIG_DFL); 1415 signal (SIGINT, SIG_DFL);
1417 signal (SIGQUIT, SIG_DFL); 1416 signal (SIGQUIT, SIG_DFL);
… …
1424 */ 1423 */
1425#ifdef SIGTSTP 1424#ifdef SIGTSTP
1426 signal (SIGTSTP, SIG_IGN); 1425 signal (SIGTSTP, SIG_IGN);
1427 signal (SIGTTIN, SIG_IGN); 1426 signal (SIGTTIN, SIG_IGN);
1428 signal (SIGTTOU, SIG_IGN); 1427 signal (SIGTTOU, SIG_IGN);
1429#endif /* SIGTSTP */ 1428#endif /* SIGTSTP */
1430 1429
1431 // unblock signals (signals are blocked by iom.C 1430 // unblock signals (signals are blocked by iom.C
1432 sigset_t ss; 1431 sigset_t ss;
1433 sigemptyset (&ss); 1432 sigemptyset (&ss);
1434 sigprocmask (SIG_SETMASK, &ss, 0); 1433 sigprocmask (SIG_SETMASK, &ss, 0);
1435 1434
1436 /* command interpreter path */ 1435 /* command interpreter path */
1437 if (argv != NULL) 1436 if (argv)
1438 { 1437 {
1439# ifdef DEBUG_CMD 1438# ifdef DEBUG_CMD
1440 int i; 1439 int i;
1441 1440
1442 for (i = 0; argv[i]; i++) 1441 for (i = 0; argv[i]; i++)
… …
1451 const char *argv0, *shell; 1450 const char *argv0, *shell;
1452 1451
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1452 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1453 shell = "/bin/sh";
1455 1454
1456 argv0 = (const char *)rxvt_r_basename (shell); 1455 argv0 = (const char *)rxvt_basename (shell);
1457 1456
1458 if (OPTION (Opt_loginShell)) 1457 if (option (Opt_loginShell))
1459 { 1458 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1459 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1461 1460
1462 login[0] = '-'; 1461 login[0] = '-';
1463 strcpy (&login[1], argv0); 1462 strcpy (&login[1], argv0);
1464 argv0 = login; 1463 argv0 = login;
1465 } 1464 }
1466 1465
1467 execlp (shell, argv0, NULL); 1466 execlp (shell, argv0, (char *)0);
1468 /* no error message: STDERR is closed! */ 1467 /* no error message: STDERR is closed! */
1469 } 1468 }
1470 1469
1471 return -1; 1470 return -1;
1472} 1471}

Diff Legend

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