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.210 by ayin, Sat Sep 8 21:25:56 2007 UTC vs.
Revision 1.332 by root, Thu May 22 18:54:32 2014 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 3 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
20 * 21 *
21 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
22 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
23 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <signal.h>
42 44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# include <locale.h>
52#endif
53
54#ifdef HAVE_NL_LANGINFO
55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
61#endif
62
63#ifdef DISPLAY_IS_IP
64/* On Solaris link with -lsocket and -lnsl */
65#include <sys/types.h>
66#include <sys/socket.h>
67
68/* these next two are probably only on Sun (not Solaris) */
69#ifdef HAVE_SYS_SOCKIO_H
70#include <sys/sockio.h>
71#endif
72#ifdef HAVE_SYS_BYTEORDER_H
73#include <sys/byteorder.h>
74#endif
75
76#include <netinet/in.h>
77#include <arpa/inet.h>
78#include <net/if.h>
79#include <net/if_arp.h>
80
81static char * ecb_cold
82rxvt_network_display (const char *display)
83{
84 char buffer[1024], *rval = NULL;
85 struct ifconf ifc;
86 struct ifreq *ifr;
87 int i, skfd;
88
89 if (display[0] != ':' && strncmp (display, "unix:", 5))
90 return (char *) display; /* nothing to do */
91
92 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
93 ifc.ifc_buf = buffer;
94
95 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
96 {
97 perror ("socket");
98 return NULL;
99 }
100
101 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
102 {
103 perror ("SIOCGIFCONF");
104 close (skfd);
105 return NULL;
106 }
107
108 for (i = 0, ifr = ifc.ifc_req;
109 i < (ifc.ifc_len / sizeof (struct ifreq));
110 i++, ifr++)
111 {
112 struct ifreq ifr2;
113
114 strcpy (ifr2.ifr_name, ifr->ifr_name);
115
116 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
117 {
118 unsigned long addr;
119 struct sockaddr_in *p_addr;
120
121 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
122 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
123
124 /*
125 * not "0.0.0.0" or "127.0.0.1" - so format the address
126 */
127 if (addr && addr != 0x7F000001)
128 {
129 char *colon = strchr (display, ':');
130
131 if (colon == NULL)
132 colon = ":0.0";
133
134 rval = rxvt_malloc (strlen (colon) + 16);
135 sprintf (rval, "%d.%d.%d.%d%s",
136 (int) ((addr >> 030) & 0xFF),
137 (int) ((addr >> 020) & 0xFF),
138 (int) ((addr >> 010) & 0xFF),
139 (int) (addr & 0xFF), colon);
140 break;
141 }
142 }
143 }
144
145 close (skfd);
146
147 return rval;
148}
149#endif
150
43const char *const def_colorName[] = 151static const char *const def_colorName[] =
44 { 152 {
45 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
47 /* low-intensity colors */ 155 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
50 "rgb:00/cd/00", // 2: green (Green3) 158 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 159 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 160 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 161 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 162 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 163# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 164 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 165# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 166 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 167# endif
60 /* high-intensity colors */ 168 /* high-intensity colors */
61# ifdef XTERM_COLORS 169# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 170 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 181
182#if !USE_256_COLORS
74 // 88 xterm colours 183 // 88 xterm colours
75 "rgb:00/00/00", 184 "rgb:00/00/00",
76 "rgb:00/00/8b", 185 "rgb:00/00/8b",
77 "rgb:00/00/cd", 186 "rgb:00/00/cd",
78 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 255 "rgb:e7/e7/e7",
256#else
257 // 256 xterm colours
258 "rgb:00/00/00",
259 "rgb:00/00/5f",
260 "rgb:00/00/87",
261 "rgb:00/00/af",
262 "rgb:00/00/d7",
263 "rgb:00/00/ff",
264 "rgb:00/5f/00",
265 "rgb:00/5f/5f",
266 "rgb:00/5f/87",
267 "rgb:00/5f/af",
268 "rgb:00/5f/d7",
269 "rgb:00/5f/ff",
270 "rgb:00/87/00",
271 "rgb:00/87/5f",
272 "rgb:00/87/87",
273 "rgb:00/87/af",
274 "rgb:00/87/d7",
275 "rgb:00/87/ff",
276 "rgb:00/af/00",
277 "rgb:00/af/5f",
278 "rgb:00/af/87",
279 "rgb:00/af/af",
280 "rgb:00/af/d7",
281 "rgb:00/af/ff",
282 "rgb:00/d7/00",
283 "rgb:00/d7/5f",
284 "rgb:00/d7/87",
285 "rgb:00/d7/af",
286 "rgb:00/d7/d7",
287 "rgb:00/d7/ff",
288 "rgb:00/ff/00",
289 "rgb:00/ff/5f",
290 "rgb:00/ff/87",
291 "rgb:00/ff/af",
292 "rgb:00/ff/d7",
293 "rgb:00/ff/ff",
294 "rgb:5f/00/00",
295 "rgb:5f/00/5f",
296 "rgb:5f/00/87",
297 "rgb:5f/00/af",
298 "rgb:5f/00/d7",
299 "rgb:5f/00/ff",
300 "rgb:5f/5f/00",
301 "rgb:5f/5f/5f",
302 "rgb:5f/5f/87",
303 "rgb:5f/5f/af",
304 "rgb:5f/5f/d7",
305 "rgb:5f/5f/ff",
306 "rgb:5f/87/00",
307 "rgb:5f/87/5f",
308 "rgb:5f/87/87",
309 "rgb:5f/87/af",
310 "rgb:5f/87/d7",
311 "rgb:5f/87/ff",
312 "rgb:5f/af/00",
313 "rgb:5f/af/5f",
314 "rgb:5f/af/87",
315 "rgb:5f/af/af",
316 "rgb:5f/af/d7",
317 "rgb:5f/af/ff",
318 "rgb:5f/d7/00",
319 "rgb:5f/d7/5f",
320 "rgb:5f/d7/87",
321 "rgb:5f/d7/af",
322 "rgb:5f/d7/d7",
323 "rgb:5f/d7/ff",
324 "rgb:5f/ff/00",
325 "rgb:5f/ff/5f",
326 "rgb:5f/ff/87",
327 "rgb:5f/ff/af",
328 "rgb:5f/ff/d7",
329 "rgb:5f/ff/ff",
330 "rgb:87/00/00",
331 "rgb:87/00/5f",
332 "rgb:87/00/87",
333 "rgb:87/00/af",
334 "rgb:87/00/d7",
335 "rgb:87/00/ff",
336 "rgb:87/5f/00",
337 "rgb:87/5f/5f",
338 "rgb:87/5f/87",
339 "rgb:87/5f/af",
340 "rgb:87/5f/d7",
341 "rgb:87/5f/ff",
342 "rgb:87/87/00",
343 "rgb:87/87/5f",
344 "rgb:87/87/87",
345 "rgb:87/87/af",
346 "rgb:87/87/d7",
347 "rgb:87/87/ff",
348 "rgb:87/af/00",
349 "rgb:87/af/5f",
350 "rgb:87/af/87",
351 "rgb:87/af/af",
352 "rgb:87/af/d7",
353 "rgb:87/af/ff",
354 "rgb:87/d7/00",
355 "rgb:87/d7/5f",
356 "rgb:87/d7/87",
357 "rgb:87/d7/af",
358 "rgb:87/d7/d7",
359 "rgb:87/d7/ff",
360 "rgb:87/ff/00",
361 "rgb:87/ff/5f",
362 "rgb:87/ff/87",
363 "rgb:87/ff/af",
364 "rgb:87/ff/d7",
365 "rgb:87/ff/ff",
366 "rgb:af/00/00",
367 "rgb:af/00/5f",
368 "rgb:af/00/87",
369 "rgb:af/00/af",
370 "rgb:af/00/d7",
371 "rgb:af/00/ff",
372 "rgb:af/5f/00",
373 "rgb:af/5f/5f",
374 "rgb:af/5f/87",
375 "rgb:af/5f/af",
376 "rgb:af/5f/d7",
377 "rgb:af/5f/ff",
378 "rgb:af/87/00",
379 "rgb:af/87/5f",
380 "rgb:af/87/87",
381 "rgb:af/87/af",
382 "rgb:af/87/d7",
383 "rgb:af/87/ff",
384 "rgb:af/af/00",
385 "rgb:af/af/5f",
386 "rgb:af/af/87",
387 "rgb:af/af/af",
388 "rgb:af/af/d7",
389 "rgb:af/af/ff",
390 "rgb:af/d7/00",
391 "rgb:af/d7/5f",
392 "rgb:af/d7/87",
393 "rgb:af/d7/af",
394 "rgb:af/d7/d7",
395 "rgb:af/d7/ff",
396 "rgb:af/ff/00",
397 "rgb:af/ff/5f",
398 "rgb:af/ff/87",
399 "rgb:af/ff/af",
400 "rgb:af/ff/d7",
401 "rgb:af/ff/ff",
402 "rgb:d7/00/00",
403 "rgb:d7/00/5f",
404 "rgb:d7/00/87",
405 "rgb:d7/00/af",
406 "rgb:d7/00/d7",
407 "rgb:d7/00/ff",
408 "rgb:d7/5f/00",
409 "rgb:d7/5f/5f",
410 "rgb:d7/5f/87",
411 "rgb:d7/5f/af",
412 "rgb:d7/5f/d7",
413 "rgb:d7/5f/ff",
414 "rgb:d7/87/00",
415 "rgb:d7/87/5f",
416 "rgb:d7/87/87",
417 "rgb:d7/87/af",
418 "rgb:d7/87/d7",
419 "rgb:d7/87/ff",
420 "rgb:d7/af/00",
421 "rgb:d7/af/5f",
422 "rgb:d7/af/87",
423 "rgb:d7/af/af",
424 "rgb:d7/af/d7",
425 "rgb:d7/af/ff",
426 "rgb:d7/d7/00",
427 "rgb:d7/d7/5f",
428 "rgb:d7/d7/87",
429 "rgb:d7/d7/af",
430 "rgb:d7/d7/d7",
431 "rgb:d7/d7/ff",
432 "rgb:d7/ff/00",
433 "rgb:d7/ff/5f",
434 "rgb:d7/ff/87",
435 "rgb:d7/ff/af",
436 "rgb:d7/ff/d7",
437 "rgb:d7/ff/ff",
438 "rgb:ff/00/00",
439 "rgb:ff/00/5f",
440 "rgb:ff/00/87",
441 "rgb:ff/00/af",
442 "rgb:ff/00/d7",
443 "rgb:ff/00/ff",
444 "rgb:ff/5f/00",
445 "rgb:ff/5f/5f",
446 "rgb:ff/5f/87",
447 "rgb:ff/5f/af",
448 "rgb:ff/5f/d7",
449 "rgb:ff/5f/ff",
450 "rgb:ff/87/00",
451 "rgb:ff/87/5f",
452 "rgb:ff/87/87",
453 "rgb:ff/87/af",
454 "rgb:ff/87/d7",
455 "rgb:ff/87/ff",
456 "rgb:ff/af/00",
457 "rgb:ff/af/5f",
458 "rgb:ff/af/87",
459 "rgb:ff/af/af",
460 "rgb:ff/af/d7",
461 "rgb:ff/af/ff",
462 "rgb:ff/d7/00",
463 "rgb:ff/d7/5f",
464 "rgb:ff/d7/87",
465 "rgb:ff/d7/af",
466 "rgb:ff/d7/d7",
467 "rgb:ff/d7/ff",
468 "rgb:ff/ff/00",
469 "rgb:ff/ff/5f",
470 "rgb:ff/ff/87",
471 "rgb:ff/ff/af",
472 "rgb:ff/ff/d7",
473 "rgb:ff/ff/ff",
474 "rgb:08/08/08",
475 "rgb:12/12/12",
476 "rgb:1c/1c/1c",
477 "rgb:26/26/26",
478 "rgb:30/30/30",
479 "rgb:3a/3a/3a",
480 "rgb:44/44/44",
481 "rgb:4e/4e/4e",
482 "rgb:58/58/58",
483 "rgb:62/62/62",
484 "rgb:6c/6c/6c",
485 "rgb:76/76/76",
486 "rgb:80/80/80",
487 "rgb:8a/8a/8a",
488 "rgb:94/94/94",
489 "rgb:9e/9e/9e",
490 "rgb:a8/a8/a8",
491 "rgb:b2/b2/b2",
492 "rgb:bc/bc/bc",
493 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0",
495 "rgb:da/da/da",
496 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee",
498#endif
147 499
148#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 504 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 505 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 506 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 507#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 508 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 509 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 510 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 511 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 512#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 513#if ENABLE_FRILLS
162 NULL, // Color_underline 514 NULL, // Color_underline
163#endif 515#endif
164#ifdef OPTION_HC 516#ifdef OPTION_HC
165 NULL, 517 NULL,
518 NULL,
166#endif 519#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 523#endif
171#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
172 NULL, 525 NULL,
173#endif 526#endif
174#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 528 "rgb:00/00/00",
176#endif 529#endif
177 }; 530 };
178 531
179bool 532void
180rxvt_term::init_vars () 533rxvt_term::init_vars ()
181{ 534{
182 pix_colors = // 535 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 536
189 MEvent.time = CurrentTime; 537 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 538 MEvent.button = AnyButton;
191 want_refresh = 1; 539 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 540 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 541 ncol = 80;
194 nrow = 24; 542 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 547 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 548
201 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
202 550
203 oldcursor.row = oldcursor.col = -1; 551 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 552
218 set_option (Opt_scrollBar); 553 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 554 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 555 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
226 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
227 563 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} 564}
264 565
265/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
266const char ** 567const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
268{ 569{
269 int i, r_argc; 570 int i;
270 char *val;
271 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
272
273 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */
276 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e"))
278 break;
279
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281
282 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i];
284
285 r_argv[i] = NULL;
286
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 572
299 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
300 574
301 /* 575 /*
302 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
303 */ 577 */
304 578
305 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
306 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
307 581
308 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
309 583
310 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
312 586
313 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
314 xa = display->xa; 588 xa = display->xa;
315 589
316 set (display); 590 set (display);
317 extract_resources (); 591 extract_resources ();
318 592
319#if XFT 593#if ENABLE_FRILLS
320 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
321 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
322#endif 598#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
327 free (r_argv);
328 599
329 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
331 rs [i] = 0; 602 rs [i] = 0;
332 603
… …
340 { 611 {
341 rxvt_perl.init (this); 612 rxvt_perl.init (this);
342 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
343 } 614 }
344#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
345 620
346 /* 621 /*
347 * set any defaults not already set 622 * set any defaults not already set
348 */ 623 */
349 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
350 { 625 {
351 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
352 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
353 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
355 } 631 }
356 else 632 else
357 { 633 {
358 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
359 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
360 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
361 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
362 } 639 }
363 640
364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
371 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 648 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
372 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
373 650
374 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
375 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 652 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
653
654 if (rs[Rs_letterSpace])
655 letterSpace = atoi (rs[Rs_letterSpace]);
376#endif 656#endif
377 657
378#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
379 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
380 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
384 664
385 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
386 if (!saveLines) 666 if (!saveLines)
387 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
388 668
389#ifdef PRINTPIPE
390 if (!rs[Rs_print_pipe])
391 rs[Rs_print_pipe] = PRINTPIPE;
392#endif
393
394 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
395 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
396 671
397#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 673 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 674# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 675 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 676# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 677 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 678# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 key_backspace = val;
408 }
409#endif 679#endif
410 680
411#ifndef NO_DELETE_KEY 681#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 682 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 683# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 684 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 685# else
416 key_delete = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
417# endif 687# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 key_delete = val;
422 }
423#endif 688#endif
424 689
425#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
427#endif
428 691
429#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
430 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
431 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
432 { 695 {
… …
452 color_aliases (Color_fg); 715 color_aliases (Color_fg);
453 color_aliases (Color_bg); 716 color_aliases (Color_bg);
454#ifndef NO_CURSORCOLOR 717#ifndef NO_CURSORCOLOR
455 color_aliases (Color_cursor); 718 color_aliases (Color_cursor);
456 color_aliases (Color_cursor2); 719 color_aliases (Color_cursor2);
457#endif /* NO_CURSORCOLOR */ 720#endif /* NO_CURSORCOLOR */
458 color_aliases (Color_pointer_fg); 721 color_aliases (Color_pointer_fg);
459 color_aliases (Color_pointer_bg); 722 color_aliases (Color_pointer_bg);
460 color_aliases (Color_border); 723 color_aliases (Color_border);
461#ifndef NO_BOLD_UNDERLINE_REVERSE 724#ifndef NO_BOLD_UNDERLINE_REVERSE
462 color_aliases (Color_BD); 725 color_aliases (Color_BD);
463 color_aliases (Color_UL); 726 color_aliases (Color_UL);
464 color_aliases (Color_RV); 727 color_aliases (Color_RV);
465#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 728#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
466 729
467 if (!rs[Rs_color + Color_border]) 730 if (!rs[Rs_color + Color_border])
468 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 731 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
469 732
470 return cmd_argv; 733 return cmd_argv;
734}
735
736/*----------------------------------------------------------------------*/
737void
738rxvt_term::init (stringvec *argv, stringvec *envv)
739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
744 this->envv = envv;
745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
771 SET_R (this);
772 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :(
774
775 init_vars ();
776
777 const char **cmd_argv = init_resources (argc, argv);
778
779#ifdef KEYSYM_RESOURCE
780 keyboard->register_done ();
781#endif
782
783 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty
785 {
786 if (*path != '/')
787 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
788
789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 }
792
793 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810
811#ifdef HAVE_BG_PIXMAP
812 bg_init ();
813#endif
814
815#if ENABLE_PERL
816 rootwin_ev.start (display, display->root);
817#endif
818
819 init_done = 1;
820
821 init_command (cmd_argv);
822
823 if (pty->pty >= 0)
824 pty_ev.start (pty->pty, ev::READ);
825
826 HOOK_INVOKE ((this, HOOK_START, DT_END));
827
828#if ENABLE_XEMBED
829 if (rs[Rs_embed])
830 {
831 long info[2] = { 0, XEMBED_MAPPED };
832
833 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
834 32, PropModeReplace, (unsigned char *)&info, 2);
835 }
836#endif
837
838#if HAVE_STARTUP_NOTIFICATION
839 SnDisplay *snDisplay;
840 SnLauncheeContext *snContext;
841
842 snDisplay = sn_display_new (dpy, NULL, NULL);
843 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
844
845 /* Tell the window manager that this window is part of the startup context */
846 if (snContext)
847 sn_launchee_context_setup_window (snContext, parent);
848#endif
849
850 XMapWindow (dpy, vt);
851 XMapWindow (dpy, parent);
852
853#if HAVE_STARTUP_NOTIFICATION
854 if (snContext)
855 {
856 /* Mark the startup process as complete */
857 sn_launchee_context_complete (snContext);
858
859 sn_launchee_context_unref (snContext);
860 }
861
862 sn_display_unref (snDisplay);
863#endif
864
865 refresh_check ();
471} 866}
472 867
473/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
474void 869void
475rxvt_term::init_env () 870rxvt_term::init_env ()
476{ 871{
477 int i;
478 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
479 877
480#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
481 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
483 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
490 */ 888 */
491 val = rxvt_network_display (rs[Rs_display_name]); 889 val = rxvt_network_display (rs[Rs_display_name]);
492 rs[Rs_display_name] = (const char *)val; 890 rs[Rs_display_name] = (const char *)val;
493 891
494 if (val == NULL) 892 if (val == NULL)
495#endif /* DISPLAY_IS_IP */ 893#endif /* DISPLAY_IS_IP */
496 val = XDisplayString (dpy); 894 val = XDisplayString (dpy);
497 895
498 if (rs[Rs_display_name] == NULL) 896 if (rs[Rs_display_name] == NULL)
499 rs[Rs_display_name] = val; /* use broken `:0' value */ 897 rs[Rs_display_name] = val; /* use broken `:0' value */
500 898
501 i = strlen (val);
502 env_display = (char *)rxvt_malloc (i + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
503 900
504 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
505 902
903 env_windowid = (char *)rxvt_malloc (21);
506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
507 905
508 /* add entries to the environment: 906 /* add entries to the environment:
509 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
510 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
511 * @ COLORTERM: terminal sub-name and also indicates its color 909 * @ COLORTERM: terminal sub-name and also indicates its color
… …
514 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
515 */ 913 */
516 putenv (env_display); 914 putenv (env_display);
517 putenv (env_windowid); 915 putenv (env_windowid);
518 916
519 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
520 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
521 919
522#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
523 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
524#endif 922#endif
525 923
… …
540#ifdef HAVE_UNSETENV 938#ifdef HAVE_UNSETENV
541 /* avoid passing old settings and confusing term size */ 939 /* avoid passing old settings and confusing term size */
542 unsetenv ("LINES"); 940 unsetenv ("LINES");
543 unsetenv ("COLUMNS"); 941 unsetenv ("COLUMNS");
544 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
545#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
546} 944}
547 945
548/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
549/*
550 * This is more or less stolen straight from XFree86 xterm.
551 * This should support all European type languages.
552 */
553void 947void
554rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
555{ 949{
556 set_environ (envv); 950 set_environ (envv);
557 951
558#if HAVE_XSETLOCALE || HAVE_SETLOCALE
559 free (this->locale); 952 free (this->locale);
560 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
561 954
562 if (!this->locale) 955 if (!this->locale)
563 { 956 {
… …
571 964
572 this->locale = "C"; 965 this->locale = "C";
573 } 966 }
574 967
575 968
576 this->locale = rxvt_strdup (this->locale); 969 this->locale = strdup (this->locale);
577 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
578 mbstate.reset (); 971 mbstate.reset ();
579#endif
580 972
581#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
582 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
583 // /^UTF.?8/i 975 // /^UTF.?8/i
584 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
585 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
586 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
587 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
588 free (codeset);
589#else 980#else
590 enc_utf8 = 0; 981 enc_utf8 = 0;
591#endif 982#endif
592} 983}
593 984
594void 985void
595rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
596{ 987{
597 set_environ (envv); 988 set_environ (envv);
598 989
599#ifdef USE_XIM 990#if USE_XIM
600 if (!locale) 991 if (!locale)
601 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
602 else 993 else
603 { 994 {
604 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
605 996
606 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
607 { 998 {
608 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
609 return; 1000 return;
610 } 1001 }
611 1002
612 im_ev.start (display); 1003 im_ev.start (display);
613 1004
… …
638 priv_modes |= PrivMode_Keypress; 1029 priv_modes |= PrivMode_Keypress;
639 if (!option (Opt_jumpScroll)) 1030 if (!option (Opt_jumpScroll))
640 priv_modes |= PrivMode_smoothScroll; 1031 priv_modes |= PrivMode_smoothScroll;
641 1032
642#ifndef NO_BACKSPACE_KEY 1033#ifndef NO_BACKSPACE_KEY
643 if (strcmp (key_backspace, "DEC") == 0) 1034 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
644 priv_modes |= PrivMode_HaveBackSpace; 1035 priv_modes |= PrivMode_HaveBackSpace;
645#endif 1036#endif
646 1037
647 /* add value for scrollBar */ 1038 /* add value for scrollBar */
648 if (scrollBar.state) 1039 if (scrollBar.state)
… …
654 run_command (argv); 1045 run_command (argv);
655} 1046}
656 1047
657/*----------------------------------------------------------------------*/ 1048/*----------------------------------------------------------------------*/
658void 1049void
659rxvt_term::Get_Colours () 1050rxvt_term::get_colours ()
660{ 1051{
661 int i; 1052 int i;
662 1053
663#ifdef OFF_FOCUS_FADING 1054#ifdef OFF_FOCUS_FADING
664 pix_colors = pix_colors_focused; 1055 pix_colors = pix_colors_focused;
665#endif 1056#endif
666 1057
667 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1058 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
668 { 1059 {
669 const char *name = rs[Rs_color + i]; 1060 const char *name = rs[Rs_color + i];
670 1061
671 if (!name) 1062 if (!name)
… …
724 * get scrollBar shadow colors 1115 * get scrollBar shadow colors
725 * 1116 *
726 * The calculations of topShadow/bottomShadow values are adapted 1117 * The calculations of topShadow/bottomShadow values are adapted
727 * from the fvwm window manager. 1118 * from the fvwm window manager.
728 */ 1119 */
729#ifdef KEEP_SCROLLCOLOR 1120#ifdef RXVT_SCROLLBAR
730 if (depth <= 2) 1121 if (depth <= 2)
731 { 1122 {
732 /* Monochrome */ 1123 /* Monochrome */
733 alias_color (Color_scroll, Color_fg); 1124 alias_color (Color_scroll, Color_fg);
734 alias_color (Color_topShadow, Color_bg); 1125 alias_color (Color_topShadow, Color_bg);
… …
749 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1140 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
750 cscroll.a) 1141 cscroll.a)
751 )) 1142 ))
752 alias_color (Color_topShadow, Color_White); 1143 alias_color (Color_topShadow, Color_White);
753 } 1144 }
754#endif /* KEEP_SCROLLCOLOR */ 1145#endif
755 1146
756#ifdef OFF_FOCUS_FADING 1147#ifdef OFF_FOCUS_FADING
757 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1148 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
758 update_fade_color (i); 1149 update_fade_color (i);
759#endif 1150#endif
… …
762/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
763/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
764void 1155void
765rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
766{ 1157{
767 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
768 { 1159 {
769 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
770 1161
771 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
772 { /* bright colors */ 1163 /* bright colors */
773 i -= 8;
774 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1164 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
775 return; 1165 else if (i >= 0 && i <= 7)
776 } 1166 /* normal colors */
777
778 if (i >= 0 && i <= 7) /* normal colors */
779 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1167 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
780 } 1168 }
781} 1169}
782 1170
783/*----------------------------------------------------------------------*/ 1171/*----------------------------------------------------------------------*/
… …
867 1255
868 if (i) 1256 if (i)
869 ModMetaMask = modmasks[i - 1]; 1257 ModMetaMask = modmasks[i - 1];
870} 1258}
871 1259
1260void
1261rxvt_term::set_icon (const char *file)
1262{
1263#if HAVE_PIXBUF
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf)
1266 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return;
1269 }
1270
1271 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1272 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1273
1274 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1275 {
1276 rxvt_warn ("Icon image too big, continuing without.\n");
1277 g_object_unref (pixbuf);
1278 return;
1279 }
1280
1281 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1282 {
1283 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1284 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1285 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1286
1287 buffer [0] = w;
1288 buffer [1] = h;
1289 for (int i = 0; i < h; i++)
1290 {
1291 for (int j = 0; j < w; j++)
1292 {
1293 unsigned char *pixel = row + j * channels;
1294 long value;
1295
1296 if (channels == 4)
1297 value = pixel[3];
1298 else
1299 value = (unsigned char)0x00ff;
1300
1301 value = (value << 8) + pixel[0];
1302 value = (value << 8) + pixel[1];
1303 value = (value << 8) + pixel[2];
1304 buffer[(i * w + j) + 2] = value;
1305 }
1306
1307 row += rowstride;
1308 }
1309
1310 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1311 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1312 free (buffer);
1313 }
1314 else
1315 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1316
1317 g_object_unref (pixbuf);
1318#endif
1319}
1320
872/*----------------------------------------------------------------------*/ 1321/*----------------------------------------------------------------------*/
873/* rxvt_Create_Windows () - Open and map the window */ 1322/* Open and map the window */
874void 1323void
875rxvt_term::create_windows (int argc, const char *const *argv) 1324rxvt_term::create_windows (int argc, const char *const *argv)
876{ 1325{
877 XClassHint classHint; 1326 XClassHint classHint;
878 XWMHints wmHint; 1327 XWMHints wmHint;
… …
884 Window top, parent; 1333 Window top, parent;
885 1334
886 dLocal (Display *, dpy); 1335 dLocal (Display *, dpy);
887 1336
888 /* grab colors before netscape does */ 1337 /* grab colors before netscape does */
889 Get_Colours (); 1338 get_colours ();
890 1339
891 if (!set_fonts ()) 1340 if (!set_fonts ())
892 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1341 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
893 1342
894 parent = display->root; 1343 parent = display->root;
… …
924 } 1373 }
925#endif 1374#endif
926 1375
927 window_calc (0, 0); 1376 window_calc (0, 0);
928 1377
929 /* sub-window placement & size in rxvt_resize_subwindows () */ 1378 /* sub-window placement & size in rxvt_term::resize_all_windows () */
930 attributes.background_pixel = pix_colors_focused [Color_border]; 1379 attributes.background_pixel = pix_colors_focused [Color_border];
931 attributes.border_pixel = pix_colors_focused [Color_border]; 1380 attributes.border_pixel = pix_colors_focused [Color_border];
932 attributes.colormap = cmap; 1381 attributes.colormap = cmap;
933 1382
934 top = XCreateWindow (dpy, parent, 1383 top = XCreateWindow (dpy, parent,
… …
937 ext_bwidth, 1386 ext_bwidth,
938 depth, InputOutput, visual, 1387 depth, InputOutput, visual,
939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
940 &attributes); 1389 &attributes);
941 1390
942 this->parent[0] = top; 1391 this->parent = top;
943 1392
944 old_width = szHint.width; 1393 set_title (rs [Rs_title]);
945 old_height = szHint.height; 1394 set_icon_name (rs [Rs_iconName]);
946
947 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
948 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
949 1395
950 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
952 1398
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
955 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1402 wmHint.window_group = top;
957 1403
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH
1407 /*
1408 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon
1410 */
1411
1412 if (rs [Rs_iconfile])
1413 set_icon (rs [Rs_iconfile]);
1414#endif
960 1415
961#if ENABLE_FRILLS 1416#if ENABLE_FRILLS
962 if (mwmhints.flags) 1417 if (mwmhints.flags)
963 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1418 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1419 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
969#if ENABLE_EWMH 1424#if ENABLE_EWMH
970 xa[XA_NET_WM_PING], 1425 xa[XA_NET_WM_PING],
971#endif 1426#endif
972 }; 1427 };
973 1428
974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1429 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
975 1430
976#if ENABLE_FRILLS 1431#if ENABLE_FRILLS
977 if (rs[Rs_transient_for]) 1432 if (rs[Rs_transient_for])
978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1433 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
979#endif 1434#endif
… …
999 termwin_ev.start (display, top); 1454 termwin_ev.start (display, top);
1000 1455
1001 /* vt cursor: Black-on-White is standard, but this is more popular */ 1456 /* vt cursor: Black-on-White is standard, but this is more popular */
1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1457 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1003 1458
1004#ifdef HAVE_SCROLLBARS
1005 /* cursor scrollBar: Black-on-White */
1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1007#endif
1008
1009 /* the vt window */ 1459 /* the vt window */
1010 vt = XCreateSimpleWindow (dpy, top, 1460 vt = XCreateSimpleWindow (dpy, top,
1011 window_vt_x, window_vt_y, 1461 window_vt_x, window_vt_y,
1012 width, height, 1462 vt_width, vt_height,
1013 0, 1463 0,
1014 pix_colors_focused[Color_fg], 1464 pix_colors_focused[Color_fg],
1015 pix_colors_focused[Color_bg]); 1465 pix_colors_focused[Color_bg]);
1016 1466
1017 attributes.bit_gravity = NorthWestGravity; 1467 attributes.bit_gravity = NorthWestGravity;
… …
1037 GCForeground | GCBackground | GCGraphicsExposures, 1487 GCForeground | GCBackground | GCGraphicsExposures,
1038 &gcvalue); 1488 &gcvalue);
1039 1489
1040 drawable = new rxvt_drawable (this, vt); 1490 drawable = new rxvt_drawable (this, vt);
1041 1491
1042#ifdef RXVT_SCROLLBAR
1043 gcvalue.foreground = pix_colors[Color_topShadow];
1044 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1045 gcvalue.foreground = pix_colors[Color_bottomShadow];
1046 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1047 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1048 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1049#endif
1050
1051#ifdef OFF_FOCUS_FADING 1492#ifdef OFF_FOCUS_FADING
1052 // initially we are in unfocused state 1493 // initially we are in unfocused state
1053 if (rs[Rs_fade]) 1494 if (rs[Rs_fade])
1054 pix_colors = pix_colors_unfocused; 1495 pix_colors = pix_colors_unfocused;
1055#endif 1496#endif
1056 1497
1057 pointer_unblank (); 1498 pointer_unblank ();
1058 scr_recolour (); 1499 scr_recolour ();
1059}
1060
1061/* ------------------------------------------------------------------------- *
1062 * GET TTY CURRENT STATE *
1063 * ------------------------------------------------------------------------- */
1064void
1065rxvt_get_ttymode (ttymode_t *tio, int erase)
1066{
1067 /*
1068 * standard System V termios interface
1069 */
1070 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1071 {
1072 // return error - use system defaults,
1073 // where possible, and zero elsewhere
1074 memset (tio, 0, sizeof (ttymode_t));
1075
1076 tio->c_cc[VINTR] = CINTR;
1077 tio->c_cc[VQUIT] = CQUIT;
1078 tio->c_cc[VERASE] = CERASE;
1079#ifdef VERASE2
1080 tio->c_cc[VERASE2] = CERASE2;
1081#endif
1082 tio->c_cc[VKILL] = CKILL;
1083 tio->c_cc[VSTART] = CSTART;
1084 tio->c_cc[VSTOP] = CSTOP;
1085 tio->c_cc[VSUSP] = CSUSP;
1086# ifdef VDSUSP
1087 tio->c_cc[VDSUSP] = CDSUSP;
1088# endif
1089# ifdef VREPRINT
1090 tio->c_cc[VREPRINT] = CRPRNT;
1091# endif
1092# ifdef VDISCRD
1093 tio->c_cc[VDISCRD] = CFLUSH;
1094# endif
1095# ifdef VWERSE
1096 tio->c_cc[VWERSE] = CWERASE;
1097# endif
1098# ifdef VLNEXT
1099 tio->c_cc[VLNEXT] = CLNEXT;
1100# endif
1101 }
1102
1103 tio->c_cc[VEOF] = CEOF;
1104 tio->c_cc[VEOL] = VDISABLE;
1105# ifdef VEOL2
1106 tio->c_cc[VEOL2] = VDISABLE;
1107# endif
1108# ifdef VSWTC
1109 tio->c_cc[VSWTC] = VDISABLE;
1110# endif
1111# ifdef VSWTCH
1112 tio->c_cc[VSWTCH] = VDISABLE;
1113# endif
1114# if VMIN != VEOF
1115 tio->c_cc[VMIN] = 1;
1116# endif
1117# if VTIME != VEOL
1118 tio->c_cc[VTIME] = 0;
1119# endif
1120
1121 if (erase != -1)
1122 tio->c_cc[VERASE] = (char)erase;
1123
1124 /* input modes */
1125 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1126# ifdef IMAXBEL
1127 | IMAXBEL
1128# endif
1129 | IXON);
1130
1131 /* output modes */
1132 tio->c_oflag = (OPOST | ONLCR);
1133
1134 /* control modes */
1135 tio->c_cflag = (CS8 | CREAD);
1136
1137 /* line discipline modes */
1138 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1139# if defined (ECHOCTL) && defined (ECHOKE)
1140 | ECHOCTL | ECHOKE
1141# endif
1142 | ECHOE | ECHOK);
1143
1144 /*
1145 * Debugging
1146 */
1147#ifdef DEBUG_TTYMODE
1148#ifdef HAVE_TERMIOS_H
1149 /* c_iflag bits */
1150 fprintf (stderr, "Input flags\n");
1151
1152 /* cpp token stringize doesn't work on all machines <sigh> */
1153# define FOO(flag,name) \
1154 if ((tio->c_iflag) & flag) \
1155 fprintf (stderr, "%s ", name)
1156
1157 /* c_iflag bits */
1158 FOO (IGNBRK, "IGNBRK");
1159 FOO (BRKINT, "BRKINT");
1160 FOO (IGNPAR, "IGNPAR");
1161 FOO (PARMRK, "PARMRK");
1162 FOO (INPCK, "INPCK");
1163 FOO (ISTRIP, "ISTRIP");
1164 FOO (INLCR, "INLCR");
1165 FOO (IGNCR, "IGNCR");
1166 FOO (ICRNL, "ICRNL");
1167 FOO (IXON, "IXON");
1168 FOO (IXOFF, "IXOFF");
1169# ifdef IUCLC
1170 FOO (IUCLC, "IUCLC");
1171# endif
1172# ifdef IXANY
1173 FOO (IXANY, "IXANY");
1174# endif
1175# ifdef IMAXBEL
1176 FOO (IMAXBEL, "IMAXBEL");
1177# endif
1178
1179 fprintf (stderr, "\n");
1180
1181# undef FOO
1182# define FOO(entry, name) \
1183 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1184
1185 FOO (VINTR, "VINTR");
1186 FOO (VQUIT, "VQUIT");
1187 FOO (VERASE, "VERASE");
1188 FOO (VKILL, "VKILL");
1189 FOO (VEOF, "VEOF");
1190 FOO (VEOL, "VEOL");
1191# ifdef VEOL2
1192 FOO (VEOL2, "VEOL2");
1193# endif
1194# ifdef VSWTC
1195 FOO (VSWTC, "VSWTC");
1196# endif
1197# ifdef VSWTCH
1198 FOO (VSWTCH, "VSWTCH");
1199# endif
1200 FOO (VSTART, "VSTART");
1201 FOO (VSTOP, "VSTOP");
1202 FOO (VSUSP, "VSUSP");
1203# ifdef VDSUSP
1204 FOO (VDSUSP, "VDSUSP");
1205# endif
1206# ifdef VREPRINT
1207 FOO (VREPRINT, "VREPRINT");
1208# endif
1209# ifdef VDISCRD
1210 FOO (VDISCRD, "VDISCRD");
1211# endif
1212# ifdef VWERSE
1213 FOO (VWERSE, "VWERSE");
1214# endif
1215# ifdef VLNEXT
1216 FOO (VLNEXT, "VLNEXT");
1217# endif
1218
1219 fprintf (stderr, "\n");
1220# undef FOO
1221# endif /* HAVE_TERMIOS_H */
1222#endif /* DEBUG_TTYMODE */
1223} 1500}
1224 1501
1225/*----------------------------------------------------------------------*/ 1502/*----------------------------------------------------------------------*/
1226/* 1503/*
1227 * Run the command in a subprocess and return a file descriptor for the 1504 * Run the command in a subprocess and return a file descriptor for the
… …
1239 if (pty->pty >= 0) 1516 if (pty->pty >= 0)
1240 { 1517 {
1241 if (getfd_hook) 1518 if (getfd_hook)
1242 pty->pty = (*getfd_hook) (pty->pty); 1519 pty->pty = (*getfd_hook) (pty->pty);
1243 1520
1244 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1521 if (pty->pty < 0)
1245 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1522 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1246 } 1523 }
1247 } 1524 }
1248 else 1525 else
1249#endif 1526#endif
1250 if (!pty->get ()) 1527 if (!pty->get ())
1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1528 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1252 1529
1253 int er; 1530 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1531
1532 struct termios tio = def_tio;
1254 1533
1255#ifndef NO_BACKSPACE_KEY 1534#ifndef NO_BACKSPACE_KEY
1256 if (key_backspace[0] && !key_backspace[1]) 1535 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1257 er = key_backspace[0]; 1536 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1258 else if (strcmp (key_backspace, "DEC") == 0) 1537 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1259 er = '\177'; /* the initial state anyway */ 1538 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1260 else
1261#endif 1539#endif
1262 er = -1;
1263 1540
1264 rxvt_get_ttymode (&tio, er); 1541 /* init terminal attributes */
1265 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1542 cfsetospeed (&tio, BAUDRATE);
1543 cfsetispeed (&tio, BAUDRATE);
1544 tcsetattr (pty->tty, TCSANOW, &tio);
1266 pty->set_utf8_mode (enc_utf8); 1545 pty->set_utf8_mode (enc_utf8);
1267 1546
1268 /* set initial window size */ 1547 /* set initial window size */
1269 tt_winch (); 1548 tt_winch ();
1270 1549
… …
1306 1585
1307 _exit (EXIT_FAILURE); 1586 _exit (EXIT_FAILURE);
1308 1587
1309 default: 1588 default:
1310 if (!option (Opt_utmpInhibit)) 1589 if (!option (Opt_utmpInhibit))
1590 {
1591#ifdef LOG_ONLY_ON_LOGIN
1592 bool login_shell = option (Opt_loginShell);
1593#else
1594 bool login_shell = true;
1595#endif
1311 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1596 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1597 }
1312 1598
1313 pty->close_tty (); 1599 pty->close_tty ();
1314 1600
1315 child_ev.start (cmd_pid); 1601 child_ev.start (cmd_pid);
1316 1602
… …
1330rxvt_term::run_child (const char *const *argv) 1616rxvt_term::run_child (const char *const *argv)
1331{ 1617{
1332 char *login; 1618 char *login;
1333 1619
1334 if (option (Opt_console)) 1620 if (option (Opt_console))
1621 {
1335 { /* be virtual console, fail silently */ 1622 /* be virtual console, fail silently */
1336#ifdef TIOCCONS 1623#ifdef TIOCCONS
1337 unsigned int on = 1; 1624 unsigned int on = 1;
1338 1625
1339 ioctl (STDIN_FILENO, TIOCCONS, &on); 1626 ioctl (STDIN_FILENO, TIOCCONS, &on);
1340#elif defined (SRIOCSREDIR) 1627#elif defined (SRIOCSREDIR)
1341 int fd; 1628 int fd;
1342 1629
1343 fd = open (CONSOLE, O_WRONLY, 0); 1630 fd = open (CONSOLE, O_WRONLY, 0);
1344 if (fd >= 0) 1631 if (fd >= 0)
1345 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1632 {
1633 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1346 close (fd); 1634 close (fd);
1347#endif /* SRIOCSREDIR */ 1635 }
1636#endif /* SRIOCSREDIR */
1348 } 1637 }
1349 1638
1350 /* reset signals and spin off the command interpreter */ 1639 /* reset signals and spin off the command interpreter */
1351 signal (SIGINT, SIG_DFL); 1640 signal (SIGINT, SIG_DFL);
1352 signal (SIGQUIT, SIG_DFL); 1641 signal (SIGQUIT, SIG_DFL);
1353 signal (SIGCHLD, SIG_DFL); 1642 signal (SIGCHLD, SIG_DFL);
1354 signal (SIGHUP, SIG_DFL); 1643 signal (SIGHUP, SIG_DFL);
1355 signal (SIGPIPE, SIG_DFL); 1644 signal (SIGPIPE, SIG_DFL);
1356 /* 1645 /*
1357 * mimick login's behavior by disabling the job control signals 1646 * mimic login's behavior by disabling the job control signals
1358 * a shell that wants them can turn them back on 1647 * a shell that wants them can turn them back on
1359 */ 1648 */
1360#ifdef SIGTSTP 1649#ifdef SIGTSTP
1361 signal (SIGTSTP, SIG_IGN); 1650 signal (SIGTSTP, SIG_IGN);
1362 signal (SIGTTIN, SIG_IGN); 1651 signal (SIGTTIN, SIG_IGN);
1363 signal (SIGTTOU, SIG_IGN); 1652 signal (SIGTTOU, SIG_IGN);
1364#endif /* SIGTSTP */ 1653#endif /* SIGTSTP */
1365
1366 // unblock signals (signals are blocked by iom.C
1367 sigset_t ss;
1368 sigemptyset (&ss);
1369 sigprocmask (SIG_SETMASK, &ss, 0);
1370 1654
1371 /* command interpreter path */ 1655 /* command interpreter path */
1372 if (argv != NULL) 1656 if (argv)
1373 { 1657 {
1374# ifdef DEBUG_CMD 1658# ifdef DEBUG_CMD
1375 int i; 1659 int i;
1376 1660
1377 for (i = 0; argv[i]; i++) 1661 for (i = 0; argv[i]; i++)
… …
1386 const char *argv0, *shell; 1670 const char *argv0, *shell;
1387 1671
1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1672 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1389 shell = "/bin/sh"; 1673 shell = "/bin/sh";
1390 1674
1391 argv0 = (const char *)rxvt_basename (shell); 1675 argv0 = rxvt_basename (shell);
1392 1676
1393 if (option (Opt_loginShell)) 1677 if (option (Opt_loginShell))
1394 { 1678 {
1395 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1679 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1396 1680
1397 login[0] = '-'; 1681 login[0] = '-';
1398 strcpy (&login[1], argv0); 1682 strcpy (&login[1], argv0);
1399 argv0 = login; 1683 argv0 = login;
1400 } 1684 }
1401 1685
1402 execlp (shell, argv0, NULL); 1686 execlp (shell, argv0, (char *)0);
1403 /* no error message: STDERR is closed! */ 1687 /* no error message: STDERR is closed! */
1404 } 1688 }
1405 1689
1406 return -1; 1690 return -1;
1407} 1691}

Diff Legend

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