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.172 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.263 by sf-exg, Thu Apr 1 00:12:33 2010 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-2008 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.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
179#ifndef USE_256_COLORS
74 // 88 xterm colours 180 // 88 xterm colours
75 "rgb:00/00/00", 181 "rgb:00/00/00",
76 "rgb:00/00/8b", 182 "rgb:00/00/8b",
77 "rgb:00/00/cd", 183 "rgb:00/00/cd",
78 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
147 496
148#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 503 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 510#if ENABLE_FRILLS
162 NULL, // Color_underline 511 NULL, // Color_underline
163#endif 512#endif
164#ifdef OPTION_HC 513#ifdef OPTION_HC
165 NULL, 514 NULL,
166#endif 515#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 516 COLOR_SCROLLBAR,
517#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 518 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 519#endif
171#if TINTING 520#if ENABLE_TRANSPARENCY
172 NULL, 521 NULL,
173#endif 522#endif
174#if OFF_FOCUS_FADING 523#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 524 "rgb:00/00/00",
176#endif 525#endif
177 }; 526 };
178 527
179bool 528void
180rxvt_term::init_vars () 529rxvt_term::init_vars ()
181{ 530{
182 pix_colors = // 531 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 532
192 MEvent.time = CurrentTime; 533 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 534 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 535 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 536 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 537 ncol = 80;
198 nrow = 24; 538 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 539 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 540 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 541 lineSpace = LINESPACE;
542 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 543 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 544
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 545 refresh_type = SLOW_REFRESH;
207 546
208 oldcursor.row = oldcursor.col = -1; 547 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 548
215 last_bot = last_state = -1; 549 set_option (Opt_scrollBar);
216 550 set_option (Opt_scrollTtyOutput);
217 return true; 551 set_option (Opt_jumpScroll);
552 set_option (Opt_skipScroll);
553 set_option (Opt_secondaryScreen);
554 set_option (Opt_secondaryScroll);
555 set_option (Opt_pastableTabs);
556 set_option (Opt_intensityStyles);
557 set_option (Opt_iso14755);
558 set_option (Opt_iso14755_52);
559 set_option (Opt_buffered);
218} 560}
219 561
220void 562static void
221rxvt_term::init_secondary () 563init_secondary ()
222{ 564{
223 int i; 565 int i;
224 566
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 567 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 568 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 569 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 570 }
234 else if (i > STDIN_FILENO) 571 else if (i != STDIN_FILENO)
235 { 572 {
236 dup2 (i, STDIN_FILENO); 573 dup2 (i, STDIN_FILENO);
237 close (i); 574 close (i);
238 } 575 }
239 576
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 577 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 578}
253 579
254/*----------------------------------------------------------------------*/ 580/*----------------------------------------------------------------------*/
255const char ** 581const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 582rxvt_term::init_resources (int argc, const char *const *argv)
257{ 583{
258 int i, r_argc; 584 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 585 const char **cmd_argv, **r_argv;
261 586
262 /* 587 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 588 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 589 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 590 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 591 if (!strcmp (argv[r_argc], "-e"))
267 break; 592 break;
268 593
594 if (r_argc == argc)
595 cmd_argv = NULL;
596 else if (!argv[r_argc + 1])
597 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
598 else
599 {
600 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
601
602 for (i = 0; i < argc - r_argc - 1; i++)
603 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
604
605 cmd_argv[i] = NULL;
606 }
607
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 608 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 609
271 for (i = 0; i < r_argc; i++) 610 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 611 r_argv[i] = (const char *)argv[i];
273 612
274 r_argv[i] = NULL; 613 r_argv[i] = NULL;
275 614
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]); 615 rs[Rs_name] = rxvt_basename (argv[0]);
289 616
290 /* 617 /*
291 * Open display, get options/resources and create the window 618 * Open display, get options/resources and create the window
292 */ 619 */
293 620
… …
295 rs[Rs_display_name] = ":0"; 622 rs[Rs_display_name] = ":0";
296 623
297 get_options (r_argc, r_argv); 624 get_options (r_argc, r_argv);
298 625
299 if (!(display = displays.get (rs[Rs_display_name]))) 626 if (!(display = displays.get (rs[Rs_display_name])))
627 {
628 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 629 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
630 }
301 631
302 // using a local pointer decreases code size a lot 632 // using a local pointer decreases code size a lot
303 xa = display->xa; 633 xa = display->xa;
304 634
635 set (display);
636 extract_resources ();
637
305#if XFT 638#if XFT
306 if (rs[Rs_depth]) 639 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 640 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 641#endif
310 set (display);
311
312 extract_resources ();
313 642
314 free (r_argv); 643 free (r_argv);
315 644
316 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
318 rs [i] = 0; 647 rs [i] = 0;
648
649#ifdef HAVE_AFTERIMAGE
650 set_application_name ((char *)rs[Rs_name]);
651 set_output_threshold (OUTPUT_LEVEL_WARNING);
652#endif
319 653
320#if ENABLE_PERL 654#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1]) 655 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default"; 656 rs[Rs_perl_ext_1] = "default";
323 657
… …
334 * set any defaults not already set 668 * set any defaults not already set
335 */ 669 */
336 if (cmd_argv && cmd_argv[0]) 670 if (cmd_argv && cmd_argv[0])
337 { 671 {
338 if (!rs[Rs_title]) 672 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 673 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
674
340 if (!rs[Rs_iconName]) 675 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 676 rs[Rs_iconName] = rs[Rs_title];
342 } 677 }
343 else 678 else
344 { 679 {
345 if (!rs[Rs_title]) 680 if (!rs[Rs_title])
346 rs[Rs_title] = rs[Rs_name]; 681 rs[Rs_title] = rs[Rs_name];
682
347 if (!rs[Rs_iconName]) 683 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_name]; 684 rs[Rs_iconName] = rs[Rs_name];
349 } 685 }
350 686
351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 687 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 694 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
360 696
361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
362 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
699
700 if (rs[Rs_letterSpace])
701 letterSpace = atoi (rs[Rs_letterSpace]);
363#endif 702#endif
364 703
365#ifdef POINTER_BLANK 704#ifdef POINTER_BLANK
366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 705 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
367 pointerBlankDelay = i; 706 pointerBlankDelay = i;
… …
371 710
372 /* no point having a scrollbar without having any scrollback! */ 711 /* no point having a scrollbar without having any scrollback! */
373 if (!saveLines) 712 if (!saveLines)
374 set_option (Opt_scrollBar, 0); 713 set_option (Opt_scrollBar, 0);
375 714
376#ifdef PRINTPIPE
377 if (!rs[Rs_print_pipe])
378 rs[Rs_print_pipe] = PRINTPIPE;
379#endif
380
381 if (!rs[Rs_cutchars]) 715 if (!rs[Rs_cutchars])
382 rs[Rs_cutchars] = CUTCHARS; 716 rs[Rs_cutchars] = CUTCHARS;
383 717
384#ifndef NO_BACKSPACE_KEY 718#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 719 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 720# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 721 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 722# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 723 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 724# endif
391 else
392 {
393 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val;
397 }
398#endif 725#endif
399 726
400#ifndef NO_DELETE_KEY 727#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 728 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 729# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 730 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 731# else
405 key_delete = "\033[3~"; 732 rs[Rs_delete_key] = "\033[3~";
406# endif
407 else
408 {
409 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val;
413 }
414#endif 733# endif
415 if (rs[Rs_answerbackstring])
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420
421#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 734#endif
735
736 scrollBar.setup (this);
424 737
425#ifdef XTERM_REVERSE_VIDEO 738#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 739 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 740 if (option (Opt_reverseVideo))
428 { 741 {
429 if (!rs[Rs_color + Color_fg]) 742 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 743 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 744
432 if (!rs[Rs_color + Color_bg]) 745 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 751 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 752 rs[Rs_color + i] = def_colorName[i];
440 753
441#ifndef XTERM_REVERSE_VIDEO 754#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 755 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 756 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 757 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 758#endif
446 759
447 /* convenient aliases for setting fg/bg to colors */ 760 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 761 color_aliases (Color_fg);
449 color_aliases (Color_bg); 762 color_aliases (Color_bg);
450#ifndef NO_CURSORCOLOR 763#ifndef NO_CURSORCOLOR
451 color_aliases (Color_cursor); 764 color_aliases (Color_cursor);
452 color_aliases (Color_cursor2); 765 color_aliases (Color_cursor2);
453#endif /* NO_CURSORCOLOR */ 766#endif /* NO_CURSORCOLOR */
454 color_aliases (Color_pointer_fg); 767 color_aliases (Color_pointer_fg);
455 color_aliases (Color_pointer_bg); 768 color_aliases (Color_pointer_bg);
456 color_aliases (Color_border); 769 color_aliases (Color_border);
457#ifndef NO_BOLD_UNDERLINE_REVERSE 770#ifndef NO_BOLD_UNDERLINE_REVERSE
458 color_aliases (Color_BD); 771 color_aliases (Color_BD);
459 color_aliases (Color_UL); 772 color_aliases (Color_UL);
460 color_aliases (Color_RV); 773 color_aliases (Color_RV);
461#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 774#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
462 775
463 if (!rs[Rs_color + Color_border]) 776 if (!rs[Rs_color + Color_border])
464 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 777 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
465 778
466 return cmd_argv; 779 return cmd_argv;
780}
781
782/*----------------------------------------------------------------------*/
783void
784rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
785{
786 this->envv = envv;
787
788 SET_R (this);
789 set_locale ("");
790 set_environ (envv); // a few things in X do not call setlocale :(
791
792 init_vars ();
793
794 init_secondary ();
795
796 const char **cmd_argv = init_resources (argc, argv);
797
798#ifdef KEYSYM_RESOURCE
799 keyboard->register_done ();
800#endif
801
802 if (const char *path = rs[Rs_chdir])
803 if (*path) // ignored if empty
804 {
805 if (*path != '/')
806 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
807
808 if (chdir (path))
809 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
810 }
811
812 if (option (Opt_scrollBar))
813 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
814
815 pty = ptytty::create ();
816
817 create_windows (argc, argv);
818
819 init_xlocale ();
820
821 scr_poweron (); // initialize screen
822
823#if 0
824 XSynchronize (dpy, True);
825#endif
826
827 if (option (Opt_scrollBar))
828 scrollBar.resize (); /* create and map scrollbar */
829#ifdef HAVE_BG_PIXMAP
830 {
831 bgPixmap.set_target (this);
832 bgPixmap.invalidate ();
833
834#ifdef ENABLE_TRANSPARENCY
835 if (option (Opt_transparent))
836 {
837 bgPixmap.set_transparent ();
838
839#ifdef HAVE_AFTERIMAGE
840 if (rs [Rs_blurradius])
841 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
842#endif
843 if (ISSET_PIXCOLOR (Color_tint))
844 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
845
846 if (rs [Rs_shade])
847 bgPixmap.set_shade (rs [Rs_shade]);
848
849 bgPixmap.set_root_pixmap ();
850 XSelectInput (dpy, display->root, PropertyChangeMask);
851 rootwin_ev.start (display, display->root);
852 }
853#endif
854
855#ifdef BG_IMAGE_FROM_FILE
856 if (rs[Rs_backgroundPixmap])
857 {
858 const char *p = rs[Rs_backgroundPixmap];
859
860 if ((p = strchr (p, ';')) != 0)
861 {
862 p++;
863 bgPixmap.set_geometry (p);
864 }
865 else
866 bgPixmap.set_defaultGeometry ();
867
868 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
869 if (!bgPixmap.window_position_sensitive ())
870 update_background ();
871 }
872#endif
873 }
874#endif
875
876#if ENABLE_PERL
877 rootwin_ev.start (display, display->root);
878#endif
879
880 set_colorfgbg ();
881
882 init_command (cmd_argv);
883
884 free (cmd_argv);
885
886 if (pty->pty >= 0)
887 pty_ev.start (pty->pty, ev::READ);
888
889 HOOK_INVOKE ((this, HOOK_START, DT_END));
890
891#if ENABLE_XEMBED
892 if (rs[Rs_embed])
893 {
894 long info[2] = { 0, XEMBED_MAPPED };
895
896 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
897 32, PropModeReplace, (unsigned char *)&info, 2);
898 }
899#endif
900
901 XMapWindow (dpy, vt);
902 XMapWindow (dpy, parent[0]);
903
904 refresh_check ();
467} 905}
468 906
469/*----------------------------------------------------------------------*/ 907/*----------------------------------------------------------------------*/
470void 908void
471rxvt_term::init_env () 909rxvt_term::init_env ()
472{ 910{
473 int i; 911 int i;
474 unsigned int u;
475 char *val; 912 char *val;
476 913
477#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 915 /* Fixup display_name for export over pty to any interested terminal
479 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 916 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
487 */ 924 */
488 val = rxvt_network_display (rs[Rs_display_name]); 925 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 926 rs[Rs_display_name] = (const char *)val;
490 927
491 if (val == NULL) 928 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 929#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (dpy); 930 val = XDisplayString (dpy);
494 931
495 if (rs[Rs_display_name] == NULL) 932 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 933 rs[Rs_display_name] = val; /* use broken `:0' value */
497 934
498 i = strlen (val); 935 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 936 env_display = (char *)rxvt_malloc (i + 9);
500 937
501 sprintf (env_display, "DISPLAY=%s", val); 938 sprintf (env_display, "DISPLAY=%s", val);
502 939
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 941
… …
525 else 962 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 963 putenv ("COLORTERM=" COLORTERMENVFULL);
527 964
528 if (rs[Rs_term_name] != NULL) 965 if (rs[Rs_term_name] != NULL)
529 { 966 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 967 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 968 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 969 putenv (env_term);
533 } 970 }
534 else 971 else
535 putenv ("TERM=" TERMENV); 972 putenv ("TERM=" TERMENV);
… …
537#ifdef HAVE_UNSETENV 974#ifdef HAVE_UNSETENV
538 /* avoid passing old settings and confusing term size */ 975 /* avoid passing old settings and confusing term size */
539 unsetenv ("LINES"); 976 unsetenv ("LINES");
540 unsetenv ("COLUMNS"); 977 unsetenv ("COLUMNS");
541 unsetenv ("TERMCAP"); /* terminfo should be okay */ 978 unsetenv ("TERMCAP"); /* terminfo should be okay */
542#endif /* HAVE_UNSETENV */ 979#endif /* HAVE_UNSETENV */
543} 980}
544 981
545/*----------------------------------------------------------------------*/ 982/*----------------------------------------------------------------------*/
546/* 983/*
547 * This is more or less stolen straight from XFree86 xterm. 984 * This is more or less stolen straight from XFree86 xterm.
… …
568 1005
569 this->locale = "C"; 1006 this->locale = "C";
570 } 1007 }
571 1008
572 1009
573 this->locale = rxvt_strdup (this->locale); 1010 this->locale = strdup (this->locale);
574 SET_LOCALE (this->locale); 1011 SET_LOCALE (this->locale);
575 mbstate.reset (); 1012 mbstate.reset ();
576#endif 1013#endif
577 1014
578#if HAVE_NL_LANGINFO 1015#if HAVE_NL_LANGINFO
… …
622 * Initialize the command connection. 1059 * Initialize the command connection.
623 * This should be called after the X server connection is established. 1060 * This should be called after the X server connection is established.
624 */ 1061 */
625 1062
626#ifdef META8_OPTION 1063#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1064 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 1065#endif
629 1066
630 get_ourmods (); 1067 get_ourmods ();
631 1068
632 if (!OPTION (Opt_scrollTtyOutput)) 1069 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 1070 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 1071 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 1072 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 1073 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 1074 priv_modes |= PrivMode_smoothScroll;
638 1075
639#ifndef NO_BACKSPACE_KEY 1076#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 1077 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 1078 priv_modes |= PrivMode_HaveBackSpace;
642#endif 1079#endif
643 1080
644 /* add value for scrollBar */ 1081 /* add value for scrollBar */
645 if (scrollBar.state) 1082 if (scrollBar.state)
… …
651 run_command (argv); 1088 run_command (argv);
652} 1089}
653 1090
654/*----------------------------------------------------------------------*/ 1091/*----------------------------------------------------------------------*/
655void 1092void
656rxvt_term::Get_Colours () 1093rxvt_term::get_colours ()
657{ 1094{
658 int i; 1095 int i;
659 1096
660#ifdef OFF_FOCUS_FADING 1097#ifdef OFF_FOCUS_FADING
661 pix_colors = pix_colors_focused; 1098 pix_colors = pix_colors_focused;
662#endif 1099#endif
663 1100
664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
665 { 1102 {
666 const char *name = rs[Rs_color + i]; 1103 const char *name = rs[Rs_color + i];
667 1104
668 if (!name) 1105 if (!name)
… …
671 rxvt_color xcol; 1108 rxvt_color xcol;
672 1109
673 if (!set_color (xcol, name)) 1110 if (!set_color (xcol, name))
674 { 1111 {
675#ifndef XTERM_REVERSE_VIDEO 1112#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 1113 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 1114 name = def_colorName [1 - i];
678 else 1115 else
679#endif 1116#endif
680 name = def_colorName [i]; 1117 name = def_colorName [i];
681 1118
… …
721 * get scrollBar shadow colors 1158 * get scrollBar shadow colors
722 * 1159 *
723 * The calculations of topShadow/bottomShadow values are adapted 1160 * The calculations of topShadow/bottomShadow values are adapted
724 * from the fvwm window manager. 1161 * from the fvwm window manager.
725 */ 1162 */
726#ifdef KEEP_SCROLLCOLOR 1163#ifdef RXVT_SCROLLBAR
727 if (depth <= 2) 1164 if (depth <= 2)
728 { 1165 {
729 /* Monochrome */ 1166 /* Monochrome */
730 alias_color (Color_scroll, Color_fg); 1167 alias_color (Color_scroll, Color_fg);
731 alias_color (Color_topShadow, Color_bg); 1168 alias_color (Color_topShadow, Color_bg);
… …
746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1183 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
747 cscroll.a) 1184 cscroll.a)
748 )) 1185 ))
749 alias_color (Color_topShadow, Color_White); 1186 alias_color (Color_topShadow, Color_White);
750 } 1187 }
751#endif /* KEEP_SCROLLCOLOR */ 1188#endif
752 1189
753#ifdef OFF_FOCUS_FADING 1190#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1191 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 1192 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 1193#endif
762} 1194}
763 1195
764/*----------------------------------------------------------------------*/ 1196/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 1197/* color aliases, fg/bg bright-bold */
… …
769 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1201 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
770 { 1202 {
771 int i = atoi (rs[Rs_color + idx]); 1203 int i = atoi (rs[Rs_color + idx]);
772 1204
773 if (i >= 8 && i <= 15) 1205 if (i >= 8 && i <= 15)
774 { /* bright colors */ 1206 /* bright colors */
775 i -= 8;
776 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1207 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
777 return; 1208 else if (i >= 0 && i <= 7)
778 } 1209 /* normal colors */
779
780 if (i >= 0 && i <= 7) /* normal colors */
781 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1210 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
782 } 1211 }
783} 1212}
784 1213
785/*----------------------------------------------------------------------*/ 1214/*----------------------------------------------------------------------*/
… …
877rxvt_term::create_windows (int argc, const char *const *argv) 1306rxvt_term::create_windows (int argc, const char *const *argv)
878{ 1307{
879 XClassHint classHint; 1308 XClassHint classHint;
880 XWMHints wmHint; 1309 XWMHints wmHint;
881#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
882 MWMHints mwmhints; 1311 MWMHints mwmhints = { };
883#endif 1312#endif
884 XGCValues gcvalue; 1313 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 1314 XSetWindowAttributes attributes;
886 Window top, parent; 1315 Window top, parent;
887 1316
888 dLocal (Display *, dpy); 1317 dLocal (Display *, dpy);
889 1318
890 /* grab colors before netscape does */ 1319 /* grab colors before netscape does */
891 Get_Colours (); 1320 get_colours ();
892 1321
893 if (!set_fonts ()) 1322 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1323 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 1324
896 parent = display->root; 1325 parent = display->root;
897 1326
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1327 attributes.override_redirect = !!option (Opt_override_redirect);
899 1328
900#if ENABLE_FRILLS 1329#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 1330 if (option (Opt_borderLess))
902 { 1331 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1332 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 1333 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1334 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 1335 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 1336 }
909 else 1337 else
910 { 1338 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 1339 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 1340 }
914 } 1341 }
915 else
916 mwmhints.flags = 0;
917#endif 1342#endif
918 1343
919#if ENABLE_XEMBED 1344#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 1345 if (rs[Rs_embed])
921 { 1346 {
… …
948 this->parent[0] = top; 1373 this->parent[0] = top;
949 1374
950 old_width = szHint.width; 1375 old_width = szHint.width;
951 old_height = szHint.height; 1376 old_height = szHint.height;
952 1377
953 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1378 set_title (rs [Rs_title]);
954 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1379 set_icon_name (rs [Rs_iconName]);
955 1380
956 classHint.res_name = (char *)rs[Rs_name]; 1381 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 1382 classHint.res_class = (char *)RESCLASS;
958 1383
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1384 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 1385 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1386 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 1387 wmHint.window_group = top;
963 1388
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1389 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 1390 &szHint, &wmHint, &classHint);
1391#if ENABLE_EWMH
1392# ifdef HAVE_AFTERIMAGE
1393 /*
1394 * set up icon hint
1395 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1396 */
1397
1398 if (rs [Rs_iconfile])
1399 {
1400 init_asv ();
1401
1402 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1403 if (asv && im)
1404 {
1405 int w = im->width;
1406 int h = im->height;
1407 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1408 ASImage *result = scale_asimage (asv, im,
1409 w, h, ASA_ARGB32,
1410 100, ASIMAGE_QUALITY_DEFAULT);
1411 destroy_asimage (&im);
1412
1413 if (buffer && result)
1414 {
1415 ARGB32 *asbuf = result->alt.argb32;
1416 buffer [0] = w;
1417 buffer [1] = h;
1418
1419 for (unsigned int i = 0; i < w * h; ++i)
1420 buffer [i + 2] = asbuf [i];
1421
1422 destroy_asimage (&result);
1423 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1424 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1425 free (buffer);
1426 }
1427 else
1428 {
1429 if (!buffer)
1430 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1431
1432 if (!result)
1433 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1434 }
1435 }
1436 else
1437 rxvt_warn ("Loading image icon failed, continuing without.\n");
1438 }
1439# endif
1440#endif
966 1441
967#if ENABLE_FRILLS 1442#if ENABLE_FRILLS
968 if (mwmhints.flags) 1443 if (mwmhints.flags)
969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1444 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1445 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1004 1479
1005 termwin_ev.start (display, top); 1480 termwin_ev.start (display, top);
1006 1481
1007 /* vt cursor: Black-on-White is standard, but this is more popular */ 1482 /* vt cursor: Black-on-White is standard, but this is more popular */
1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1009
1010#ifdef HAVE_SCROLLBARS
1011 /* cursor scrollBar: Black-on-White */
1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1013#endif
1014 1484
1015 /* the vt window */ 1485 /* the vt window */
1016 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1017 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1018 width, height, 1488 width, height,
… …
1023 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1494 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1495
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1496 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1497
1028 if (OPTION (Opt_pointerBlank)) 1498 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1499 vt_emask |= PointerMotionMask;
1030 else 1500 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1501 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1502
1033 vt_select_input (); 1503 vt_select_input ();
1034 1504
1035 vt_ev.start (display, vt); 1505 vt_ev.start (display, vt);
1036
1037#ifdef XPM_BACKGROUND
1038 if (rs[Rs_backgroundPixmap] != NULL
1039 && !OPTION (Opt_transparent))
1040 {
1041 const char *p = rs[Rs_backgroundPixmap];
1042
1043 if ((p = strchr (p, ';')) != NULL)
1044 {
1045 p++;
1046 scale_pixmap (p);
1047 }
1048
1049 set_bgPixmap (rs[Rs_backgroundPixmap]);
1050 scr_touch (true);
1051 }
1052#endif
1053 1506
1054 /* graphics context for the vt window */ 1507 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1508 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1509 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1510 gcvalue.graphics_exposures = 0;
… …
1060 GCForeground | GCBackground | GCGraphicsExposures, 1513 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1514 &gcvalue);
1062 1515
1063 drawable = new rxvt_drawable (this, vt); 1516 drawable = new rxvt_drawable (this, vt);
1064 1517
1065#ifdef RXVT_SCROLLBAR
1066 gcvalue.foreground = pix_colors[Color_topShadow];
1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072#endif
1073
1074#ifdef OFF_FOCUS_FADING 1518#ifdef OFF_FOCUS_FADING
1075 // initially we are in unfocused state 1519 // initially we are in unfocused state
1076 if (rs[Rs_fade]) 1520 if (rs[Rs_fade])
1077 pix_colors = pix_colors_unfocused; 1521 pix_colors = pix_colors_unfocused;
1078#endif 1522#endif
… …
1083 1527
1084/* ------------------------------------------------------------------------- * 1528/* ------------------------------------------------------------------------- *
1085 * GET TTY CURRENT STATE * 1529 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1530 * ------------------------------------------------------------------------- */
1087void 1531void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1532rxvt_get_ttymode (struct termios *tio, int erase)
1089{ 1533{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1534 /*
1092 * standard System V termios interface 1535 * standard System V termios interface
1093 */ 1536 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1537 if (tcgetattr (STDIN_FILENO, tio) < 0)
1095 { 1538 {
1096 // return error - use system defaults, 1539 // return error - use system defaults,
1097 // where possible, and zero elsewhere 1540 // where possible, and zero elsewhere
1098 memset (tio, 0, sizeof (ttymode_t)); 1541 memset (tio, 0, sizeof (struct termios));
1099 1542
1100 tio->c_cc[VINTR] = CINTR; 1543 tio->c_cc[VINTR] = CINTR;
1101 tio->c_cc[VQUIT] = CQUIT; 1544 tio->c_cc[VQUIT] = CQUIT;
1102 tio->c_cc[VERASE] = CERASE; 1545 tio->c_cc[VERASE] = CERASE;
1103#ifdef VERASE2 1546#ifdef VERASE2
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1605 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1606# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1607 | ECHOCTL | ECHOKE
1165# endif 1608# endif
1166 | ECHOE | ECHOK); 1609 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214 1610
1215 /* 1611 /*
1216 * Debugging 1612 * Debugging
1217 */ 1613 */
1218#ifdef DEBUG_TTYMODE 1614#ifdef DEBUG_TTYMODE
1219#ifdef HAVE_TERMIOS_H
1220 /* c_iflag bits */ 1615 /* c_iflag bits */
1221 fprintf (stderr, "Input flags\n"); 1616 fprintf (stderr, "Input flags\n");
1222 1617
1223 /* cpp token stringize doesn't work on all machines <sigh> */ 1618 /* cpp token stringize doesn't work on all machines <sigh> */
1224# define FOO(flag,name) \ 1619# define FOO(flag,name) \
… …
1287 FOO (VLNEXT, "VLNEXT"); 1682 FOO (VLNEXT, "VLNEXT");
1288# endif 1683# endif
1289 1684
1290 fprintf (stderr, "\n"); 1685 fprintf (stderr, "\n");
1291# undef FOO 1686# undef FOO
1292# endif /* HAVE_TERMIOS_H */ 1687#endif /* DEBUG_TTYMODE */
1293#endif /* DEBUG_TTYMODE */
1294} 1688}
1295 1689
1296/*----------------------------------------------------------------------*/ 1690/*----------------------------------------------------------------------*/
1297/* 1691/*
1298 * Run the command in a subprocess and return a file descriptor for the 1692 * Run the command in a subprocess and return a file descriptor for the
… …
1319 else 1713 else
1320#endif 1714#endif
1321 if (!pty->get ()) 1715 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1716 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1717
1718 int er;
1719
1720#ifndef NO_BACKSPACE_KEY
1721 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1722 er = rs[Rs_backspace_key][0];
1723 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1724 er = '\177'; /* the initial state anyway */
1725 else
1726#endif
1727 er = -1;
1728
1729 rxvt_get_ttymode (&tio, er);
1730 /* init terminal attributes */
1731 cfsetospeed (&tio, BAUDRATE);
1732 cfsetispeed (&tio, BAUDRATE);
1733 tcsetattr (pty->tty, TCSANOW, &tio);
1324 pty->set_utf8_mode (enc_utf8); 1734 pty->set_utf8_mode (enc_utf8);
1325 1735
1326 /* set initial window size */ 1736 /* set initial window size */
1327 tt_winch (); 1737 tt_winch ();
1328
1329 int er;
1330
1331#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0];
1334 else if (strcmp (key_backspace, "DEC") == 0)
1335 er = '\177'; /* the initial state anyway */
1336 else
1337#endif
1338 er = -1;
1339
1340 rxvt_get_ttymode (&tio, er);
1341 1738
1342#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1740 if (rs[Rs_pty_fd])
1344 return; 1741 return;
1345#endif 1742#endif
… …
1376 } 1773 }
1377 1774
1378 _exit (EXIT_FAILURE); 1775 _exit (EXIT_FAILURE);
1379 1776
1380 default: 1777 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1778 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1779 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1780
1384 pty->close_tty (); 1781 pty->close_tty ();
1385 1782
1386 child_ev.start (cmd_pid); 1783 child_ev.start (cmd_pid);
1387 1784
… …
1400int 1797int
1401rxvt_term::run_child (const char *const *argv) 1798rxvt_term::run_child (const char *const *argv)
1402{ 1799{
1403 char *login; 1800 char *login;
1404 1801
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1802 if (option (Opt_console))
1803 {
1408 { /* be virtual console, fail silently */ 1804 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1805#ifdef TIOCCONS
1410 unsigned int on = 1; 1806 unsigned int on = 1;
1411 1807
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1808 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1809#elif defined (SRIOCSREDIR)
… …
1415 1811
1416 fd = open (CONSOLE, O_WRONLY, 0); 1812 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1813 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1814 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419 close (fd); 1815 close (fd);
1420#endif /* SRIOCSREDIR */ 1816#endif /* SRIOCSREDIR */
1421 } 1817 }
1422 1818
1423 /* reset signals and spin off the command interpreter */ 1819 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1820 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1821 signal (SIGQUIT, SIG_DFL);
… …
1432 */ 1828 */
1433#ifdef SIGTSTP 1829#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1830 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1831 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1832 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1833#endif /* SIGTSTP */
1438
1439 // unblock signals (signals are blocked by iom.C
1440 sigset_t ss;
1441 sigemptyset (&ss);
1442 sigprocmask (SIG_SETMASK, &ss, 0);
1443 1834
1444 /* command interpreter path */ 1835 /* command interpreter path */
1445 if (argv != NULL) 1836 if (argv)
1446 { 1837 {
1447# ifdef DEBUG_CMD 1838# ifdef DEBUG_CMD
1448 int i; 1839 int i;
1449 1840
1450 for (i = 0; argv[i]; i++) 1841 for (i = 0; argv[i]; i++)
… …
1459 const char *argv0, *shell; 1850 const char *argv0, *shell;
1460 1851
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1852 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1853 shell = "/bin/sh";
1463 1854
1464 argv0 = (const char *)rxvt_r_basename (shell); 1855 argv0 = rxvt_basename (shell);
1465 1856
1466 if (OPTION (Opt_loginShell)) 1857 if (option (Opt_loginShell))
1467 { 1858 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1859 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1860
1470 login[0] = '-'; 1861 login[0] = '-';
1471 strcpy (&login[1], argv0); 1862 strcpy (&login[1], argv0);
1472 argv0 = login; 1863 argv0 = login;
1473 } 1864 }
1474 1865
1475 execlp (shell, argv0, NULL); 1866 execlp (shell, argv0, (char *)0);
1476 /* no error message: STDERR is closed! */ 1867 /* no error message: STDERR is closed! */
1477 } 1868 }
1478 1869
1479 return -1; 1870 return -1;
1480} 1871}

Diff Legend

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