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.181 by ayin, Tue May 1 21:10:04 2007 UTC vs.
Revision 1.288 by sf-exg, Sat Dec 18 18:17:38 2010 UTC

… …
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
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 want_refresh = 1; 536 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
196 ncol = 80; 538 ncol = 80;
197 nrow = 24; 539 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
201 saveLines = SAVELINES; 544 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 545
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
206 547
207 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213 549
214 last_bot = last_state = -1;
215
216 set_option (Opt_scrollBar, 1); 550 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput, 1); 551 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll, 1); 552 set_option (Opt_jumpScroll);
553 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen, 1); 554 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll, 1); 555 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs, 1); 556 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles, 1); 557 set_option (Opt_intensityStyles);
223 558 set_option (Opt_iso14755);
224 return true; 559 set_option (Opt_iso14755_52);
225} 560 set_option (Opt_buffered);
226
227void
228rxvt_term::init_secondary ()
229{
230 int i;
231
232 /*
233 * Close all unused file descriptors
234 * We don't want them, we don't need them.
235 */
236 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 {
238 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO);
240 }
241 else if (i > STDIN_FILENO)
242 {
243 dup2 (i, STDIN_FILENO);
244 close (i);
245 }
246
247 dup2 (STDERR_FILENO, STDOUT_FILENO);
248
249#if 0 // schmorp sayz closing filies is murder
250 for (i = STDERR_FILENO + 1; i < num_fds; i++)
251 {
252#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
253 if (i == 4 || i == 7)
254 continue;
255#endif
256 close (i);
257 }
258#endif
259} 561}
260 562
261/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
262const char ** 564const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
264{ 566{
265 int i, r_argc; 567 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
268 569
269 /* 570 /*
270 * 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
271 */ 572 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
274 break; 575 break;
275 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
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 592
278 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
280 595
281 r_argv[i] = NULL; 596 r_argv[i] = NULL;
282 597
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
296 599
297 /* 600 /*
298 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
299 */ 602 */
300 603
… …
302 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
303 606
304 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
305 608
306 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
307 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 }
308 614
309 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
310 xa = display->xa; 616 xa = display->xa;
311 617
312 set (display); 618 set (display);
… …
320 free (r_argv); 626 free (r_argv);
321 627
322 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
324 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
325 640
326#if ENABLE_PERL 641#if ENABLE_PERL
327 if (!rs[Rs_perl_ext_1]) 642 if (!rs[Rs_perl_ext_1])
328 rs[Rs_perl_ext_1] = "default"; 643 rs[Rs_perl_ext_1] = "default";
329 644
… …
340 * set any defaults not already set 655 * set any defaults not already set
341 */ 656 */
342 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
343 { 658 {
344 if (!rs[Rs_title]) 659 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 660 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
661
346 if (!rs[Rs_iconName]) 662 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 663 rs[Rs_iconName] = rs[Rs_title];
348 } 664 }
349 else 665 else
350 { 666 {
351 if (!rs[Rs_title]) 667 if (!rs[Rs_title])
352 rs[Rs_title] = rs[Rs_name]; 668 rs[Rs_title] = rs[Rs_name];
669
353 if (!rs[Rs_iconName]) 670 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_name]; 671 rs[Rs_iconName] = rs[Rs_name];
355 } 672 }
356 673
357 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 674 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
364 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)
365 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 682 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
366 683
367 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 684 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
368 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]);
369#endif 689#endif
370 690
371#ifdef POINTER_BLANK 691#ifdef POINTER_BLANK
372 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
373 pointerBlankDelay = i; 693 pointerBlankDelay = i;
… …
377 697
378 /* no point having a scrollbar without having any scrollback! */ 698 /* no point having a scrollbar without having any scrollback! */
379 if (!saveLines) 699 if (!saveLines)
380 set_option (Opt_scrollBar, 0); 700 set_option (Opt_scrollBar, 0);
381 701
382#ifdef PRINTPIPE
383 if (!rs[Rs_print_pipe])
384 rs[Rs_print_pipe] = PRINTPIPE;
385#endif
386
387 if (!rs[Rs_cutchars]) 702 if (!rs[Rs_cutchars])
388 rs[Rs_cutchars] = CUTCHARS; 703 rs[Rs_cutchars] = CUTCHARS;
389 704
390#ifndef NO_BACKSPACE_KEY 705#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 706 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 707# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 708 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 709# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 710 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 711# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 712#endif
405 713
406#ifndef NO_DELETE_KEY 714#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 715 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 716# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 717 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 718# else
411 key_delete = "\033[3~"; 719 rs[Rs_delete_key] = "\033[3~";
412# endif 720# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 721#endif
421 if (rs[Rs_answerbackstring])
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426 722
427#ifdef HAVE_SCROLLBARS 723 scrollBar.setup (this);
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif
430 724
431#ifdef XTERM_REVERSE_VIDEO 725#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 726 /* this is how xterm implements reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 727 if (option (Opt_reverseVideo))
434 { 728 {
435 if (!rs[Rs_color + Color_fg]) 729 if (!rs[Rs_color + Color_fg])
436 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 730 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437 731
438 if (!rs[Rs_color + Color_bg]) 732 if (!rs[Rs_color + Color_bg])
… …
444 if (!rs[Rs_color + i]) 738 if (!rs[Rs_color + i])
445 rs[Rs_color + i] = def_colorName[i]; 739 rs[Rs_color + i] = def_colorName[i];
446 740
447#ifndef XTERM_REVERSE_VIDEO 741#ifndef XTERM_REVERSE_VIDEO
448 /* this is how we implement reverseVideo */ 742 /* this is how we implement reverseVideo */
449 if (OPTION (Opt_reverseVideo)) 743 if (option (Opt_reverseVideo))
450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 744 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
451#endif 745#endif
452 746
453 /* convenient aliases for setting fg/bg to colors */ 747 /* convenient aliases for setting fg/bg to colors */
454 color_aliases (Color_fg); 748 color_aliases (Color_fg);
455 color_aliases (Color_bg); 749 color_aliases (Color_bg);
456#ifndef NO_CURSORCOLOR 750#ifndef NO_CURSORCOLOR
457 color_aliases (Color_cursor); 751 color_aliases (Color_cursor);
458 color_aliases (Color_cursor2); 752 color_aliases (Color_cursor2);
459#endif /* NO_CURSORCOLOR */ 753#endif /* NO_CURSORCOLOR */
460 color_aliases (Color_pointer_fg); 754 color_aliases (Color_pointer_fg);
461 color_aliases (Color_pointer_bg); 755 color_aliases (Color_pointer_bg);
462 color_aliases (Color_border); 756 color_aliases (Color_border);
463#ifndef NO_BOLD_UNDERLINE_REVERSE 757#ifndef NO_BOLD_UNDERLINE_REVERSE
464 color_aliases (Color_BD); 758 color_aliases (Color_BD);
465 color_aliases (Color_UL); 759 color_aliases (Color_UL);
466 color_aliases (Color_RV); 760 color_aliases (Color_RV);
467#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 761#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468 762
469 if (!rs[Rs_color + Color_border]) 763 if (!rs[Rs_color + Color_border])
470 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 764 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471 765
472 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 bgPixmap.set_target (this);
817 bgPixmap.invalidate ();
818
819#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent))
821 {
822 bgPixmap.set_transparent ();
823
824 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
826
827 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
829
830 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]);
832
833 bgPixmap.set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root);
836 }
837#endif
838
839#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap])
841 {
842 const char *p = rs[Rs_backgroundPixmap];
843
844 if ((p = strchr (p, ';')) != 0)
845 {
846 p++;
847 bgPixmap.set_geometry (p);
848 }
849 else
850 bgPixmap.set_defaultGeometry ();
851
852 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ())
854 update_background ();
855 }
856#endif
857 }
858#endif
859
860#if ENABLE_PERL
861 rootwin_ev.start (display, display->root);
862#endif
863
864 set_colorfgbg ();
865
866 init_command (cmd_argv);
867
868 free (cmd_argv);
869
870 if (pty->pty >= 0)
871 pty_ev.start (pty->pty, ev::READ);
872
873 HOOK_INVOKE ((this, HOOK_START, DT_END));
874
875#if ENABLE_XEMBED
876 if (rs[Rs_embed])
877 {
878 long info[2] = { 0, XEMBED_MAPPED };
879
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2);
882 }
883#endif
884
885 XMapWindow (dpy, vt);
886 XMapWindow (dpy, parent[0]);
887
888 refresh_check ();
473} 889}
474 890
475/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
476void 892void
477rxvt_term::init_env () 893rxvt_term::init_env ()
478{ 894{
479 int i;
480 unsigned int u;
481 char *val; 895 char *val;
482 896
483#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
493 */ 907 */
494 val = rxvt_network_display (rs[Rs_display_name]); 908 val = rxvt_network_display (rs[Rs_display_name]);
495 rs[Rs_display_name] = (const char *)val; 909 rs[Rs_display_name] = (const char *)val;
496 910
497 if (val == NULL) 911 if (val == NULL)
498#endif /* DISPLAY_IS_IP */ 912#endif /* DISPLAY_IS_IP */
499 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
500 914
501 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
503 917
504 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
506 919
507 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
508 921
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 923
… …
531 else 944 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 945 putenv ("COLORTERM=" COLORTERMENVFULL);
533 946
534 if (rs[Rs_term_name] != NULL) 947 if (rs[Rs_term_name] != NULL)
535 { 948 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 949 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 950 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 951 putenv (env_term);
539 } 952 }
540 else 953 else
541 putenv ("TERM=" TERMENV); 954 putenv ("TERM=" TERMENV);
… …
543#ifdef HAVE_UNSETENV 956#ifdef HAVE_UNSETENV
544 /* avoid passing old settings and confusing term size */ 957 /* avoid passing old settings and confusing term size */
545 unsetenv ("LINES"); 958 unsetenv ("LINES");
546 unsetenv ("COLUMNS"); 959 unsetenv ("COLUMNS");
547 unsetenv ("TERMCAP"); /* terminfo should be okay */ 960 unsetenv ("TERMCAP"); /* terminfo should be okay */
548#endif /* HAVE_UNSETENV */ 961#endif /* HAVE_UNSETENV */
549} 962}
550 963
551/*----------------------------------------------------------------------*/ 964/*----------------------------------------------------------------------*/
552/* 965/*
553 * This is more or less stolen straight from XFree86 xterm. 966 * This is more or less stolen straight from XFree86 xterm.
… …
574 987
575 this->locale = "C"; 988 this->locale = "C";
576 } 989 }
577 990
578 991
579 this->locale = rxvt_strdup (this->locale); 992 this->locale = strdup (this->locale);
580 SET_LOCALE (this->locale); 993 SET_LOCALE (this->locale);
581 mbstate.reset (); 994 mbstate.reset ();
582#endif 995#endif
583 996
584#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
… …
628 * Initialize the command connection. 1041 * Initialize the command connection.
629 * This should be called after the X server connection is established. 1042 * This should be called after the X server connection is established.
630 */ 1043 */
631 1044
632#ifdef META8_OPTION 1045#ifdef META8_OPTION
633 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1046 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
634#endif 1047#endif
635 1048
636 get_ourmods (); 1049 get_ourmods ();
637 1050
638 if (!OPTION (Opt_scrollTtyOutput)) 1051 if (!option (Opt_scrollTtyOutput))
639 priv_modes |= PrivMode_TtyOutputInh; 1052 priv_modes |= PrivMode_TtyOutputInh;
640 if (OPTION (Opt_scrollTtyKeypress)) 1053 if (option (Opt_scrollTtyKeypress))
641 priv_modes |= PrivMode_Keypress; 1054 priv_modes |= PrivMode_Keypress;
642 if (!OPTION (Opt_jumpScroll)) 1055 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 1056 priv_modes |= PrivMode_smoothScroll;
644 1057
645#ifndef NO_BACKSPACE_KEY 1058#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 1059 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 1060 priv_modes |= PrivMode_HaveBackSpace;
648#endif 1061#endif
649 1062
650 /* add value for scrollBar */ 1063 /* add value for scrollBar */
651 if (scrollBar.state) 1064 if (scrollBar.state)
… …
657 run_command (argv); 1070 run_command (argv);
658} 1071}
659 1072
660/*----------------------------------------------------------------------*/ 1073/*----------------------------------------------------------------------*/
661void 1074void
662rxvt_term::Get_Colours () 1075rxvt_term::get_colours ()
663{ 1076{
664 int i; 1077 int i;
665 1078
666#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
667 pix_colors = pix_colors_focused; 1080 pix_colors = pix_colors_focused;
668#endif 1081#endif
669 1082
670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1083 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671 { 1084 {
672 const char *name = rs[Rs_color + i]; 1085 const char *name = rs[Rs_color + i];
673 1086
674 if (!name) 1087 if (!name)
… …
677 rxvt_color xcol; 1090 rxvt_color xcol;
678 1091
679 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
680 { 1093 {
681#ifndef XTERM_REVERSE_VIDEO 1094#ifndef XTERM_REVERSE_VIDEO
682 if (i < 2 && OPTION (Opt_reverseVideo)) 1095 if (i < 2 && option (Opt_reverseVideo))
683 name = def_colorName [1 - i]; 1096 name = def_colorName [1 - i];
684 else 1097 else
685#endif 1098#endif
686 name = def_colorName [i]; 1099 name = def_colorName [i];
687 1100
… …
727 * get scrollBar shadow colors 1140 * get scrollBar shadow colors
728 * 1141 *
729 * The calculations of topShadow/bottomShadow values are adapted 1142 * The calculations of topShadow/bottomShadow values are adapted
730 * from the fvwm window manager. 1143 * from the fvwm window manager.
731 */ 1144 */
732#ifdef KEEP_SCROLLCOLOR 1145#ifdef RXVT_SCROLLBAR
733 if (depth <= 2) 1146 if (depth <= 2)
734 { 1147 {
735 /* Monochrome */ 1148 /* Monochrome */
736 alias_color (Color_scroll, Color_fg); 1149 alias_color (Color_scroll, Color_fg);
737 alias_color (Color_topShadow, Color_bg); 1150 alias_color (Color_topShadow, Color_bg);
… …
752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1165 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753 cscroll.a) 1166 cscroll.a)
754 )) 1167 ))
755 alias_color (Color_topShadow, Color_White); 1168 alias_color (Color_topShadow, Color_White);
756 } 1169 }
757#endif /* KEEP_SCROLLCOLOR */ 1170#endif
758 1171
759#ifdef OFF_FOCUS_FADING 1172#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1173 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i); 1174 update_fade_color (i);
762#endif 1175#endif
… …
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 1184 {
772 int i = atoi (rs[Rs_color + idx]); 1185 int i = atoi (rs[Rs_color + idx]);
773 1186
774 if (i >= 8 && i <= 15) 1187 if (i >= 8 && i <= 15)
775 { /* bright colors */ 1188 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1189 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 1190 else if (i >= 0 && i <= 7)
779 } 1191 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1192 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 1193 }
784} 1194}
785 1195
786/*----------------------------------------------------------------------*/ 1196/*----------------------------------------------------------------------*/
… …
870 1280
871 if (i) 1281 if (i)
872 ModMetaMask = modmasks[i - 1]; 1282 ModMetaMask = modmasks[i - 1];
873} 1283}
874 1284
1285void
1286rxvt_term::set_icon (const char *file)
1287{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf)
1342 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return;
1345 }
1346
1347 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1348 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1349
1350 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1351 {
1352 rxvt_warn ("Icon image too big, continuing without.\n");
1353 g_object_unref (pixbuf);
1354 return;
1355 }
1356
1357 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1358 {
1359 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1360 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1361 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1362
1363 buffer [0] = w;
1364 buffer [1] = h;
1365 for (int i = 0; i < h; i++)
1366 {
1367 for (int j = 0; j < w; j++)
1368 {
1369 unsigned char *pixel = row + j * channels;
1370 long value;
1371
1372 if (channels == 4)
1373 value = pixel[3];
1374 else
1375 value = (unsigned char)0x00ff;
1376
1377 value = (value << 8) + pixel[0];
1378 value = (value << 8) + pixel[1];
1379 value = (value << 8) + pixel[2];
1380 buffer[(i * w + j) + 2] = value;
1381 }
1382
1383 row += rowstride;
1384 }
1385
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer);
1389 }
1390 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1392
1393 g_object_unref (pixbuf);
1394#endif
1395}
1396
875/*----------------------------------------------------------------------*/ 1397/*----------------------------------------------------------------------*/
876/* rxvt_Create_Windows () - Open and map the window */ 1398/* rxvt_Create_Windows () - Open and map the window */
877void 1399void
878rxvt_term::create_windows (int argc, const char *const *argv) 1400rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1401{
880 XClassHint classHint; 1402 XClassHint classHint;
881 XWMHints wmHint; 1403 XWMHints wmHint;
882#if ENABLE_FRILLS 1404#if ENABLE_FRILLS
883 MWMHints mwmhints; 1405 MWMHints mwmhints = { };
884#endif 1406#endif
885 XGCValues gcvalue; 1407 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1408 XSetWindowAttributes attributes;
887 Window top, parent; 1409 Window top, parent;
888 1410
889 dLocal (Display *, dpy); 1411 dLocal (Display *, dpy);
890 1412
891 /* grab colors before netscape does */ 1413 /* grab colors before netscape does */
892 Get_Colours (); 1414 get_colours ();
893 1415
894 if (!set_fonts ()) 1416 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1417 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 1418
897 parent = display->root; 1419 parent = display->root;
898 1420
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1421 attributes.override_redirect = !!option (Opt_override_redirect);
900 1422
901#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 1424 if (option (Opt_borderLess))
903 { 1425 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1426 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1427 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1428 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1429 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1430 }
910 else 1431 else
911 { 1432 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1433 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1434 }
915 } 1435 }
916 else
917 mwmhints.flags = 0;
918#endif 1436#endif
919 1437
920#if ENABLE_XEMBED 1438#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1439 if (rs[Rs_embed])
922 { 1440 {
… …
949 this->parent[0] = top; 1467 this->parent[0] = top;
950 1468
951 old_width = szHint.width; 1469 old_width = szHint.width;
952 old_height = szHint.height; 1470 old_height = szHint.height;
953 1471
954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1472 set_title (rs [Rs_title]);
955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1473 set_icon_name (rs [Rs_iconName]);
956 1474
957 classHint.res_name = (char *)rs[Rs_name]; 1475 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1476 classHint.res_class = (char *)RESCLASS;
959 1477
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1478 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 1479 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1481 wmHint.window_group = top;
964 1482
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1484 &szHint, &wmHint, &classHint);
1485#if ENABLE_EWMH
1486 /*
1487 * set up icon hint
1488 * rs [Rs_iconfile] is path to icon
1489 */
1490
1491 if (rs [Rs_iconfile])
1492 {
1493 set_icon (rs [Rs_iconfile]);
1494 }
1495#endif
967 1496
968#if ENABLE_FRILLS 1497#if ENABLE_FRILLS
969 if (mwmhints.flags) 1498 if (mwmhints.flags)
970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1499 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1500 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
976#if ENABLE_EWMH 1505#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 1506 xa[XA_NET_WM_PING],
978#endif 1507#endif
979 }; 1508 };
980 1509
981 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
982 1511
983#if ENABLE_FRILLS 1512#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 1513 if (rs[Rs_transient_for])
985 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 1515#endif
… …
1005 1534
1006 termwin_ev.start (display, top); 1535 termwin_ev.start (display, top);
1007 1536
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1537 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif
1015 1539
1016 /* the vt window */ 1540 /* the vt window */
1017 vt = XCreateSimpleWindow (dpy, top, 1541 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1542 window_vt_x, window_vt_y,
1019 width, height, 1543 width, height,
… …
1024 attributes.bit_gravity = NorthWestGravity; 1548 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1549 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1550
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1551 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1552
1029 if (OPTION (Opt_pointerBlank)) 1553 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1554 vt_emask |= PointerMotionMask;
1031 else 1555 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1556 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1557
1034 vt_select_input (); 1558 vt_select_input ();
1035 1559
1036 vt_ev.start (display, vt); 1560 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054 1561
1055 /* graphics context for the vt window */ 1562 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1563 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1564 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 0; 1565 gcvalue.graphics_exposures = 0;
… …
1061 GCForeground | GCBackground | GCGraphicsExposures, 1568 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1569 &gcvalue);
1063 1570
1064 drawable = new rxvt_drawable (this, vt); 1571 drawable = new rxvt_drawable (this, vt);
1065 1572
1066#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073#endif
1074
1075#ifdef OFF_FOCUS_FADING 1573#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1574 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1575 if (rs[Rs_fade])
1078 pix_colors = pix_colors_unfocused; 1576 pix_colors = pix_colors_unfocused;
1079#endif 1577#endif
1080 1578
1081 pointer_unblank (); 1579 pointer_unblank ();
1082 scr_recolour (); 1580 scr_recolour ();
1083}
1084
1085/* ------------------------------------------------------------------------- *
1086 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */
1088void
1089rxvt_get_ttymode (ttymode_t *tio, int erase)
1090{
1091 /*
1092 * standard System V termios interface
1093 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 {
1096 // return error - use system defaults,
1097 // where possible, and zero elsewhere
1098 memset (tio, 0, sizeof (ttymode_t));
1099
1100 tio->c_cc[VINTR] = CINTR;
1101 tio->c_cc[VQUIT] = CQUIT;
1102 tio->c_cc[VERASE] = CERASE;
1103#ifdef VERASE2
1104 tio->c_cc[VERASE2] = CERASE2;
1105#endif
1106 tio->c_cc[VKILL] = CKILL;
1107 tio->c_cc[VSTART] = CSTART;
1108 tio->c_cc[VSTOP] = CSTOP;
1109 tio->c_cc[VSUSP] = CSUSP;
1110# ifdef VDSUSP
1111 tio->c_cc[VDSUSP] = CDSUSP;
1112# endif
1113# ifdef VREPRINT
1114 tio->c_cc[VREPRINT] = CRPRNT;
1115# endif
1116# ifdef VDISCRD
1117 tio->c_cc[VDISCRD] = CFLUSH;
1118# endif
1119# ifdef VWERSE
1120 tio->c_cc[VWERSE] = CWERASE;
1121# endif
1122# ifdef VLNEXT
1123 tio->c_cc[VLNEXT] = CLNEXT;
1124# endif
1125 }
1126
1127 tio->c_cc[VEOF] = CEOF;
1128 tio->c_cc[VEOL] = VDISABLE;
1129# ifdef VEOL2
1130 tio->c_cc[VEOL2] = VDISABLE;
1131# endif
1132# ifdef VSWTC
1133 tio->c_cc[VSWTC] = VDISABLE;
1134# endif
1135# ifdef VSWTCH
1136 tio->c_cc[VSWTCH] = VDISABLE;
1137# endif
1138# if VMIN != VEOF
1139 tio->c_cc[VMIN] = 1;
1140# endif
1141# if VTIME != VEOL
1142 tio->c_cc[VTIME] = 0;
1143# endif
1144
1145 if (erase != -1)
1146 tio->c_cc[VERASE] = (char)erase;
1147
1148 /* input modes */
1149 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1150# ifdef IMAXBEL
1151 | IMAXBEL
1152# endif
1153 | IXON);
1154
1155 /* output modes */
1156 tio->c_oflag = (OPOST | ONLCR);
1157
1158 /* control modes */
1159 tio->c_cflag = (CS8 | CREAD);
1160
1161 /* line discipline modes */
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE
1165# endif
1166 | ECHOE | ECHOK);
1167
1168 /*
1169 * Debugging
1170 */
1171#ifdef DEBUG_TTYMODE
1172#ifdef HAVE_TERMIOS_H
1173 /* c_iflag bits */
1174 fprintf (stderr, "Input flags\n");
1175
1176 /* cpp token stringize doesn't work on all machines <sigh> */
1177# define FOO(flag,name) \
1178 if ((tio->c_iflag) & flag) \
1179 fprintf (stderr, "%s ", name)
1180
1181 /* c_iflag bits */
1182 FOO (IGNBRK, "IGNBRK");
1183 FOO (BRKINT, "BRKINT");
1184 FOO (IGNPAR, "IGNPAR");
1185 FOO (PARMRK, "PARMRK");
1186 FOO (INPCK, "INPCK");
1187 FOO (ISTRIP, "ISTRIP");
1188 FOO (INLCR, "INLCR");
1189 FOO (IGNCR, "IGNCR");
1190 FOO (ICRNL, "ICRNL");
1191 FOO (IXON, "IXON");
1192 FOO (IXOFF, "IXOFF");
1193# ifdef IUCLC
1194 FOO (IUCLC, "IUCLC");
1195# endif
1196# ifdef IXANY
1197 FOO (IXANY, "IXANY");
1198# endif
1199# ifdef IMAXBEL
1200 FOO (IMAXBEL, "IMAXBEL");
1201# endif
1202
1203 fprintf (stderr, "\n");
1204
1205# undef FOO
1206# define FOO(entry, name) \
1207 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1208
1209 FOO (VINTR, "VINTR");
1210 FOO (VQUIT, "VQUIT");
1211 FOO (VERASE, "VERASE");
1212 FOO (VKILL, "VKILL");
1213 FOO (VEOF, "VEOF");
1214 FOO (VEOL, "VEOL");
1215# ifdef VEOL2
1216 FOO (VEOL2, "VEOL2");
1217# endif
1218# ifdef VSWTC
1219 FOO (VSWTC, "VSWTC");
1220# endif
1221# ifdef VSWTCH
1222 FOO (VSWTCH, "VSWTCH");
1223# endif
1224 FOO (VSTART, "VSTART");
1225 FOO (VSTOP, "VSTOP");
1226 FOO (VSUSP, "VSUSP");
1227# ifdef VDSUSP
1228 FOO (VDSUSP, "VDSUSP");
1229# endif
1230# ifdef VREPRINT
1231 FOO (VREPRINT, "VREPRINT");
1232# endif
1233# ifdef VDISCRD
1234 FOO (VDISCRD, "VDISCRD");
1235# endif
1236# ifdef VWERSE
1237 FOO (VWERSE, "VWERSE");
1238# endif
1239# ifdef VLNEXT
1240 FOO (VLNEXT, "VLNEXT");
1241# endif
1242
1243 fprintf (stderr, "\n");
1244# undef FOO
1245# endif /* HAVE_TERMIOS_H */
1246#endif /* DEBUG_TTYMODE */
1247} 1581}
1248 1582
1249/*----------------------------------------------------------------------*/ 1583/*----------------------------------------------------------------------*/
1250/* 1584/*
1251 * Run the command in a subprocess and return a file descriptor for the 1585 * Run the command in a subprocess and return a file descriptor for the
… …
1272 else 1606 else
1273#endif 1607#endif
1274 if (!pty->get ()) 1608 if (!pty->get ())
1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1276 1610
1277 int er; 1611 struct termios tio = def_tio;
1278 1612
1279#ifndef NO_BACKSPACE_KEY 1613#ifndef NO_BACKSPACE_KEY
1280 if (key_backspace[0] && !key_backspace[1]) 1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1281 er = key_backspace[0]; 1615 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1282 else if (strcmp (key_backspace, "DEC") == 0) 1616 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1283 er = '\177'; /* the initial state anyway */ 1617 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1284 else
1285#endif 1618#endif
1286 er = -1;
1287 1619
1288 rxvt_get_ttymode (&tio, er); 1620 /* init terminal attributes */
1289 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1621 cfsetospeed (&tio, BAUDRATE);
1622 cfsetispeed (&tio, BAUDRATE);
1623 tcsetattr (pty->tty, TCSANOW, &tio);
1290 pty->set_utf8_mode (enc_utf8); 1624 pty->set_utf8_mode (enc_utf8);
1291 1625
1292 /* set initial window size */ 1626 /* set initial window size */
1293 tt_winch (); 1627 tt_winch ();
1294 1628
… …
1329 } 1663 }
1330 1664
1331 _exit (EXIT_FAILURE); 1665 _exit (EXIT_FAILURE);
1332 1666
1333 default: 1667 default:
1334 if (!OPTION (Opt_utmpInhibit)) 1668 if (!option (Opt_utmpInhibit))
1335 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1336 1670
1337 pty->close_tty (); 1671 pty->close_tty ();
1338 1672
1339 child_ev.start (cmd_pid); 1673 child_ev.start (cmd_pid);
1340 1674
… …
1353int 1687int
1354rxvt_term::run_child (const char *const *argv) 1688rxvt_term::run_child (const char *const *argv)
1355{ 1689{
1356 char *login; 1690 char *login;
1357 1691
1358 if (OPTION (Opt_console)) 1692 if (option (Opt_console))
1693 {
1359 { /* be virtual console, fail silently */ 1694 /* be virtual console, fail silently */
1360#ifdef TIOCCONS 1695#ifdef TIOCCONS
1361 unsigned int on = 1; 1696 unsigned int on = 1;
1362 1697
1363 ioctl (STDIN_FILENO, TIOCCONS, &on); 1698 ioctl (STDIN_FILENO, TIOCCONS, &on);
1364#elif defined (SRIOCSREDIR) 1699#elif defined (SRIOCSREDIR)
… …
1366 1701
1367 fd = open (CONSOLE, O_WRONLY, 0); 1702 fd = open (CONSOLE, O_WRONLY, 0);
1368 if (fd >= 0) 1703 if (fd >= 0)
1369 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1370 close (fd); 1705 close (fd);
1371#endif /* SRIOCSREDIR */ 1706#endif /* SRIOCSREDIR */
1372 } 1707 }
1373 1708
1374 /* reset signals and spin off the command interpreter */ 1709 /* reset signals and spin off the command interpreter */
1375 signal (SIGINT, SIG_DFL); 1710 signal (SIGINT, SIG_DFL);
1376 signal (SIGQUIT, SIG_DFL); 1711 signal (SIGQUIT, SIG_DFL);
1377 signal (SIGCHLD, SIG_DFL); 1712 signal (SIGCHLD, SIG_DFL);
1378 signal (SIGHUP, SIG_DFL); 1713 signal (SIGHUP, SIG_DFL);
1379 signal (SIGPIPE, SIG_DFL); 1714 signal (SIGPIPE, SIG_DFL);
1380 /* 1715 /*
1381 * mimick login's behavior by disabling the job control signals 1716 * mimic login's behavior by disabling the job control signals
1382 * a shell that wants them can turn them back on 1717 * a shell that wants them can turn them back on
1383 */ 1718 */
1384#ifdef SIGTSTP 1719#ifdef SIGTSTP
1385 signal (SIGTSTP, SIG_IGN); 1720 signal (SIGTSTP, SIG_IGN);
1386 signal (SIGTTIN, SIG_IGN); 1721 signal (SIGTTIN, SIG_IGN);
1387 signal (SIGTTOU, SIG_IGN); 1722 signal (SIGTTOU, SIG_IGN);
1388#endif /* SIGTSTP */ 1723#endif /* SIGTSTP */
1389
1390 // unblock signals (signals are blocked by iom.C
1391 sigset_t ss;
1392 sigemptyset (&ss);
1393 sigprocmask (SIG_SETMASK, &ss, 0);
1394 1724
1395 /* command interpreter path */ 1725 /* command interpreter path */
1396 if (argv != NULL) 1726 if (argv)
1397 { 1727 {
1398# ifdef DEBUG_CMD 1728# ifdef DEBUG_CMD
1399 int i; 1729 int i;
1400 1730
1401 for (i = 0; argv[i]; i++) 1731 for (i = 0; argv[i]; i++)
… …
1410 const char *argv0, *shell; 1740 const char *argv0, *shell;
1411 1741
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1742 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1743 shell = "/bin/sh";
1414 1744
1415 argv0 = (const char *)rxvt_r_basename (shell); 1745 argv0 = rxvt_basename (shell);
1416 1746
1417 if (OPTION (Opt_loginShell)) 1747 if (option (Opt_loginShell))
1418 { 1748 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1749 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1420 1750
1421 login[0] = '-'; 1751 login[0] = '-';
1422 strcpy (&login[1], argv0); 1752 strcpy (&login[1], argv0);
1423 argv0 = login; 1753 argv0 = login;
1424 } 1754 }
1425 1755
1426 execlp (shell, argv0, NULL); 1756 execlp (shell, argv0, (char *)0);
1427 /* no error message: STDERR is closed! */ 1757 /* no error message: STDERR is closed! */
1428 } 1758 }
1429 1759
1430 return -1; 1760 return -1;
1431} 1761}

Diff Legend

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