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.198 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.298 by sf-exg, Fri Aug 19 17:42:09 2011 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 <schmorp@schmorp.de>
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>
42 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
147
43const char *const def_colorName[] = 148static const 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)
… …
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (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#if !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,
515 NULL,
166#endif 516#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 520#endif
171#if TINTING 521#if ENABLE_TRANSPARENCY
172 NULL, 522 NULL,
173#endif 523#endif
174#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 525 "rgb:00/00/00",
176#endif 526#endif
177 }; 527 };
178 528
179bool 529void
180rxvt_term::init_vars () 530rxvt_term::init_vars ()
181{ 531{
182 pix_colors = // 532 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 533
189 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
191 want_refresh = 1; 536 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 538 ncol = 80;
194 nrow = 24; 539 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 544 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 545
201 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
202 547
203 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
204#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
205#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1;
214 549
215 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
223 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
224 560 set_option (Opt_buffered);
225 return true;
226}
227
228void
229rxvt_term::init_secondary ()
230{
231 int i;
232
233 /*
234 * Close all unused file descriptors
235 * We don't want them, we don't need them.
236 */
237 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 {
239 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO);
241 }
242 else if (i > STDIN_FILENO)
243 {
244 dup2 (i, STDIN_FILENO);
245 close (i);
246 }
247
248 dup2 (STDERR_FILENO, STDOUT_FILENO);
249
250#if 0 // schmorp sayz closing filies is murder
251 for (i = STDERR_FILENO + 1; i < num_fds; i++)
252 {
253#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
254 if (i == 4 || i == 7)
255 continue;
256#endif
257 close (i);
258 }
259#endif
260} 561}
261 562
262/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
263const char ** 564const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
265{ 566{
266 int i, r_argc; 567 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
269 569
270 /* 570 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args 571 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */ 572 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
275 break; 575 break;
276 576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 592
279 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
281 595
282 r_argv[i] = NULL; 596 r_argv[i] = NULL;
283 597
284 if (r_argc == argc)
285 cmd_argv = NULL;
286 else
287 {
288 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
289
290 for (i = 0; i < argc - r_argc - 1; i++)
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292
293 cmd_argv[i] = NULL;
294 }
295
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
297 599
298 /* 600 /*
299 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
300 */ 602 */
301 603
… …
303 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
304 606
305 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
306 608
307 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
309 614
310 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
311 xa = display->xa; 616 xa = display->xa;
312 617
313 set (display); 618 set (display);
… …
316#if XFT 621#if XFT
317 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 624#endif
320 625
321#ifdef HAVE_AFTERIMAGE
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif
324 free (r_argv); 626 free (r_argv);
325 627
326 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
327 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
328 rs [i] = 0; 630 rs [i] = 0;
… …
344 * set any defaults not already set 646 * set any defaults not already set
345 */ 647 */
346 if (cmd_argv && cmd_argv[0]) 648 if (cmd_argv && cmd_argv[0])
347 { 649 {
348 if (!rs[Rs_title]) 650 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 651 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
652
350 if (!rs[Rs_iconName]) 653 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 654 rs[Rs_iconName] = rs[Rs_title];
352 } 655 }
353 else 656 else
354 { 657 {
355 if (!rs[Rs_title]) 658 if (!rs[Rs_title])
356 rs[Rs_title] = rs[Rs_name]; 659 rs[Rs_title] = rs[Rs_name];
660
357 if (!rs[Rs_iconName]) 661 if (!rs[Rs_iconName])
358 rs[Rs_iconName] = rs[Rs_name]; 662 rs[Rs_iconName] = rs[Rs_name];
359 } 663 }
360 664
361 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 665 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
368 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 672 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
369 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 673 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
370 674
371 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 675 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
372 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 676 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
677
678 if (rs[Rs_letterSpace])
679 letterSpace = atoi (rs[Rs_letterSpace]);
373#endif 680#endif
374 681
375#ifdef POINTER_BLANK 682#ifdef POINTER_BLANK
376 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
377 pointerBlankDelay = i; 684 pointerBlankDelay = i;
… …
381 688
382 /* no point having a scrollbar without having any scrollback! */ 689 /* no point having a scrollbar without having any scrollback! */
383 if (!saveLines) 690 if (!saveLines)
384 set_option (Opt_scrollBar, 0); 691 set_option (Opt_scrollBar, 0);
385 692
386#ifdef PRINTPIPE
387 if (!rs[Rs_print_pipe])
388 rs[Rs_print_pipe] = PRINTPIPE;
389#endif
390
391 if (!rs[Rs_cutchars]) 693 if (!rs[Rs_cutchars])
392 rs[Rs_cutchars] = CUTCHARS; 694 rs[Rs_cutchars] = CUTCHARS;
393 695
394#ifndef NO_BACKSPACE_KEY 696#ifndef NO_BACKSPACE_KEY
395 if (!rs[Rs_backspace_key]) 697 if (!rs[Rs_backspace_key])
396# ifdef DEFAULT_BACKSPACE 698# ifdef DEFAULT_BACKSPACE
397 key_backspace = DEFAULT_BACKSPACE; 699 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
398# else 700# else
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 701 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
400# endif 702# endif
401 else
402 {
403 val = strdup (rs[Rs_backspace_key]);
404 rxvt_Str_trim (val);
405 rxvt_Str_escaped (val);
406 key_backspace = val;
407 }
408#endif 703#endif
409 704
410#ifndef NO_DELETE_KEY 705#ifndef NO_DELETE_KEY
411 if (!rs[Rs_delete_key]) 706 if (!rs[Rs_delete_key])
412# ifdef DEFAULT_DELETE 707# ifdef DEFAULT_DELETE
413 key_delete = DEFAULT_DELETE; 708 rs[Rs_delete_key] = DEFAULT_DELETE;
414# else 709# else
415 key_delete = "\033[3~"; 710 rs[Rs_delete_key] = "\033[3~";
416# endif 711# endif
417 else
418 {
419 val = strdup (rs[Rs_delete_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_delete = val;
423 }
424#endif 712#endif
425 if (rs[Rs_answerbackstring])
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430 713
431#ifdef HAVE_SCROLLBARS 714 scrollBar.setup (this);
432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
433#endif
434 715
435#ifdef XTERM_REVERSE_VIDEO 716#ifdef XTERM_REVERSE_VIDEO
436 /* this is how xterm implements reverseVideo */ 717 /* this is how xterm implements reverseVideo */
437 if (option (Opt_reverseVideo)) 718 if (option (Opt_reverseVideo))
438 { 719 {
… …
458 color_aliases (Color_fg); 739 color_aliases (Color_fg);
459 color_aliases (Color_bg); 740 color_aliases (Color_bg);
460#ifndef NO_CURSORCOLOR 741#ifndef NO_CURSORCOLOR
461 color_aliases (Color_cursor); 742 color_aliases (Color_cursor);
462 color_aliases (Color_cursor2); 743 color_aliases (Color_cursor2);
463#endif /* NO_CURSORCOLOR */ 744#endif /* NO_CURSORCOLOR */
464 color_aliases (Color_pointer_fg); 745 color_aliases (Color_pointer_fg);
465 color_aliases (Color_pointer_bg); 746 color_aliases (Color_pointer_bg);
466 color_aliases (Color_border); 747 color_aliases (Color_border);
467#ifndef NO_BOLD_UNDERLINE_REVERSE 748#ifndef NO_BOLD_UNDERLINE_REVERSE
468 color_aliases (Color_BD); 749 color_aliases (Color_BD);
469 color_aliases (Color_UL); 750 color_aliases (Color_UL);
470 color_aliases (Color_RV); 751 color_aliases (Color_RV);
471#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 752#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
472 753
473 if (!rs[Rs_color + Color_border]) 754 if (!rs[Rs_color + Color_border])
474 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 755 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
475 756
476 return cmd_argv; 757 return cmd_argv;
758}
759
760/*----------------------------------------------------------------------*/
761void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
763{
764 this->envv = envv;
765
766 SET_R (this);
767 set_locale ("");
768 set_environ (envv); // a few things in X do not call setlocale :(
769
770 init_vars ();
771
772 const char **cmd_argv = init_resources (argc, argv);
773
774#ifdef KEYSYM_RESOURCE
775 keyboard->register_done ();
776#endif
777
778 if (const char *path = rs[Rs_chdir])
779 if (*path) // ignored if empty
780 {
781 if (*path != '/')
782 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
783
784 if (chdir (path))
785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
786 }
787
788 if (option (Opt_scrollBar))
789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
790
791 pty = ptytty::create ();
792
793 create_windows (argc, argv);
794
795 init_xlocale ();
796
797 scr_poweron (); // initialize screen
798
799#if 0
800 XSynchronize (dpy, True);
801#endif
802
803 if (option (Opt_scrollBar))
804 scrollBar.resize (); /* create and map scrollbar */
805#ifdef HAVE_BG_PIXMAP
806 {
807 bg_init ();
808
809#ifdef ENABLE_TRANSPARENCY
810 if (option (Opt_transparent))
811 {
812 bg_set_transparent ();
813
814 if (rs [Rs_blurradius])
815 bg_set_blur (rs [Rs_blurradius]);
816
817 if (ISSET_PIXCOLOR (Color_tint))
818 bg_set_tint (pix_colors_focused [Color_tint]);
819
820 if (rs [Rs_shade])
821 bg_set_shade (rs [Rs_shade]);
822
823 bg_set_root_pixmap ();
824 XSelectInput (dpy, display->root, PropertyChangeMask);
825 rootwin_ev.start (display, display->root);
826 }
827#endif
828
829#ifdef BG_IMAGE_FROM_FILE
830 if (rs[Rs_backgroundPixmap])
831 {
832 if (bg_set_file (rs[Rs_backgroundPixmap]))
833 if (!bg_window_position_sensitive ())
834 update_background ();
835 }
836#endif
837 }
838#endif
839
840#if ENABLE_PERL
841 rootwin_ev.start (display, display->root);
842#endif
843
844 set_colorfgbg ();
845
846 init_command (cmd_argv);
847
848 free (cmd_argv);
849
850 if (pty->pty >= 0)
851 pty_ev.start (pty->pty, ev::READ);
852
853 HOOK_INVOKE ((this, HOOK_START, DT_END));
854
855#if ENABLE_XEMBED
856 if (rs[Rs_embed])
857 {
858 long info[2] = { 0, XEMBED_MAPPED };
859
860 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
861 32, PropModeReplace, (unsigned char *)&info, 2);
862 }
863#endif
864
865 XMapWindow (dpy, vt);
866 XMapWindow (dpy, parent);
867
868 refresh_check ();
477} 869}
478 870
479/*----------------------------------------------------------------------*/ 871/*----------------------------------------------------------------------*/
480void 872void
481rxvt_term::init_env () 873rxvt_term::init_env ()
482{ 874{
483 int i;
484 unsigned int u;
485 char *val; 875 char *val;
486 876
487#ifdef DISPLAY_IS_IP 877#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 878 /* Fixup display_name for export over pty to any interested terminal
489 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 879 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
497 */ 887 */
498 val = rxvt_network_display (rs[Rs_display_name]); 888 val = rxvt_network_display (rs[Rs_display_name]);
499 rs[Rs_display_name] = (const char *)val; 889 rs[Rs_display_name] = (const char *)val;
500 890
501 if (val == NULL) 891 if (val == NULL)
502#endif /* DISPLAY_IS_IP */ 892#endif /* DISPLAY_IS_IP */
503 val = XDisplayString (dpy); 893 val = XDisplayString (dpy);
504 894
505 if (rs[Rs_display_name] == NULL) 895 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 896 rs[Rs_display_name] = val; /* use broken `:0' value */
507 897
508 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 898 env_display = (char *)rxvt_malloc (strlen (val) + 9);
510 899
511 sprintf (env_display, "DISPLAY=%s", val); 900 sprintf (env_display, "DISPLAY=%s", val);
512 901
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 902 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
514 903
515 /* add entries to the environment: 904 /* add entries to the environment:
516 * @ DISPLAY: in case we started with -display 905 * @ DISPLAY: in case we started with -display
517 * @ WINDOWID: X window id number of the window 906 * @ WINDOWID: X window id number of the window
518 * @ COLORTERM: terminal sub-name and also indicates its color 907 * @ COLORTERM: terminal sub-name and also indicates its color
… …
535 else 924 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 925 putenv ("COLORTERM=" COLORTERMENVFULL);
537 926
538 if (rs[Rs_term_name] != NULL) 927 if (rs[Rs_term_name] != NULL)
539 { 928 {
540 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 929 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 930 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 931 putenv (env_term);
543 } 932 }
544 else 933 else
545 putenv ("TERM=" TERMENV); 934 putenv ("TERM=" TERMENV);
… …
547#ifdef HAVE_UNSETENV 936#ifdef HAVE_UNSETENV
548 /* avoid passing old settings and confusing term size */ 937 /* avoid passing old settings and confusing term size */
549 unsetenv ("LINES"); 938 unsetenv ("LINES");
550 unsetenv ("COLUMNS"); 939 unsetenv ("COLUMNS");
551 unsetenv ("TERMCAP"); /* terminfo should be okay */ 940 unsetenv ("TERMCAP"); /* terminfo should be okay */
552#endif /* HAVE_UNSETENV */ 941#endif /* HAVE_UNSETENV */
553} 942}
554 943
555/*----------------------------------------------------------------------*/ 944/*----------------------------------------------------------------------*/
556/* 945/*
557 * This is more or less stolen straight from XFree86 xterm. 946 * This is more or less stolen straight from XFree86 xterm.
… …
578 967
579 this->locale = "C"; 968 this->locale = "C";
580 } 969 }
581 970
582 971
583 this->locale = rxvt_strdup (this->locale); 972 this->locale = strdup (this->locale);
584 SET_LOCALE (this->locale); 973 SET_LOCALE (this->locale);
585 mbstate.reset (); 974 mbstate.reset ();
586#endif 975#endif
587 976
588#if HAVE_NL_LANGINFO 977#if HAVE_NL_LANGINFO
… …
645 priv_modes |= PrivMode_Keypress; 1034 priv_modes |= PrivMode_Keypress;
646 if (!option (Opt_jumpScroll)) 1035 if (!option (Opt_jumpScroll))
647 priv_modes |= PrivMode_smoothScroll; 1036 priv_modes |= PrivMode_smoothScroll;
648 1037
649#ifndef NO_BACKSPACE_KEY 1038#ifndef NO_BACKSPACE_KEY
650 if (strcmp (key_backspace, "DEC") == 0) 1039 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
651 priv_modes |= PrivMode_HaveBackSpace; 1040 priv_modes |= PrivMode_HaveBackSpace;
652#endif 1041#endif
653 1042
654 /* add value for scrollBar */ 1043 /* add value for scrollBar */
655 if (scrollBar.state) 1044 if (scrollBar.state)
… …
661 run_command (argv); 1050 run_command (argv);
662} 1051}
663 1052
664/*----------------------------------------------------------------------*/ 1053/*----------------------------------------------------------------------*/
665void 1054void
666rxvt_term::Get_Colours () 1055rxvt_term::get_colours ()
667{ 1056{
668 int i; 1057 int i;
669 1058
670#ifdef OFF_FOCUS_FADING 1059#ifdef OFF_FOCUS_FADING
671 pix_colors = pix_colors_focused; 1060 pix_colors = pix_colors_focused;
672#endif 1061#endif
673 1062
674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1063 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
675 { 1064 {
676 const char *name = rs[Rs_color + i]; 1065 const char *name = rs[Rs_color + i];
677 1066
678 if (!name) 1067 if (!name)
… …
731 * get scrollBar shadow colors 1120 * get scrollBar shadow colors
732 * 1121 *
733 * The calculations of topShadow/bottomShadow values are adapted 1122 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 1123 * from the fvwm window manager.
735 */ 1124 */
736#ifdef KEEP_SCROLLCOLOR 1125#ifdef RXVT_SCROLLBAR
737 if (depth <= 2) 1126 if (depth <= 2)
738 { 1127 {
739 /* Monochrome */ 1128 /* Monochrome */
740 alias_color (Color_scroll, Color_fg); 1129 alias_color (Color_scroll, Color_fg);
741 alias_color (Color_topShadow, Color_bg); 1130 alias_color (Color_topShadow, Color_bg);
… …
756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1145 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 cscroll.a) 1146 cscroll.a)
758 )) 1147 ))
759 alias_color (Color_topShadow, Color_White); 1148 alias_color (Color_topShadow, Color_White);
760 } 1149 }
761#endif /* KEEP_SCROLLCOLOR */ 1150#endif
762 1151
763#ifdef OFF_FOCUS_FADING 1152#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1153 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i); 1154 update_fade_color (i);
766#endif 1155#endif
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 1164 {
776 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
777 1166
778 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
779 { /* bright colors */ 1168 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1169 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 1170 else if (i >= 0 && i <= 7)
783 } 1171 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1172 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 1173 }
788} 1174}
789 1175
790/*----------------------------------------------------------------------*/ 1176/*----------------------------------------------------------------------*/
… …
874 1260
875 if (i) 1261 if (i)
876 ModMetaMask = modmasks[i - 1]; 1262 ModMetaMask = modmasks[i - 1];
877} 1263}
878 1264
1265void
1266rxvt_term::set_icon (const char *file)
1267{
1268#ifdef HAVE_AFTERIMAGE
1269 init_asv ();
1270
1271 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1272 if (!im)
1273 {
1274 rxvt_warn ("Loading image icon failed, continuing without.\n");
1275 return;
1276 }
1277
1278 unsigned int w = im->width;
1279 unsigned int h = im->height;
1280
1281 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1282 {
1283 rxvt_warn ("Icon image too big, continuing without.\n");
1284 destroy_asimage (&im);
1285 return;
1286 }
1287
1288 ASImage *result = scale_asimage (asv, im,
1289 w, h, ASA_ARGB32,
1290 100, ASIMAGE_QUALITY_DEFAULT);
1291 destroy_asimage (&im);
1292
1293 if (!result)
1294 {
1295 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1296 return;
1297 }
1298
1299 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1300 if (buffer)
1301 {
1302 ARGB32 *asbuf = result->alt.argb32;
1303 buffer [0] = w;
1304 buffer [1] = h;
1305
1306 for (unsigned int i = 0; i < w * h; ++i)
1307 buffer [i + 2] = asbuf [i];
1308
1309 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1310 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1311 free (buffer);
1312 }
1313 else
1314 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1315
1316 destroy_asimage (&result);
1317#endif
1318
1319#ifdef HAVE_PIXBUF
1320 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1321 if (!pixbuf)
1322 {
1323 rxvt_warn ("Loading image icon failed, continuing without.\n");
1324 return;
1325 }
1326
1327 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1328 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1329
1330 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1331 {
1332 rxvt_warn ("Icon image too big, continuing without.\n");
1333 g_object_unref (pixbuf);
1334 return;
1335 }
1336
1337 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1338 {
1339 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1340 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1342
1343 buffer [0] = w;
1344 buffer [1] = h;
1345 for (int i = 0; i < h; i++)
1346 {
1347 for (int j = 0; j < w; j++)
1348 {
1349 unsigned char *pixel = row + j * channels;
1350 long value;
1351
1352 if (channels == 4)
1353 value = pixel[3];
1354 else
1355 value = (unsigned char)0x00ff;
1356
1357 value = (value << 8) + pixel[0];
1358 value = (value << 8) + pixel[1];
1359 value = (value << 8) + pixel[2];
1360 buffer[(i * w + j) + 2] = value;
1361 }
1362
1363 row += rowstride;
1364 }
1365
1366 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1367 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1368 free (buffer);
1369 }
1370 else
1371 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1372
1373 g_object_unref (pixbuf);
1374#endif
1375}
1376
879/*----------------------------------------------------------------------*/ 1377/*----------------------------------------------------------------------*/
880/* rxvt_Create_Windows () - Open and map the window */ 1378/* Open and map the window */
881void 1379void
882rxvt_term::create_windows (int argc, const char *const *argv) 1380rxvt_term::create_windows (int argc, const char *const *argv)
883{ 1381{
884 XClassHint classHint; 1382 XClassHint classHint;
885 XWMHints wmHint; 1383 XWMHints wmHint;
… …
891 Window top, parent; 1389 Window top, parent;
892 1390
893 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
894 1392
895 /* grab colors before netscape does */ 1393 /* grab colors before netscape does */
896 Get_Colours (); 1394 get_colours ();
897 1395
898 if (!set_fonts ()) 1396 if (!set_fonts ())
899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1397 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
900 1398
901 parent = display->root; 1399 parent = display->root;
… …
905#if ENABLE_FRILLS 1403#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 1404 if (option (Opt_borderLess))
907 { 1405 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1406 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 1407 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1408 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 1409 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 1410 }
914 else 1411 else
915 { 1412 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 1413 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 1414 }
919 } 1415 }
920 else
921 mwmhints.flags = 0;
922#endif 1416#endif
923 1417
924#if ENABLE_XEMBED 1418#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 1419 if (rs[Rs_embed])
926 { 1420 {
… …
935 } 1429 }
936#endif 1430#endif
937 1431
938 window_calc (0, 0); 1432 window_calc (0, 0);
939 1433
940 /* sub-window placement & size in rxvt_resize_subwindows () */ 1434 /* sub-window placement & size in rxvt_term::resize_all_windows () */
941 attributes.background_pixel = pix_colors_focused [Color_border]; 1435 attributes.background_pixel = pix_colors_focused [Color_border];
942 attributes.border_pixel = pix_colors_focused [Color_border]; 1436 attributes.border_pixel = pix_colors_focused [Color_border];
943 attributes.colormap = cmap; 1437 attributes.colormap = cmap;
944 1438
945 top = XCreateWindow (dpy, parent, 1439 top = XCreateWindow (dpy, parent,
… …
948 ext_bwidth, 1442 ext_bwidth,
949 depth, InputOutput, visual, 1443 depth, InputOutput, visual,
950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1444 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
951 &attributes); 1445 &attributes);
952 1446
953 this->parent[0] = top; 1447 this->parent = top;
954 1448
955 old_width = szHint.width; 1449 old_width = szHint.width;
956 old_height = szHint.height; 1450 old_height = szHint.height;
957 1451
958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1452 set_title (rs [Rs_title]);
959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1453 set_icon_name (rs [Rs_iconName]);
960 1454
961 classHint.res_name = (char *)rs[Rs_name]; 1455 classHint.res_name = (char *)rs[Rs_name];
962 classHint.res_class = (char *)RESCLASS; 1456 classHint.res_class = (char *)RESCLASS;
963 1457
964 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1458 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1460 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 1461 wmHint.window_group = top;
968 1462
969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1463 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 1464 &szHint, &wmHint, &classHint);
1465#if ENABLE_EWMH
1466 /*
1467 * set up icon hint
1468 * rs [Rs_iconfile] is path to icon
1469 */
1470
1471 if (rs [Rs_iconfile])
1472 {
1473 set_icon (rs [Rs_iconfile]);
1474 }
1475#endif
971 1476
972#if ENABLE_FRILLS 1477#if ENABLE_FRILLS
973 if (mwmhints.flags) 1478 if (mwmhints.flags)
974 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1479 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1480 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
980#if ENABLE_EWMH 1485#if ENABLE_EWMH
981 xa[XA_NET_WM_PING], 1486 xa[XA_NET_WM_PING],
982#endif 1487#endif
983 }; 1488 };
984 1489
985 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1490 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
986 1491
987#if ENABLE_FRILLS 1492#if ENABLE_FRILLS
988 if (rs[Rs_transient_for]) 1493 if (rs[Rs_transient_for])
989 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1494 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif 1495#endif
… …
1009 1514
1010 termwin_ev.start (display, top); 1515 termwin_ev.start (display, top);
1011 1516
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1517 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1518 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014
1015#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018#endif
1019 1519
1020 /* the vt window */ 1520 /* the vt window */
1021 vt = XCreateSimpleWindow (dpy, top, 1521 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1522 window_vt_x, window_vt_y,
1023 width, height, 1523 width, height,
… …
1037 1537
1038 vt_select_input (); 1538 vt_select_input ();
1039 1539
1040 vt_ev.start (display, vt); 1540 vt_ev.start (display, vt);
1041 1541
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL)
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057
1058 /* graphics context for the vt window */ 1542 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1543 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1544 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1545 gcvalue.graphics_exposures = 0;
1062 1546
… …
1064 GCForeground | GCBackground | GCGraphicsExposures, 1548 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1549 &gcvalue);
1066 1550
1067 drawable = new rxvt_drawable (this, vt); 1551 drawable = new rxvt_drawable (this, vt);
1068 1552
1069#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif
1077
1078#ifdef OFF_FOCUS_FADING 1553#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1554 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1555 if (rs[Rs_fade])
1081 pix_colors = pix_colors_unfocused; 1556 pix_colors = pix_colors_unfocused;
1082#endif 1557#endif
1083 1558
1084 pointer_unblank (); 1559 pointer_unblank ();
1085 scr_recolour (); 1560 scr_recolour ();
1086}
1087
1088/* ------------------------------------------------------------------------- *
1089 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */
1091void
1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1093{
1094 /*
1095 * standard System V termios interface
1096 */
1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1098 {
1099 // return error - use system defaults,
1100 // where possible, and zero elsewhere
1101 memset (tio, 0, sizeof (ttymode_t));
1102
1103 tio->c_cc[VINTR] = CINTR;
1104 tio->c_cc[VQUIT] = CQUIT;
1105 tio->c_cc[VERASE] = CERASE;
1106#ifdef VERASE2
1107 tio->c_cc[VERASE2] = CERASE2;
1108#endif
1109 tio->c_cc[VKILL] = CKILL;
1110 tio->c_cc[VSTART] = CSTART;
1111 tio->c_cc[VSTOP] = CSTOP;
1112 tio->c_cc[VSUSP] = CSUSP;
1113# ifdef VDSUSP
1114 tio->c_cc[VDSUSP] = CDSUSP;
1115# endif
1116# ifdef VREPRINT
1117 tio->c_cc[VREPRINT] = CRPRNT;
1118# endif
1119# ifdef VDISCRD
1120 tio->c_cc[VDISCRD] = CFLUSH;
1121# endif
1122# ifdef VWERSE
1123 tio->c_cc[VWERSE] = CWERASE;
1124# endif
1125# ifdef VLNEXT
1126 tio->c_cc[VLNEXT] = CLNEXT;
1127# endif
1128 }
1129
1130 tio->c_cc[VEOF] = CEOF;
1131 tio->c_cc[VEOL] = VDISABLE;
1132# ifdef VEOL2
1133 tio->c_cc[VEOL2] = VDISABLE;
1134# endif
1135# ifdef VSWTC
1136 tio->c_cc[VSWTC] = VDISABLE;
1137# endif
1138# ifdef VSWTCH
1139 tio->c_cc[VSWTCH] = VDISABLE;
1140# endif
1141# if VMIN != VEOF
1142 tio->c_cc[VMIN] = 1;
1143# endif
1144# if VTIME != VEOL
1145 tio->c_cc[VTIME] = 0;
1146# endif
1147
1148 if (erase != -1)
1149 tio->c_cc[VERASE] = (char)erase;
1150
1151 /* input modes */
1152 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1153# ifdef IMAXBEL
1154 | IMAXBEL
1155# endif
1156 | IXON);
1157
1158 /* output modes */
1159 tio->c_oflag = (OPOST | ONLCR);
1160
1161 /* control modes */
1162 tio->c_cflag = (CS8 | CREAD);
1163
1164 /* line discipline modes */
1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1166# if defined (ECHOCTL) && defined (ECHOKE)
1167 | ECHOCTL | ECHOKE
1168# endif
1169 | ECHOE | ECHOK);
1170
1171 /*
1172 * Debugging
1173 */
1174#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n");
1178
1179 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \
1181 if ((tio->c_iflag) & flag) \
1182 fprintf (stderr, "%s ", name)
1183
1184 /* c_iflag bits */
1185 FOO (IGNBRK, "IGNBRK");
1186 FOO (BRKINT, "BRKINT");
1187 FOO (IGNPAR, "IGNPAR");
1188 FOO (PARMRK, "PARMRK");
1189 FOO (INPCK, "INPCK");
1190 FOO (ISTRIP, "ISTRIP");
1191 FOO (INLCR, "INLCR");
1192 FOO (IGNCR, "IGNCR");
1193 FOO (ICRNL, "ICRNL");
1194 FOO (IXON, "IXON");
1195 FOO (IXOFF, "IXOFF");
1196# ifdef IUCLC
1197 FOO (IUCLC, "IUCLC");
1198# endif
1199# ifdef IXANY
1200 FOO (IXANY, "IXANY");
1201# endif
1202# ifdef IMAXBEL
1203 FOO (IMAXBEL, "IMAXBEL");
1204# endif
1205
1206 fprintf (stderr, "\n");
1207
1208# undef FOO
1209# define FOO(entry, name) \
1210 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1211
1212 FOO (VINTR, "VINTR");
1213 FOO (VQUIT, "VQUIT");
1214 FOO (VERASE, "VERASE");
1215 FOO (VKILL, "VKILL");
1216 FOO (VEOF, "VEOF");
1217 FOO (VEOL, "VEOL");
1218# ifdef VEOL2
1219 FOO (VEOL2, "VEOL2");
1220# endif
1221# ifdef VSWTC
1222 FOO (VSWTC, "VSWTC");
1223# endif
1224# ifdef VSWTCH
1225 FOO (VSWTCH, "VSWTCH");
1226# endif
1227 FOO (VSTART, "VSTART");
1228 FOO (VSTOP, "VSTOP");
1229 FOO (VSUSP, "VSUSP");
1230# ifdef VDSUSP
1231 FOO (VDSUSP, "VDSUSP");
1232# endif
1233# ifdef VREPRINT
1234 FOO (VREPRINT, "VREPRINT");
1235# endif
1236# ifdef VDISCRD
1237 FOO (VDISCRD, "VDISCRD");
1238# endif
1239# ifdef VWERSE
1240 FOO (VWERSE, "VWERSE");
1241# endif
1242# ifdef VLNEXT
1243 FOO (VLNEXT, "VLNEXT");
1244# endif
1245
1246 fprintf (stderr, "\n");
1247# undef FOO
1248# endif /* HAVE_TERMIOS_H */
1249#endif /* DEBUG_TTYMODE */
1250} 1561}
1251 1562
1252/*----------------------------------------------------------------------*/ 1563/*----------------------------------------------------------------------*/
1253/* 1564/*
1254 * Run the command in a subprocess and return a file descriptor for the 1565 * Run the command in a subprocess and return a file descriptor for the
… …
1275 else 1586 else
1276#endif 1587#endif
1277 if (!pty->get ()) 1588 if (!pty->get ())
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1589 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1590
1280 int er; 1591 struct termios tio = def_tio;
1281 1592
1282#ifndef NO_BACKSPACE_KEY 1593#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1594 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1595 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1596 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1597 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1287 else
1288#endif 1598#endif
1289 er = -1;
1290 1599
1291 rxvt_get_ttymode (&tio, er); 1600 /* init terminal attributes */
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1601 cfsetospeed (&tio, BAUDRATE);
1602 cfsetispeed (&tio, BAUDRATE);
1603 tcsetattr (pty->tty, TCSANOW, &tio);
1293 pty->set_utf8_mode (enc_utf8); 1604 pty->set_utf8_mode (enc_utf8);
1294 1605
1295 /* set initial window size */ 1606 /* set initial window size */
1296 tt_winch (); 1607 tt_winch ();
1297 1608
… …
1357rxvt_term::run_child (const char *const *argv) 1668rxvt_term::run_child (const char *const *argv)
1358{ 1669{
1359 char *login; 1670 char *login;
1360 1671
1361 if (option (Opt_console)) 1672 if (option (Opt_console))
1673 {
1362 { /* be virtual console, fail silently */ 1674 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1675#ifdef TIOCCONS
1364 unsigned int on = 1; 1676 unsigned int on = 1;
1365 1677
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1678 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1679#elif defined (SRIOCSREDIR)
… …
1369 1681
1370 fd = open (CONSOLE, O_WRONLY, 0); 1682 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1683 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1684 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1685 close (fd);
1374#endif /* SRIOCSREDIR */ 1686#endif /* SRIOCSREDIR */
1375 } 1687 }
1376 1688
1377 /* reset signals and spin off the command interpreter */ 1689 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1690 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1691 signal (SIGQUIT, SIG_DFL);
1380 signal (SIGCHLD, SIG_DFL); 1692 signal (SIGCHLD, SIG_DFL);
1381 signal (SIGHUP, SIG_DFL); 1693 signal (SIGHUP, SIG_DFL);
1382 signal (SIGPIPE, SIG_DFL); 1694 signal (SIGPIPE, SIG_DFL);
1383 /* 1695 /*
1384 * mimick login's behavior by disabling the job control signals 1696 * mimic login's behavior by disabling the job control signals
1385 * a shell that wants them can turn them back on 1697 * a shell that wants them can turn them back on
1386 */ 1698 */
1387#ifdef SIGTSTP 1699#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1700 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1701 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1702 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1703#endif /* SIGTSTP */
1392
1393 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss;
1395 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1704
1398 /* command interpreter path */ 1705 /* command interpreter path */
1399 if (argv != NULL) 1706 if (argv)
1400 { 1707 {
1401# ifdef DEBUG_CMD 1708# ifdef DEBUG_CMD
1402 int i; 1709 int i;
1403 1710
1404 for (i = 0; argv[i]; i++) 1711 for (i = 0; argv[i]; i++)
… …
1413 const char *argv0, *shell; 1720 const char *argv0, *shell;
1414 1721
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1722 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1723 shell = "/bin/sh";
1417 1724
1418 argv0 = (const char *)rxvt_r_basename (shell); 1725 argv0 = rxvt_basename (shell);
1419 1726
1420 if (option (Opt_loginShell)) 1727 if (option (Opt_loginShell))
1421 { 1728 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1729 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1730
1424 login[0] = '-'; 1731 login[0] = '-';
1425 strcpy (&login[1], argv0); 1732 strcpy (&login[1], argv0);
1426 argv0 = login; 1733 argv0 = login;
1427 } 1734 }
1428 1735
1429 execlp (shell, argv0, NULL); 1736 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1737 /* no error message: STDERR is closed! */
1431 } 1738 }
1432 1739
1433 return -1; 1740 return -1;
1434} 1741}

Diff Legend

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