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

Diff Legend

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