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.173 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57: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>
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
215 last_bot = last_state = -1; 302 last_bot = last_state = -1;
216 303
217 return true; 304 set_option (Opt_scrollBar);
305 set_option (Opt_scrollTtyOutput);
306 set_option (Opt_jumpScroll);
307 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52);
218} 313}
219 314
220void 315void
221rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
222{ 317{
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 325 {
231 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 328 }
234 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
235 { 330 {
236 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
237 close (i); 332 close (i);
238 } 333 }
239 334
… …
254/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
255const char ** 350const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 351rxvt_term::init_resources (int argc, const char *const *argv)
257{ 352{
258 int i, r_argc; 353 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 354 const char **cmd_argv, **r_argv;
261 355
262 /* 356 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 357 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 358 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 360 if (!strcmp (argv[r_argc], "-e"))
267 break; 361 break;
268 362
363 if (r_argc == argc)
364 cmd_argv = NULL;
365 else if (!argv[r_argc + 1])
366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
376
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 378
271 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
273 381
274 r_argv[i] = NULL; 382 r_argv[i] = NULL;
275 383
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]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
289 385
290 /* 386 /*
291 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
292 */ 388 */
293 389
… …
295 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
296 392
297 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
298 394
299 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 398 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
399 }
301 400
302 // using a local pointer decreases code size a lot 401 // using a local pointer decreases code size a lot
303 xa = display->xa; 402 xa = display->xa;
304 403
305 set (display); 404 set (display);
… …
308#if XFT 407#if XFT
309 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 410#endif
312 411
412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
416#endif
313 free (r_argv); 417 free (r_argv);
314 418
315 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 420 if (rs [i] == resval_undef)
317 rs [i] = 0; 421 rs [i] = 0;
… …
333 * set any defaults not already set 437 * set any defaults not already set
334 */ 438 */
335 if (cmd_argv && cmd_argv[0]) 439 if (cmd_argv && cmd_argv[0])
336 { 440 {
337 if (!rs[Rs_title]) 441 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 442 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 443 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 444 rs[Rs_iconName] = rs[Rs_title];
341 } 445 }
342 else 446 else
343 { 447 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 485 rs[Rs_cutchars] = CUTCHARS;
382 486
383#ifndef NO_BACKSPACE_KEY 487#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 488 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 489# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 490 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 491# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 492 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 493# 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 494#endif
398 495
399#ifndef NO_DELETE_KEY 496#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 497 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 498# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 499 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 500# else
404 key_delete = "\033[3~"; 501 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 502# endif
414 if (rs[Rs_answerbackstring]) 503#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 504
420#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 506 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 507#endif
423 508
424#ifdef XTERM_REVERSE_VIDEO 509#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 510 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 511 if (option (Opt_reverseVideo))
427 { 512 {
428 if (!rs[Rs_color + Color_fg]) 513 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 514 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 515
431 if (!rs[Rs_color + Color_bg]) 516 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 522 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 523 rs[Rs_color + i] = def_colorName[i];
439 524
440#ifndef XTERM_REVERSE_VIDEO 525#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 526 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 527 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 528 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 529#endif
445 530
446 /* convenient aliases for setting fg/bg to colors */ 531 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 532 color_aliases (Color_fg);
448 color_aliases (Color_bg); 533 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 540 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 542 color_aliases (Color_BD);
458 color_aliases (Color_UL); 543 color_aliases (Color_UL);
459 color_aliases (Color_RV); 544 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 546
462 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 549
465 return cmd_argv; 550 return cmd_argv;
… …
468/*----------------------------------------------------------------------*/ 553/*----------------------------------------------------------------------*/
469void 554void
470rxvt_term::init_env () 555rxvt_term::init_env ()
471{ 556{
472 int i; 557 int i;
473 unsigned int u;
474 char *val; 558 char *val;
475 559
476#ifdef DISPLAY_IS_IP 560#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 561 /* 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 562 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 570 */
487 val = rxvt_network_display (rs[Rs_display_name]); 571 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 572 rs[Rs_display_name] = (const char *)val;
489 573
490 if (val == NULL) 574 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 575#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 576 val = XDisplayString (dpy);
493 577
494 if (rs[Rs_display_name] == NULL) 578 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 579 rs[Rs_display_name] = val; /* use broken `:0' value */
496 580
497 i = strlen (val); 581 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 582 env_display = (char *)rxvt_malloc (i + 9);
499 583
500 sprintf (env_display, "DISPLAY=%s", val); 584 sprintf (env_display, "DISPLAY=%s", val);
501 585
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 586 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 587
… …
524 else 608 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 609 putenv ("COLORTERM=" COLORTERMENVFULL);
526 610
527 if (rs[Rs_term_name] != NULL) 611 if (rs[Rs_term_name] != NULL)
528 { 612 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 613 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 614 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 615 putenv (env_term);
532 } 616 }
533 else 617 else
534 putenv ("TERM=" TERMENV); 618 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 620#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 621 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 622 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 623 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 624 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 625#endif /* HAVE_UNSETENV */
542} 626}
543 627
544/*----------------------------------------------------------------------*/ 628/*----------------------------------------------------------------------*/
545/* 629/*
546 * This is more or less stolen straight from XFree86 xterm. 630 * This is more or less stolen straight from XFree86 xterm.
… …
567 651
568 this->locale = "C"; 652 this->locale = "C";
569 } 653 }
570 654
571 655
572 this->locale = rxvt_strdup (this->locale); 656 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 657 SET_LOCALE (this->locale);
574 mbstate.reset (); 658 mbstate.reset ();
575#endif 659#endif
576 660
577#if HAVE_NL_LANGINFO 661#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 705 * Initialize the command connection.
622 * This should be called after the X server connection is established. 706 * This should be called after the X server connection is established.
623 */ 707 */
624 708
625#ifdef META8_OPTION 709#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 710 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 711#endif
628 712
629 get_ourmods (); 713 get_ourmods ();
630 714
631 if (!OPTION (Opt_scrollTtyOutput)) 715 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 716 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 717 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 718 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 719 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 720 priv_modes |= PrivMode_smoothScroll;
637 721
638#ifndef NO_BACKSPACE_KEY 722#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 723 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 724 priv_modes |= PrivMode_HaveBackSpace;
641#endif 725#endif
642 726
643 /* add value for scrollBar */ 727 /* add value for scrollBar */
644 if (scrollBar.state) 728 if (scrollBar.state)
… …
657 int i; 741 int i;
658 742
659#ifdef OFF_FOCUS_FADING 743#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 744 pix_colors = pix_colors_focused;
661#endif 745#endif
662 746
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 747 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 748 {
665 const char *name = rs[Rs_color + i]; 749 const char *name = rs[Rs_color + i];
666 750
667 if (!name) 751 if (!name)
… …
670 rxvt_color xcol; 754 rxvt_color xcol;
671 755
672 if (!set_color (xcol, name)) 756 if (!set_color (xcol, name))
673 { 757 {
674#ifndef XTERM_REVERSE_VIDEO 758#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 759 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 760 name = def_colorName [1 - i];
677 else 761 else
678#endif 762#endif
679 name = def_colorName [i]; 763 name = def_colorName [i];
680 764
… …
745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 829 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746 cscroll.a) 830 cscroll.a)
747 )) 831 ))
748 alias_color (Color_topShadow, Color_White); 832 alias_color (Color_topShadow, Color_White);
749 } 833 }
750#endif /* KEEP_SCROLLCOLOR */ 834#endif /* KEEP_SCROLLCOLOR */
751 835
752#ifdef OFF_FOCUS_FADING 836#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 837 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 { 838 update_fade_color (i);
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif 839#endif
761} 840}
762 841
763/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 843/* color aliases, fg/bg bright-bold */
… …
768 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 847 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
769 { 848 {
770 int i = atoi (rs[Rs_color + idx]); 849 int i = atoi (rs[Rs_color + idx]);
771 850
772 if (i >= 8 && i <= 15) 851 if (i >= 8 && i <= 15)
773 { /* bright colors */ 852 /* bright colors */
774 i -= 8;
775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 853 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
776 return; 854 else if (i >= 0 && i <= 7)
777 } 855 /* normal colors */
778
779 if (i >= 0 && i <= 7) /* normal colors */
780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
781 } 857 }
782} 858}
783 859
784/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
… …
876rxvt_term::create_windows (int argc, const char *const *argv) 952rxvt_term::create_windows (int argc, const char *const *argv)
877{ 953{
878 XClassHint classHint; 954 XClassHint classHint;
879 XWMHints wmHint; 955 XWMHints wmHint;
880#if ENABLE_FRILLS 956#if ENABLE_FRILLS
881 MWMHints mwmhints; 957 MWMHints mwmhints = { };
882#endif 958#endif
883 XGCValues gcvalue; 959 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 960 XSetWindowAttributes attributes;
885 Window top, parent; 961 Window top, parent;
886 962
… …
892 if (!set_fonts ()) 968 if (!set_fonts ())
893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 969 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
894 970
895 parent = display->root; 971 parent = display->root;
896 972
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 973 attributes.override_redirect = !!option (Opt_override_redirect);
898 974
899#if ENABLE_FRILLS 975#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 976 if (option (Opt_borderLess))
901 { 977 {
902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 978 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 979 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 980 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
905 attributes.override_redirect = true; 981 attributes.override_redirect = true;
906 mwmhints.flags = 0;
907 } 982 }
908 else 983 else
909 { 984 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 985 mwmhints.flags = MWM_HINTS_DECORATIONS;
911 mwmhints.decorations = 0;
912 } 986 }
913 } 987 }
914 else
915 mwmhints.flags = 0;
916#endif 988#endif
917 989
918#if ENABLE_XEMBED 990#if ENABLE_XEMBED
919 if (rs[Rs_embed]) 991 if (rs[Rs_embed])
920 { 992 {
… …
955 classHint.res_name = (char *)rs[Rs_name]; 1027 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 1028 classHint.res_class = (char *)RESCLASS;
957 1029
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1030 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 1031 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1032 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 1033 wmHint.window_group = top;
962 1034
963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1035 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 1036 &szHint, &wmHint, &classHint);
965 1037
… …
1022 attributes.bit_gravity = NorthWestGravity; 1094 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1095 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1096
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1098
1027 if (OPTION (Opt_pointerBlank)) 1099 if (option (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1029 else 1101 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1103
1032 vt_select_input (); 1104 vt_select_input ();
1033 1105
1034 vt_ev.start (display, vt); 1106 vt_ev.start (display, vt);
1035
1036#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL
1038 && !OPTION (Opt_transparent))
1039 {
1040 const char *p = rs[Rs_backgroundPixmap];
1041
1042 if ((p = strchr (p, ';')) != NULL)
1043 {
1044 p++;
1045 scale_pixmap (p);
1046 }
1047
1048 set_bgPixmap (rs[Rs_backgroundPixmap]);
1049 scr_touch (true);
1050 }
1051#endif
1052 1107
1053 /* graphics context for the vt window */ 1108 /* graphics context for the vt window */
1054 gcvalue.foreground = pix_colors[Color_fg]; 1109 gcvalue.foreground = pix_colors[Color_fg];
1055 gcvalue.background = pix_colors[Color_bg]; 1110 gcvalue.background = pix_colors[Color_bg];
1056 gcvalue.graphics_exposures = 0; 1111 gcvalue.graphics_exposures = 0;
… …
1084 * GET TTY CURRENT STATE * 1139 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */ 1140 * ------------------------------------------------------------------------- */
1086void 1141void
1087rxvt_get_ttymode (ttymode_t *tio, int erase) 1142rxvt_get_ttymode (ttymode_t *tio, int erase)
1088{ 1143{
1089#ifdef HAVE_TERMIOS_H
1090 /* 1144 /*
1091 * standard System V termios interface 1145 * standard System V termios interface
1092 */ 1146 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1147 if (tcgetattr (STDIN_FILENO, tio) < 0)
1094 { 1148 {
1095 // return error - use system defaults, 1149 // return error - use system defaults,
1096 // where possible, and zero elsewhere 1150 // where possible, and zero elsewhere
1097 memset (tio, 0, sizeof (ttymode_t)); 1151 memset (tio, 0, sizeof (ttymode_t));
1098 1152
… …
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1215 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE) 1216# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE 1217 | ECHOCTL | ECHOKE
1164# endif 1218# endif
1165 | ECHOE | ECHOK); 1219 | ECHOE | ECHOK);
1166# else /* HAVE_TERMIOS_H */
1167
1168 /*
1169 * sgtty interface
1170 */
1171
1172 /* get parameters -- gtty */
1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1174 {
1175 tio->sg.sg_erase = CERASE; /* ^H */
1176 tio->sg.sg_kill = CKILL; /* ^U */
1177 }
1178
1179 if (erase != -1)
1180 tio->sg.sg_erase = (char)erase;
1181
1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1183
1184 /* get special characters */
1185 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1186 {
1187 tio->tc.t_intrc = CINTR; /* ^C */
1188 tio->tc.t_quitc = CQUIT; /* ^\ */
1189 tio->tc.t_startc = CSTART; /* ^Q */
1190 tio->tc.t_stopc = CSTOP; /* ^S */
1191 tio->tc.t_eofc = CEOF; /* ^D */
1192 tio->tc.t_brkc = -1;
1193 }
1194
1195 /* get local special chars */
1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1197 {
1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1200 tio->lc.t_rprntc = CRPRNT; /* ^R */
1201 tio->lc.t_flushc = CFLUSH; /* ^O */
1202 tio->lc.t_werasc = CWERASE; /* ^W */
1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1204 }
1205 /* get line discipline */
1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1207# ifdef NTTYDISC
1208 tio->line = NTTYDISC;
1209# endif /* NTTYDISC */
1210
1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1212#endif /* HAVE_TERMIOS_H */
1213 1220
1214 /* 1221 /*
1215 * Debugging 1222 * Debugging
1216 */ 1223 */
1217#ifdef DEBUG_TTYMODE 1224#ifdef DEBUG_TTYMODE
1218#ifdef HAVE_TERMIOS_H
1219 /* c_iflag bits */ 1225 /* c_iflag bits */
1220 fprintf (stderr, "Input flags\n"); 1226 fprintf (stderr, "Input flags\n");
1221 1227
1222 /* cpp token stringize doesn't work on all machines <sigh> */ 1228 /* cpp token stringize doesn't work on all machines <sigh> */
1223# define FOO(flag,name) \ 1229# define FOO(flag,name) \
… …
1286 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1287# endif 1293# endif
1288 1294
1289 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1290# undef FOO 1296# undef FOO
1291# endif /* HAVE_TERMIOS_H */ 1297#endif /* DEBUG_TTYMODE */
1292#endif /* DEBUG_TTYMODE */
1293} 1298}
1294 1299
1295/*----------------------------------------------------------------------*/ 1300/*----------------------------------------------------------------------*/
1296/* 1301/*
1297 * Run the command in a subprocess and return a file descriptor for the 1302 * Run the command in a subprocess and return a file descriptor for the
… …
1318 else 1323 else
1319#endif 1324#endif
1320 if (!pty->get ()) 1325 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1327
1328 int er;
1329
1330#ifndef NO_BACKSPACE_KEY
1331 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1332 er = rs[Rs_backspace_key][0];
1333 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1334 er = '\177'; /* the initial state anyway */
1335 else
1336#endif
1337 er = -1;
1338
1339 rxvt_get_ttymode (&tio, er);
1340 /* init terminal attributes */
1341 cfsetospeed (&tio, BAUDRATE);
1342 cfsetispeed (&tio, BAUDRATE);
1343 tcsetattr (pty->tty, TCSANOW, &tio);
1323 pty->set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1324 1345
1325 /* set initial window size */ 1346 /* set initial window size */
1326 tt_winch (); 1347 tt_winch ();
1327
1328 int er;
1329
1330#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0];
1333 else if (strcmp (key_backspace, "DEC") == 0)
1334 er = '\177'; /* the initial state anyway */
1335 else
1336#endif
1337 er = -1;
1338
1339 rxvt_get_ttymode (&tio, er);
1340 1348
1341#if ENABLE_FRILLS 1349#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1350 if (rs[Rs_pty_fd])
1343 return; 1351 return;
1344#endif 1352#endif
… …
1375 } 1383 }
1376 1384
1377 _exit (EXIT_FAILURE); 1385 _exit (EXIT_FAILURE);
1378 1386
1379 default: 1387 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1388 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1389 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1390
1383 pty->close_tty (); 1391 pty->close_tty ();
1384 1392
1385 child_ev.start (cmd_pid); 1393 child_ev.start (cmd_pid);
1386 1394
… …
1399int 1407int
1400rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1401{ 1409{
1402 char *login; 1410 char *login;
1403 1411
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1412 if (option (Opt_console))
1413 {
1407 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1415#ifdef TIOCCONS
1409 unsigned int on = 1; 1416 unsigned int on = 1;
1410 1417
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1412#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1414 1421
1415 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1416 if (fd >= 0) 1423 if (fd >= 0)
1417 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1418 close (fd); 1425 close (fd);
1419#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1420 } 1427 }
1421 1428
1422 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1423 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1424 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1431 */ 1438 */
1432#ifdef SIGTSTP 1439#ifdef SIGTSTP
1433 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1434 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1435 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1436#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1437 1444
1438 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1439 sigset_t ss; 1446 sigset_t ss;
1440 sigemptyset (&ss); 1447 sigemptyset (&ss);
1441 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);
1442 1449
1443 /* command interpreter path */ 1450 /* command interpreter path */
1444 if (argv != NULL) 1451 if (argv)
1445 { 1452 {
1446# ifdef DEBUG_CMD 1453# ifdef DEBUG_CMD
1447 int i; 1454 int i;
1448 1455
1449 for (i = 0; argv[i]; i++) 1456 for (i = 0; argv[i]; i++)
… …
1458 const char *argv0, *shell; 1465 const char *argv0, *shell;
1459 1466
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1467 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1468 shell = "/bin/sh";
1462 1469
1463 argv0 = (const char *)rxvt_r_basename (shell); 1470 argv0 = (const char *)rxvt_basename (shell);
1464 1471
1465 if (OPTION (Opt_loginShell)) 1472 if (option (Opt_loginShell))
1466 { 1473 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1474 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1468 1475
1469 login[0] = '-'; 1476 login[0] = '-';
1470 strcpy (&login[1], argv0); 1477 strcpy (&login[1], argv0);
1471 argv0 = login; 1478 argv0 = login;
1472 } 1479 }
1473 1480
1474 execlp (shell, argv0, NULL); 1481 execlp (shell, argv0, (char *)0);
1475 /* no error message: STDERR is closed! */ 1482 /* no error message: STDERR is closed! */
1476 } 1483 }
1477 1484
1478 return -1; 1485 return -1;
1479} 1486}

Diff Legend

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