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.180 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.294 by sf-exg, Thu Apr 7 12:19:40 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)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
179#if !USE_256_COLORS
74 // 88 xterm colours 180 // 88 xterm colours
75 "rgb:00/00/00", 181 "rgb:00/00/00",
76 "rgb:00/00/8b", 182 "rgb:00/00/8b",
77 "rgb:00/00/cd", 183 "rgb:00/00/cd",
78 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
147 496
148#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 503 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 510#if ENABLE_FRILLS
162 NULL, // Color_underline 511 NULL, // Color_underline
163#endif 512#endif
164#ifdef OPTION_HC 513#ifdef OPTION_HC
165 NULL, 514 NULL,
515 NULL,
166#endif 516#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 520#endif
171#if TINTING 521#if ENABLE_TRANSPARENCY
172 NULL, 522 NULL,
173#endif 523#endif
174#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 525 "rgb:00/00/00",
176#endif 526#endif
177 }; 527 };
178 528
179bool 529void
180rxvt_term::init_vars () 530rxvt_term::init_vars ()
181{ 531{
182 pix_colors = // 532 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 533
192 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 536 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 538 ncol = 80;
198 nrow = 24; 539 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 544 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 545
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
207 547
208 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None;
213#endif
214 549
215 last_bot = last_state = -1; 550 set_option (Opt_scrollBar);
216 551 set_option (Opt_scrollTtyOutput);
217 return true; 552 set_option (Opt_jumpScroll);
218} 553 set_option (Opt_skipScroll);
219 554 set_option (Opt_secondaryScreen);
220void 555 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 556 set_option (Opt_pastableTabs);
222{ 557 set_option (Opt_intensityStyles);
223 int i; 558 set_option (Opt_iso14755);
224 559 set_option (Opt_iso14755_52);
225 /* 560 set_option (Opt_buffered);
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO);
233 }
234 else if (i > STDIN_FILENO)
235 {
236 dup2 (i, STDIN_FILENO);
237 close (i);
238 }
239
240 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 561}
253 562
254/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
255const char ** 564const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
257{ 566{
258 int i, r_argc; 567 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
261 569
262 /* 570 /*
263 * 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
264 */ 572 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
267 break; 575 break;
268 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
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 592
271 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
273 595
274 r_argv[i] = NULL; 596 r_argv[i] = NULL;
275 597
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
289 599
290 /* 600 /*
291 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
292 */ 602 */
293 603
… …
295 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
296 606
297 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
298 608
299 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
300 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 }
301 614
302 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
303 xa = display->xa; 616 xa = display->xa;
304 617
305 set (display); 618 set (display);
… …
313 free (r_argv); 626 free (r_argv);
314 627
315 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
317 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
318 640
319#if ENABLE_PERL 641#if ENABLE_PERL
320 if (!rs[Rs_perl_ext_1]) 642 if (!rs[Rs_perl_ext_1])
321 rs[Rs_perl_ext_1] = "default"; 643 rs[Rs_perl_ext_1] = "default";
322 644
… …
333 * set any defaults not already set 655 * set any defaults not already set
334 */ 656 */
335 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
336 { 658 {
337 if (!rs[Rs_title]) 659 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 660 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
661
339 if (!rs[Rs_iconName]) 662 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 663 rs[Rs_iconName] = rs[Rs_title];
341 } 664 }
342 else 665 else
343 { 666 {
344 if (!rs[Rs_title]) 667 if (!rs[Rs_title])
345 rs[Rs_title] = rs[Rs_name]; 668 rs[Rs_title] = rs[Rs_name];
669
346 if (!rs[Rs_iconName]) 670 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_name]; 671 rs[Rs_iconName] = rs[Rs_name];
348 } 672 }
349 673
350 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 674 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
357 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)
358 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 682 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
359 683
360 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 684 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
361 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]);
362#endif 689#endif
363 690
364#ifdef POINTER_BLANK 691#ifdef POINTER_BLANK
365 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
366 pointerBlankDelay = i; 693 pointerBlankDelay = i;
… …
370 697
371 /* no point having a scrollbar without having any scrollback! */ 698 /* no point having a scrollbar without having any scrollback! */
372 if (!saveLines) 699 if (!saveLines)
373 set_option (Opt_scrollBar, 0); 700 set_option (Opt_scrollBar, 0);
374 701
375#ifdef PRINTPIPE
376 if (!rs[Rs_print_pipe])
377 rs[Rs_print_pipe] = PRINTPIPE;
378#endif
379
380 if (!rs[Rs_cutchars]) 702 if (!rs[Rs_cutchars])
381 rs[Rs_cutchars] = CUTCHARS; 703 rs[Rs_cutchars] = CUTCHARS;
382 704
383#ifndef NO_BACKSPACE_KEY 705#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 706 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 707# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 708 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 709# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 710 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 711# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 712#endif
398 713
399#ifndef NO_DELETE_KEY 714#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 715 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 716# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 717 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 718# else
404 key_delete = "\033[3~"; 719 rs[Rs_delete_key] = "\033[3~";
405# endif 720# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 721#endif
414 if (rs[Rs_answerbackstring])
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 722
420#ifdef HAVE_SCROLLBARS 723 scrollBar.setup (this);
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif
423 724
424#ifdef XTERM_REVERSE_VIDEO 725#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 726 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 727 if (option (Opt_reverseVideo))
427 { 728 {
428 if (!rs[Rs_color + Color_fg]) 729 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 730 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 731
431 if (!rs[Rs_color + Color_bg]) 732 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 738 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 739 rs[Rs_color + i] = def_colorName[i];
439 740
440#ifndef XTERM_REVERSE_VIDEO 741#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 742 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 743 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 744 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 745#endif
445 746
446 /* convenient aliases for setting fg/bg to colors */ 747 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 748 color_aliases (Color_fg);
448 color_aliases (Color_bg); 749 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 750#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 751 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 752 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 753#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 754 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 755 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 756 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 757#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 758 color_aliases (Color_BD);
458 color_aliases (Color_UL); 759 color_aliases (Color_UL);
459 color_aliases (Color_RV); 760 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 761#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 762
462 if (!rs[Rs_color + Color_border]) 763 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 764 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 765
465 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 ();
466} 888}
467 889
468/*----------------------------------------------------------------------*/ 890/*----------------------------------------------------------------------*/
469void 891void
470rxvt_term::init_env () 892rxvt_term::init_env ()
471{ 893{
472 int i;
473 unsigned int u;
474 char *val; 894 char *val;
475 895
476#ifdef DISPLAY_IS_IP 896#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 897 /* Fixup display_name for export over pty to any interested terminal
478 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 898 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 906 */
487 val = rxvt_network_display (rs[Rs_display_name]); 907 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 908 rs[Rs_display_name] = (const char *)val;
489 909
490 if (val == NULL) 910 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 911#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 912 val = XDisplayString (dpy);
493 913
494 if (rs[Rs_display_name] == NULL) 914 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 915 rs[Rs_display_name] = val; /* use broken `:0' value */
496 916
497 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 917 env_display = (char *)rxvt_malloc (strlen (val) + 9);
499 918
500 sprintf (env_display, "DISPLAY=%s", val); 919 sprintf (env_display, "DISPLAY=%s", val);
501 920
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
503 922
504 /* add entries to the environment: 923 /* add entries to the environment:
505 * @ DISPLAY: in case we started with -display 924 * @ DISPLAY: in case we started with -display
506 * @ WINDOWID: X window id number of the window 925 * @ WINDOWID: X window id number of the window
507 * @ COLORTERM: terminal sub-name and also indicates its color 926 * @ COLORTERM: terminal sub-name and also indicates its color
… …
524 else 943 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 944 putenv ("COLORTERM=" COLORTERMENVFULL);
526 945
527 if (rs[Rs_term_name] != NULL) 946 if (rs[Rs_term_name] != NULL)
528 { 947 {
529 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);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 949 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 950 putenv (env_term);
532 } 951 }
533 else 952 else
534 putenv ("TERM=" TERMENV); 953 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 955#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 956 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 957 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 958 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 959 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 960#endif /* HAVE_UNSETENV */
542} 961}
543 962
544/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
545/* 964/*
546 * This is more or less stolen straight from XFree86 xterm. 965 * This is more or less stolen straight from XFree86 xterm.
… …
567 986
568 this->locale = "C"; 987 this->locale = "C";
569 } 988 }
570 989
571 990
572 this->locale = rxvt_strdup (this->locale); 991 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 992 SET_LOCALE (this->locale);
574 mbstate.reset (); 993 mbstate.reset ();
575#endif 994#endif
576 995
577#if HAVE_NL_LANGINFO 996#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 1040 * Initialize the command connection.
622 * This should be called after the X server connection is established. 1041 * This should be called after the X server connection is established.
623 */ 1042 */
624 1043
625#ifdef META8_OPTION 1044#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1045 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 1046#endif
628 1047
629 get_ourmods (); 1048 get_ourmods ();
630 1049
631 if (!OPTION (Opt_scrollTtyOutput)) 1050 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 1051 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 1052 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 1053 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 1054 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 1055 priv_modes |= PrivMode_smoothScroll;
637 1056
638#ifndef NO_BACKSPACE_KEY 1057#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 1058 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 1059 priv_modes |= PrivMode_HaveBackSpace;
641#endif 1060#endif
642 1061
643 /* add value for scrollBar */ 1062 /* add value for scrollBar */
644 if (scrollBar.state) 1063 if (scrollBar.state)
… …
650 run_command (argv); 1069 run_command (argv);
651} 1070}
652 1071
653/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
654void 1073void
655rxvt_term::Get_Colours () 1074rxvt_term::get_colours ()
656{ 1075{
657 int i; 1076 int i;
658 1077
659#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 1079 pix_colors = pix_colors_focused;
661#endif 1080#endif
662 1081
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 1083 {
665 const char *name = rs[Rs_color + i]; 1084 const char *name = rs[Rs_color + i];
666 1085
667 if (!name) 1086 if (!name)
… …
670 rxvt_color xcol; 1089 rxvt_color xcol;
671 1090
672 if (!set_color (xcol, name)) 1091 if (!set_color (xcol, name))
673 { 1092 {
674#ifndef XTERM_REVERSE_VIDEO 1093#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 1094 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 1095 name = def_colorName [1 - i];
677 else 1096 else
678#endif 1097#endif
679 name = def_colorName [i]; 1098 name = def_colorName [i];
680 1099
… …
720 * get scrollBar shadow colors 1139 * get scrollBar shadow colors
721 * 1140 *
722 * The calculations of topShadow/bottomShadow values are adapted 1141 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 1142 * from the fvwm window manager.
724 */ 1143 */
725#ifdef KEEP_SCROLLCOLOR 1144#ifdef RXVT_SCROLLBAR
726 if (depth <= 2) 1145 if (depth <= 2)
727 { 1146 {
728 /* Monochrome */ 1147 /* Monochrome */
729 alias_color (Color_scroll, Color_fg); 1148 alias_color (Color_scroll, Color_fg);
730 alias_color (Color_topShadow, Color_bg); 1149 alias_color (Color_topShadow, Color_bg);
… …
745 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),
746 cscroll.a) 1165 cscroll.a)
747 )) 1166 ))
748 alias_color (Color_topShadow, Color_White); 1167 alias_color (Color_topShadow, Color_White);
749 } 1168 }
750#endif /* KEEP_SCROLLCOLOR */ 1169#endif
751 1170
752#ifdef OFF_FOCUS_FADING 1171#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i); 1173 update_fade_color (i);
755#endif 1174#endif
… …
763 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764 { 1183 {
765 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
766 1185
767 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
768 { /* bright colors */ 1187 /* bright colors */
769 i -= 8;
770 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1188 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771 return; 1189 else if (i >= 0 && i <= 7)
772 } 1190 /* normal colors */
773
774 if (i >= 0 && i <= 7) /* normal colors */
775 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1191 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776 } 1192 }
777} 1193}
778 1194
779/*----------------------------------------------------------------------*/ 1195/*----------------------------------------------------------------------*/
… …
863 1279
864 if (i) 1280 if (i)
865 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
866} 1282}
867 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
868/*----------------------------------------------------------------------*/ 1396/*----------------------------------------------------------------------*/
869/* rxvt_Create_Windows () - Open and map the window */ 1397/* rxvt_Create_Windows () - Open and map the window */
870void 1398void
871rxvt_term::create_windows (int argc, const char *const *argv) 1399rxvt_term::create_windows (int argc, const char *const *argv)
872{ 1400{
873 XClassHint classHint; 1401 XClassHint classHint;
874 XWMHints wmHint; 1402 XWMHints wmHint;
875#if ENABLE_FRILLS 1403#if ENABLE_FRILLS
876 MWMHints mwmhints; 1404 MWMHints mwmhints = { };
877#endif 1405#endif
878 XGCValues gcvalue; 1406 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 1407 XSetWindowAttributes attributes;
880 Window top, parent; 1408 Window top, parent;
881 1409
882 dLocal (Display *, dpy); 1410 dLocal (Display *, dpy);
883 1411
884 /* grab colors before netscape does */ 1412 /* grab colors before netscape does */
885 Get_Colours (); 1413 get_colours ();
886 1414
887 if (!set_fonts ()) 1415 if (!set_fonts ())
888 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");
889 1417
890 parent = display->root; 1418 parent = display->root;
891 1419
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1420 attributes.override_redirect = !!option (Opt_override_redirect);
893 1421
894#if ENABLE_FRILLS 1422#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 1423 if (option (Opt_borderLess))
896 { 1424 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1425 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 1426 {
899 /* 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");
900 attributes.override_redirect = true; 1428 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 1429 }
903 else 1430 else
904 { 1431 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 1432 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 1433 }
908 } 1434 }
909 else
910 mwmhints.flags = 0;
911#endif 1435#endif
912 1436
913#if ENABLE_XEMBED 1437#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 1438 if (rs[Rs_embed])
915 { 1439 {
… …
937 ext_bwidth, 1461 ext_bwidth,
938 depth, InputOutput, visual, 1462 depth, InputOutput, visual,
939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
940 &attributes); 1464 &attributes);
941 1465
942 this->parent[0] = top; 1466 this->parent = top;
943 1467
944 old_width = szHint.width; 1468 old_width = szHint.width;
945 old_height = szHint.height; 1469 old_height = szHint.height;
946 1470
947 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1471 set_title (rs [Rs_title]);
948 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1472 set_icon_name (rs [Rs_iconName]);
949 1473
950 classHint.res_name = (char *)rs[Rs_name]; 1474 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1475 classHint.res_class = (char *)RESCLASS;
952 1476
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1477 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1478 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1479 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1480 wmHint.window_group = top;
957 1481
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1482 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &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
960 1495
961#if ENABLE_FRILLS 1496#if ENABLE_FRILLS
962 if (mwmhints.flags) 1497 if (mwmhints.flags)
963 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,
964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1499 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
969#if ENABLE_EWMH 1504#if ENABLE_EWMH
970 xa[XA_NET_WM_PING], 1505 xa[XA_NET_WM_PING],
971#endif 1506#endif
972 }; 1507 };
973 1508
974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
975 1510
976#if ENABLE_FRILLS 1511#if ENABLE_FRILLS
977 if (rs[Rs_transient_for]) 1512 if (rs[Rs_transient_for])
978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
979#endif 1514#endif
… …
998 1533
999 termwin_ev.start (display, top); 1534 termwin_ev.start (display, top);
1000 1535
1001 /* 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 */
1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1537 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1003
1004#ifdef HAVE_SCROLLBARS
1005 /* cursor scrollBar: Black-on-White */
1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1007#endif
1008 1538
1009 /* the vt window */ 1539 /* the vt window */
1010 vt = XCreateSimpleWindow (dpy, top, 1540 vt = XCreateSimpleWindow (dpy, top,
1011 window_vt_x, window_vt_y, 1541 window_vt_x, window_vt_y,
1012 width, height, 1542 width, height,
… …
1017 attributes.bit_gravity = NorthWestGravity; 1547 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1548 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1549
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1550 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1551
1022 if (OPTION (Opt_pointerBlank)) 1552 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1553 vt_emask |= PointerMotionMask;
1024 else 1554 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1555 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1556
1027 vt_select_input (); 1557 vt_select_input ();
1028 1558
1029 vt_ev.start (display, vt); 1559 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1560
1048 /* graphics context for the vt window */ 1561 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1562 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1563 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1564 gcvalue.graphics_exposures = 0;
… …
1054 GCForeground | GCBackground | GCGraphicsExposures, 1567 GCForeground | GCBackground | GCGraphicsExposures,
1055 &gcvalue); 1568 &gcvalue);
1056 1569
1057 drawable = new rxvt_drawable (this, vt); 1570 drawable = new rxvt_drawable (this, vt);
1058 1571
1059#ifdef RXVT_SCROLLBAR
1060 gcvalue.foreground = pix_colors[Color_topShadow];
1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1066#endif
1067
1068#ifdef OFF_FOCUS_FADING 1572#ifdef OFF_FOCUS_FADING
1069 // initially we are in unfocused state 1573 // initially we are in unfocused state
1070 if (rs[Rs_fade]) 1574 if (rs[Rs_fade])
1071 pix_colors = pix_colors_unfocused; 1575 pix_colors = pix_colors_unfocused;
1072#endif 1576#endif
1073 1577
1074 pointer_unblank (); 1578 pointer_unblank ();
1075 scr_recolour (); 1579 scr_recolour ();
1076}
1077
1078/* ------------------------------------------------------------------------- *
1079 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */
1081void
1082rxvt_get_ttymode (ttymode_t *tio, int erase)
1083{
1084 /*
1085 * standard System V termios interface
1086 */
1087 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1088 {
1089 // return error - use system defaults,
1090 // where possible, and zero elsewhere
1091 memset (tio, 0, sizeof (ttymode_t));
1092
1093 tio->c_cc[VINTR] = CINTR;
1094 tio->c_cc[VQUIT] = CQUIT;
1095 tio->c_cc[VERASE] = CERASE;
1096#ifdef VERASE2
1097 tio->c_cc[VERASE2] = CERASE2;
1098#endif
1099 tio->c_cc[VKILL] = CKILL;
1100 tio->c_cc[VSTART] = CSTART;
1101 tio->c_cc[VSTOP] = CSTOP;
1102 tio->c_cc[VSUSP] = CSUSP;
1103# ifdef VDSUSP
1104 tio->c_cc[VDSUSP] = CDSUSP;
1105# endif
1106# ifdef VREPRINT
1107 tio->c_cc[VREPRINT] = CRPRNT;
1108# endif
1109# ifdef VDISCRD
1110 tio->c_cc[VDISCRD] = CFLUSH;
1111# endif
1112# ifdef VWERSE
1113 tio->c_cc[VWERSE] = CWERASE;
1114# endif
1115# ifdef VLNEXT
1116 tio->c_cc[VLNEXT] = CLNEXT;
1117# endif
1118 }
1119
1120 tio->c_cc[VEOF] = CEOF;
1121 tio->c_cc[VEOL] = VDISABLE;
1122# ifdef VEOL2
1123 tio->c_cc[VEOL2] = VDISABLE;
1124# endif
1125# ifdef VSWTC
1126 tio->c_cc[VSWTC] = VDISABLE;
1127# endif
1128# ifdef VSWTCH
1129 tio->c_cc[VSWTCH] = VDISABLE;
1130# endif
1131# if VMIN != VEOF
1132 tio->c_cc[VMIN] = 1;
1133# endif
1134# if VTIME != VEOL
1135 tio->c_cc[VTIME] = 0;
1136# endif
1137
1138 if (erase != -1)
1139 tio->c_cc[VERASE] = (char)erase;
1140
1141 /* input modes */
1142 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1143# ifdef IMAXBEL
1144 | IMAXBEL
1145# endif
1146 | IXON);
1147
1148 /* output modes */
1149 tio->c_oflag = (OPOST | ONLCR);
1150
1151 /* control modes */
1152 tio->c_cflag = (CS8 | CREAD);
1153
1154 /* line discipline modes */
1155 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1156# if defined (ECHOCTL) && defined (ECHOKE)
1157 | ECHOCTL | ECHOKE
1158# endif
1159 | ECHOE | ECHOK);
1160
1161 /*
1162 * Debugging
1163 */
1164#ifdef DEBUG_TTYMODE
1165#ifdef HAVE_TERMIOS_H
1166 /* c_iflag bits */
1167 fprintf (stderr, "Input flags\n");
1168
1169 /* cpp token stringize doesn't work on all machines <sigh> */
1170# define FOO(flag,name) \
1171 if ((tio->c_iflag) & flag) \
1172 fprintf (stderr, "%s ", name)
1173
1174 /* c_iflag bits */
1175 FOO (IGNBRK, "IGNBRK");
1176 FOO (BRKINT, "BRKINT");
1177 FOO (IGNPAR, "IGNPAR");
1178 FOO (PARMRK, "PARMRK");
1179 FOO (INPCK, "INPCK");
1180 FOO (ISTRIP, "ISTRIP");
1181 FOO (INLCR, "INLCR");
1182 FOO (IGNCR, "IGNCR");
1183 FOO (ICRNL, "ICRNL");
1184 FOO (IXON, "IXON");
1185 FOO (IXOFF, "IXOFF");
1186# ifdef IUCLC
1187 FOO (IUCLC, "IUCLC");
1188# endif
1189# ifdef IXANY
1190 FOO (IXANY, "IXANY");
1191# endif
1192# ifdef IMAXBEL
1193 FOO (IMAXBEL, "IMAXBEL");
1194# endif
1195
1196 fprintf (stderr, "\n");
1197
1198# undef FOO
1199# define FOO(entry, name) \
1200 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1201
1202 FOO (VINTR, "VINTR");
1203 FOO (VQUIT, "VQUIT");
1204 FOO (VERASE, "VERASE");
1205 FOO (VKILL, "VKILL");
1206 FOO (VEOF, "VEOF");
1207 FOO (VEOL, "VEOL");
1208# ifdef VEOL2
1209 FOO (VEOL2, "VEOL2");
1210# endif
1211# ifdef VSWTC
1212 FOO (VSWTC, "VSWTC");
1213# endif
1214# ifdef VSWTCH
1215 FOO (VSWTCH, "VSWTCH");
1216# endif
1217 FOO (VSTART, "VSTART");
1218 FOO (VSTOP, "VSTOP");
1219 FOO (VSUSP, "VSUSP");
1220# ifdef VDSUSP
1221 FOO (VDSUSP, "VDSUSP");
1222# endif
1223# ifdef VREPRINT
1224 FOO (VREPRINT, "VREPRINT");
1225# endif
1226# ifdef VDISCRD
1227 FOO (VDISCRD, "VDISCRD");
1228# endif
1229# ifdef VWERSE
1230 FOO (VWERSE, "VWERSE");
1231# endif
1232# ifdef VLNEXT
1233 FOO (VLNEXT, "VLNEXT");
1234# endif
1235
1236 fprintf (stderr, "\n");
1237# undef FOO
1238# endif /* HAVE_TERMIOS_H */
1239#endif /* DEBUG_TTYMODE */
1240} 1580}
1241 1581
1242/*----------------------------------------------------------------------*/ 1582/*----------------------------------------------------------------------*/
1243/* 1583/*
1244 * 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
… …
1265 else 1605 else
1266#endif 1606#endif
1267 if (!pty->get ()) 1607 if (!pty->get ())
1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1608 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269 1609
1270 int er; 1610 struct termios tio = def_tio;
1271 1611
1272#ifndef NO_BACKSPACE_KEY 1612#ifndef NO_BACKSPACE_KEY
1273 if (key_backspace[0] && !key_backspace[1]) 1613 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274 er = key_backspace[0]; 1614 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1275 else if (strcmp (key_backspace, "DEC") == 0) 1615 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276 er = '\177'; /* the initial state anyway */ 1616 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1277 else
1278#endif 1617#endif
1279 er = -1;
1280 1618
1281 rxvt_get_ttymode (&tio, er); 1619 /* init terminal attributes */
1282 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1620 cfsetospeed (&tio, BAUDRATE);
1621 cfsetispeed (&tio, BAUDRATE);
1622 tcsetattr (pty->tty, TCSANOW, &tio);
1283 pty->set_utf8_mode (enc_utf8); 1623 pty->set_utf8_mode (enc_utf8);
1284 1624
1285 /* set initial window size */ 1625 /* set initial window size */
1286 tt_winch (); 1626 tt_winch ();
1287 1627
… …
1322 } 1662 }
1323 1663
1324 _exit (EXIT_FAILURE); 1664 _exit (EXIT_FAILURE);
1325 1665
1326 default: 1666 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1667 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1668 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1669
1330 pty->close_tty (); 1670 pty->close_tty ();
1331 1671
1332 child_ev.start (cmd_pid); 1672 child_ev.start (cmd_pid);
1333 1673
… …
1346int 1686int
1347rxvt_term::run_child (const char *const *argv) 1687rxvt_term::run_child (const char *const *argv)
1348{ 1688{
1349 char *login; 1689 char *login;
1350 1690
1351 if (OPTION (Opt_console)) 1691 if (option (Opt_console))
1692 {
1352 { /* be virtual console, fail silently */ 1693 /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1694#ifdef TIOCCONS
1354 unsigned int on = 1; 1695 unsigned int on = 1;
1355 1696
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1697 ioctl (STDIN_FILENO, TIOCCONS, &on);
1357#elif defined (SRIOCSREDIR) 1698#elif defined (SRIOCSREDIR)
… …
1359 1700
1360 fd = open (CONSOLE, O_WRONLY, 0); 1701 fd = open (CONSOLE, O_WRONLY, 0);
1361 if (fd >= 0) 1702 if (fd >= 0)
1362 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1703 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1363 close (fd); 1704 close (fd);
1364#endif /* SRIOCSREDIR */ 1705#endif /* SRIOCSREDIR */
1365 } 1706 }
1366 1707
1367 /* reset signals and spin off the command interpreter */ 1708 /* reset signals and spin off the command interpreter */
1368 signal (SIGINT, SIG_DFL); 1709 signal (SIGINT, SIG_DFL);
1369 signal (SIGQUIT, SIG_DFL); 1710 signal (SIGQUIT, SIG_DFL);
1370 signal (SIGCHLD, SIG_DFL); 1711 signal (SIGCHLD, SIG_DFL);
1371 signal (SIGHUP, SIG_DFL); 1712 signal (SIGHUP, SIG_DFL);
1372 signal (SIGPIPE, SIG_DFL); 1713 signal (SIGPIPE, SIG_DFL);
1373 /* 1714 /*
1374 * mimick login's behavior by disabling the job control signals 1715 * mimic login's behavior by disabling the job control signals
1375 * a shell that wants them can turn them back on 1716 * a shell that wants them can turn them back on
1376 */ 1717 */
1377#ifdef SIGTSTP 1718#ifdef SIGTSTP
1378 signal (SIGTSTP, SIG_IGN); 1719 signal (SIGTSTP, SIG_IGN);
1379 signal (SIGTTIN, SIG_IGN); 1720 signal (SIGTTIN, SIG_IGN);
1380 signal (SIGTTOU, SIG_IGN); 1721 signal (SIGTTOU, SIG_IGN);
1381#endif /* SIGTSTP */ 1722#endif /* SIGTSTP */
1382
1383 // unblock signals (signals are blocked by iom.C
1384 sigset_t ss;
1385 sigemptyset (&ss);
1386 sigprocmask (SIG_SETMASK, &ss, 0);
1387 1723
1388 /* command interpreter path */ 1724 /* command interpreter path */
1389 if (argv != NULL) 1725 if (argv)
1390 { 1726 {
1391# ifdef DEBUG_CMD 1727# ifdef DEBUG_CMD
1392 int i; 1728 int i;
1393 1729
1394 for (i = 0; argv[i]; i++) 1730 for (i = 0; argv[i]; i++)
… …
1403 const char *argv0, *shell; 1739 const char *argv0, *shell;
1404 1740
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1741 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1742 shell = "/bin/sh";
1407 1743
1408 argv0 = (const char *)rxvt_r_basename (shell); 1744 argv0 = rxvt_basename (shell);
1409 1745
1410 if (OPTION (Opt_loginShell)) 1746 if (option (Opt_loginShell))
1411 { 1747 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1748 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413 1749
1414 login[0] = '-'; 1750 login[0] = '-';
1415 strcpy (&login[1], argv0); 1751 strcpy (&login[1], argv0);
1416 argv0 = login; 1752 argv0 = login;
1417 } 1753 }
1418 1754
1419 execlp (shell, argv0, NULL); 1755 execlp (shell, argv0, (char *)0);
1420 /* no error message: STDERR is closed! */ 1756 /* no error message: STDERR is closed! */
1421 } 1757 }
1422 1758
1423 return -1; 1759 return -1;
1424} 1760}

Diff Legend

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