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.219 by ayin, Sun Oct 28 11:06:59 2007 UTC vs.
Revision 1.347 by sf-exg, Thu Jul 14 05:10:06 2016 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
18 * 17 *
19 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
22 * (at your option) any later version. 21 * (at your option) any later version.
23 * 22 *
24 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
25 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
36 35
37#include "../config.h" /* NECESSARY */ 36#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 37#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 38#include "rxvtutil.h"
40#include "init.h" 39#include "init.h"
40#include "keyboard.h"
41 41
42#include <limits> 42#include <limits>
43 43
44#include <csignal> 44#include <signal.h>
45
46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
45 51
46#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 53# define X_LOCALE
48# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
49#else 55#else
50# ifdef HAVE_SETLOCALE
51# include <clocale> 56# include <locale.h>
52# endif
53#endif 57#endif
54 58
55#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h> 60# include <langinfo.h>
61#endif
62
63#ifdef HAVE_STARTUP_NOTIFICATION
64# define SN_API_NOT_YET_FROZEN
65# include <libsn/sn-launchee.h>
57#endif 66#endif
58 67
59#ifdef DISPLAY_IS_IP 68#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */ 69/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h> 70#include <sys/types.h>
… …
72#include <netinet/in.h> 81#include <netinet/in.h>
73#include <arpa/inet.h> 82#include <arpa/inet.h>
74#include <net/if.h> 83#include <net/if.h>
75#include <net/if_arp.h> 84#include <net/if_arp.h>
76 85
77static char * 86static char * ecb_cold
78rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
79{ 88{
80 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
81 struct ifconf ifc; 90 struct ifconf ifc;
82 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
142 151
143 return rval; 152 return rval;
144} 153}
145#endif 154#endif
146 155
156#define NULL_5 \
157 NULL, \
158 NULL, \
159 NULL, \
160 NULL, \
161 NULL,
162
163#define NULL_10 \
164 NULL_5 \
165 NULL_5
166
167#define NULL_40 \
168 NULL_10 \
169 NULL_10 \
170 NULL_10 \
171 NULL_10
172
173#define NULL_50 \
174 NULL_40 \
175 NULL_10
176
177#define NULL_100 \
178 NULL_50 \
179 NULL_50
180
147const char *const def_colorName[] = 181static const char *const def_colorName[] =
148 { 182 {
149 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
150 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
151 /* low-intensity colors */ 185 /* low-intensity colors */
152 "rgb:00/00/00", // 0: black (Black) 186 "rgb:00/00/00", // 0: black (Black)
… …
154 "rgb:00/cd/00", // 2: green (Green3) 188 "rgb:00/cd/00", // 2: green (Green3)
155 "rgb:cd/cd/00", // 3: yellow (Yellow3) 189 "rgb:cd/cd/00", // 3: yellow (Yellow3)
156 "rgb:00/00/cd", // 4: blue (Blue3) 190 "rgb:00/00/cd", // 4: blue (Blue3)
157 "rgb:cd/00/cd", // 5: magenta (Magenta3) 191 "rgb:cd/00/cd", // 5: magenta (Magenta3)
158 "rgb:00/cd/cd", // 6: cyan (Cyan3) 192 "rgb:00/cd/cd", // 6: cyan (Cyan3)
159# ifdef XTERM_COLORS 193# ifdef XTERM_COLORS
160 "rgb:e5/e5/e5", // 7: white (Grey90) 194 "rgb:e5/e5/e5", // 7: white (Grey90)
161# else 195# else
162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 196 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163# endif 197# endif
164 /* high-intensity colors */ 198 /* high-intensity colors */
165# ifdef XTERM_COLORS 199# ifdef XTERM_COLORS
166 "rgb:4d/4d/4d", // 8: bright black (Grey30) 200 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 207 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 208 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 209 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 210 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 211
212#if !USE_256_COLORS
178 // 88 xterm colours 213 // 88 xterm colours
179 "rgb:00/00/00", 214 "rgb:00/00/00",
180 "rgb:00/00/8b", 215 "rgb:00/00/8b",
181 "rgb:00/00/cd", 216 "rgb:00/00/cd",
182 "rgb:00/00/ff", 217 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
250 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
292#else
293 // 256 xterm colours
294 "rgb:00/00/00",
295 "rgb:00/00/5f",
296 "rgb:00/00/87",
297 "rgb:00/00/af",
298 "rgb:00/00/d7",
299 "rgb:00/00/ff",
300 "rgb:00/5f/00",
301 "rgb:00/5f/5f",
302 "rgb:00/5f/87",
303 "rgb:00/5f/af",
304 "rgb:00/5f/d7",
305 "rgb:00/5f/ff",
306 "rgb:00/87/00",
307 "rgb:00/87/5f",
308 "rgb:00/87/87",
309 "rgb:00/87/af",
310 "rgb:00/87/d7",
311 "rgb:00/87/ff",
312 "rgb:00/af/00",
313 "rgb:00/af/5f",
314 "rgb:00/af/87",
315 "rgb:00/af/af",
316 "rgb:00/af/d7",
317 "rgb:00/af/ff",
318 "rgb:00/d7/00",
319 "rgb:00/d7/5f",
320 "rgb:00/d7/87",
321 "rgb:00/d7/af",
322 "rgb:00/d7/d7",
323 "rgb:00/d7/ff",
324 "rgb:00/ff/00",
325 "rgb:00/ff/5f",
326 "rgb:00/ff/87",
327 "rgb:00/ff/af",
328 "rgb:00/ff/d7",
329 "rgb:00/ff/ff",
330 "rgb:5f/00/00",
331 "rgb:5f/00/5f",
332 "rgb:5f/00/87",
333 "rgb:5f/00/af",
334 "rgb:5f/00/d7",
335 "rgb:5f/00/ff",
336 "rgb:5f/5f/00",
337 "rgb:5f/5f/5f",
338 "rgb:5f/5f/87",
339 "rgb:5f/5f/af",
340 "rgb:5f/5f/d7",
341 "rgb:5f/5f/ff",
342 "rgb:5f/87/00",
343 "rgb:5f/87/5f",
344 "rgb:5f/87/87",
345 "rgb:5f/87/af",
346 "rgb:5f/87/d7",
347 "rgb:5f/87/ff",
348 "rgb:5f/af/00",
349 "rgb:5f/af/5f",
350 "rgb:5f/af/87",
351 "rgb:5f/af/af",
352 "rgb:5f/af/d7",
353 "rgb:5f/af/ff",
354 "rgb:5f/d7/00",
355 "rgb:5f/d7/5f",
356 "rgb:5f/d7/87",
357 "rgb:5f/d7/af",
358 "rgb:5f/d7/d7",
359 "rgb:5f/d7/ff",
360 "rgb:5f/ff/00",
361 "rgb:5f/ff/5f",
362 "rgb:5f/ff/87",
363 "rgb:5f/ff/af",
364 "rgb:5f/ff/d7",
365 "rgb:5f/ff/ff",
366 "rgb:87/00/00",
367 "rgb:87/00/5f",
368 "rgb:87/00/87",
369 "rgb:87/00/af",
370 "rgb:87/00/d7",
371 "rgb:87/00/ff",
372 "rgb:87/5f/00",
373 "rgb:87/5f/5f",
374 "rgb:87/5f/87",
375 "rgb:87/5f/af",
376 "rgb:87/5f/d7",
377 "rgb:87/5f/ff",
378 "rgb:87/87/00",
379 "rgb:87/87/5f",
380 "rgb:87/87/87",
381 "rgb:87/87/af",
382 "rgb:87/87/d7",
383 "rgb:87/87/ff",
384 "rgb:87/af/00",
385 "rgb:87/af/5f",
386 "rgb:87/af/87",
387 "rgb:87/af/af",
388 "rgb:87/af/d7",
389 "rgb:87/af/ff",
390 "rgb:87/d7/00",
391 "rgb:87/d7/5f",
392 "rgb:87/d7/87",
393 "rgb:87/d7/af",
394 "rgb:87/d7/d7",
395 "rgb:87/d7/ff",
396 "rgb:87/ff/00",
397 "rgb:87/ff/5f",
398 "rgb:87/ff/87",
399 "rgb:87/ff/af",
400 "rgb:87/ff/d7",
401 "rgb:87/ff/ff",
402 "rgb:af/00/00",
403 "rgb:af/00/5f",
404 "rgb:af/00/87",
405 "rgb:af/00/af",
406 "rgb:af/00/d7",
407 "rgb:af/00/ff",
408 "rgb:af/5f/00",
409 "rgb:af/5f/5f",
410 "rgb:af/5f/87",
411 "rgb:af/5f/af",
412 "rgb:af/5f/d7",
413 "rgb:af/5f/ff",
414 "rgb:af/87/00",
415 "rgb:af/87/5f",
416 "rgb:af/87/87",
417 "rgb:af/87/af",
418 "rgb:af/87/d7",
419 "rgb:af/87/ff",
420 "rgb:af/af/00",
421 "rgb:af/af/5f",
422 "rgb:af/af/87",
423 "rgb:af/af/af",
424 "rgb:af/af/d7",
425 "rgb:af/af/ff",
426 "rgb:af/d7/00",
427 "rgb:af/d7/5f",
428 "rgb:af/d7/87",
429 "rgb:af/d7/af",
430 "rgb:af/d7/d7",
431 "rgb:af/d7/ff",
432 "rgb:af/ff/00",
433 "rgb:af/ff/5f",
434 "rgb:af/ff/87",
435 "rgb:af/ff/af",
436 "rgb:af/ff/d7",
437 "rgb:af/ff/ff",
438 "rgb:d7/00/00",
439 "rgb:d7/00/5f",
440 "rgb:d7/00/87",
441 "rgb:d7/00/af",
442 "rgb:d7/00/d7",
443 "rgb:d7/00/ff",
444 "rgb:d7/5f/00",
445 "rgb:d7/5f/5f",
446 "rgb:d7/5f/87",
447 "rgb:d7/5f/af",
448 "rgb:d7/5f/d7",
449 "rgb:d7/5f/ff",
450 "rgb:d7/87/00",
451 "rgb:d7/87/5f",
452 "rgb:d7/87/87",
453 "rgb:d7/87/af",
454 "rgb:d7/87/d7",
455 "rgb:d7/87/ff",
456 "rgb:d7/af/00",
457 "rgb:d7/af/5f",
458 "rgb:d7/af/87",
459 "rgb:d7/af/af",
460 "rgb:d7/af/d7",
461 "rgb:d7/af/ff",
462 "rgb:d7/d7/00",
463 "rgb:d7/d7/5f",
464 "rgb:d7/d7/87",
465 "rgb:d7/d7/af",
466 "rgb:d7/d7/d7",
467 "rgb:d7/d7/ff",
468 "rgb:d7/ff/00",
469 "rgb:d7/ff/5f",
470 "rgb:d7/ff/87",
471 "rgb:d7/ff/af",
472 "rgb:d7/ff/d7",
473 "rgb:d7/ff/ff",
474 "rgb:ff/00/00",
475 "rgb:ff/00/5f",
476 "rgb:ff/00/87",
477 "rgb:ff/00/af",
478 "rgb:ff/00/d7",
479 "rgb:ff/00/ff",
480 "rgb:ff/5f/00",
481 "rgb:ff/5f/5f",
482 "rgb:ff/5f/87",
483 "rgb:ff/5f/af",
484 "rgb:ff/5f/d7",
485 "rgb:ff/5f/ff",
486 "rgb:ff/87/00",
487 "rgb:ff/87/5f",
488 "rgb:ff/87/87",
489 "rgb:ff/87/af",
490 "rgb:ff/87/d7",
491 "rgb:ff/87/ff",
492 "rgb:ff/af/00",
493 "rgb:ff/af/5f",
494 "rgb:ff/af/87",
495 "rgb:ff/af/af",
496 "rgb:ff/af/d7",
497 "rgb:ff/af/ff",
498 "rgb:ff/d7/00",
499 "rgb:ff/d7/5f",
500 "rgb:ff/d7/87",
501 "rgb:ff/d7/af",
502 "rgb:ff/d7/d7",
503 "rgb:ff/d7/ff",
504 "rgb:ff/ff/00",
505 "rgb:ff/ff/5f",
506 "rgb:ff/ff/87",
507 "rgb:ff/ff/af",
508 "rgb:ff/ff/d7",
509 "rgb:ff/ff/ff",
510 "rgb:08/08/08",
511 "rgb:12/12/12",
512 "rgb:1c/1c/1c",
513 "rgb:26/26/26",
514 "rgb:30/30/30",
515 "rgb:3a/3a/3a",
516 "rgb:44/44/44",
517 "rgb:4e/4e/4e",
518 "rgb:58/58/58",
519 "rgb:62/62/62",
520 "rgb:6c/6c/6c",
521 "rgb:76/76/76",
522 "rgb:80/80/80",
523 "rgb:8a/8a/8a",
524 "rgb:94/94/94",
525 "rgb:9e/9e/9e",
526 "rgb:a8/a8/a8",
527 "rgb:b2/b2/b2",
528 "rgb:bc/bc/bc",
529 "rgb:c6/c6/c6",
530 "rgb:d0/d0/d0",
531 "rgb:da/da/da",
532 "rgb:e4/e4/e4",
533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
538#endif
251 539
252#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 543#endif /* ! NO_CURSORCOLOR */
256 NULL, /* Color_pointer_fg */ 544 NULL, /* Color_pointer_fg */
257 NULL, /* Color_pointer_bg */ 545 NULL, /* Color_pointer_bg */
258 NULL, /* Color_border */ 546 NULL, /* Color_border */
259#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
260 NULL, /* Color_BD */ 548 NULL, /* Color_BD */
261 NULL, /* Color_IT */ 549 NULL, /* Color_IT */
262 NULL, /* Color_UL */ 550 NULL, /* Color_UL */
263 NULL, /* Color_RV */ 551 NULL, /* Color_RV */
264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 552#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265#if ENABLE_FRILLS 553#if ENABLE_FRILLS
266 NULL, // Color_underline 554 NULL, // Color_underline
267#endif 555#endif
268#ifdef OPTION_HC 556#ifdef OPTION_HC
269 NULL, 557 NULL,
558 NULL,
270#endif 559#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
561#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 563#endif
275#if ENABLE_TRANSPARENCY 564#if BG_IMAGE_FROM_ROOT
276 NULL, 565 NULL,
277#endif 566#endif
278#if OFF_FOCUS_FADING 567#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 568 "rgb:00/00/00",
280#endif 569#endif
281 }; 570 };
282 571
283bool 572void
284rxvt_term::init_vars () 573rxvt_term::init_vars ()
285{ 574{
286 pix_colors = // 575 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 576
293 MEvent.time = CurrentTime; 577 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 578 MEvent.button = AnyButton;
295 want_refresh = 1; 579 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 580 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 581 ncol = 80;
298 nrow = 24; 582 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 583 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 584 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 585 lineSpace = LINESPACE;
586 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 587 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 588
305 refresh_type = SLOW_REFRESH; 589 refresh_type = SLOW_REFRESH;
306 590
307 oldcursor.row = oldcursor.col = -1; 591 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 592
310 set_option (Opt_scrollBar); 593 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 594 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 595 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 596 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 597 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 598 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 599 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 600 set_option (Opt_intensityStyles);
601 set_option (Opt_iso14755);
318 set_option (Opt_iso14755_52); 602 set_option (Opt_iso14755_52);
319 603 set_option (Opt_buffered);
320 return true;
321} 604}
322 605
323void 606#if ENABLE_PERL
324rxvt_term::init_secondary () 607static void
608rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
325{ 609{
326 int i; 610 rxvt_perl.parse_resource (term, k, false, false, 0, v);
327
328 /*
329 * Close all unused file descriptors
330 * We don't want them, we don't need them.
331 */
332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO);
336 }
337 else if (i != STDIN_FILENO)
338 {
339 dup2 (i, STDIN_FILENO);
340 close (i);
341 }
342
343 dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345#if 0 // schmorp sayz closing filies is murder
346 for (i = STDERR_FILENO + 1; i < num_fds; i++)
347 {
348#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349 if (i == 4 || i == 7)
350 continue;
351#endif
352 close (i);
353 }
354#endif
355} 611}
612#endif
356 613
357/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
358const char ** 615const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 616rxvt_term::init_resources (int argc, const char *const *argv)
360{ 617{
361 int i, r_argc; 618 int i;
362 const char **cmd_argv, **r_argv; 619 const char **cmd_argv;
363
364 /*
365 * Look for -e option. Find => split and make cmd_argv[] of command args
366 */
367 for (r_argc = 0; r_argc < argc; r_argc++)
368 if (!strcmp (argv[r_argc], "-e"))
369 break;
370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
384
385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
386
387 for (i = 0; i < r_argc; i++)
388 r_argv[i] = (const char *)argv[i];
389
390 r_argv[i] = NULL;
391 620
392 rs[Rs_name] = rxvt_basename (argv[0]); 621 rs[Rs_name] = rxvt_basename (argv[0]);
393 622
394 /* 623 /*
395 * Open display, get options/resources and create the window 624 * Open display, get options/resources and create the window
396 */ 625 */
397 626
398 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 627 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
399 rs[Rs_display_name] = ":0"; 628 rs[Rs_display_name] = ":0";
400 629
401 get_options (r_argc, r_argv); 630 cmd_argv = get_options (argc, argv);
402 631
403 if (!(display = displays.get (rs[Rs_display_name]))) 632 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
406 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 633 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
407 }
408 634
409 // using a local pointer decreases code size a lot 635 // using a local pointer decreases code size a lot
410 xa = display->xa; 636 xa = display->xa;
411 637
412 set (display); 638 set (display);
413 extract_resources (); 639 extract_resources ();
414 640
415#if XFT 641#if ENABLE_FRILLS
416 if (rs[Rs_depth]) 642 if (rs[Rs_visual])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 643 select_visual (strtol (rs[Rs_visual], 0, 0));
644 else if (rs[Rs_depth])
645 select_depth (strtol (rs[Rs_depth], 0, 0));
418#endif 646#endif
419
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv);
424 647
425 for (int i = NUM_RESOURCES; i--; ) 648 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 649 if (rs [i] == resval_undef)
427 rs [i] = 0; 650 rs [i] = 0;
428 651
… …
433 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 656 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
434 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 657 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
435 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 658 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
436 { 659 {
437 rxvt_perl.init (this); 660 rxvt_perl.init (this);
661 enumerate_resources (rxvt_perl_parse_resource);
438 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 662 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
439 } 663 }
440#endif 664#endif
665
666 // must be called after initialising the perl interpreter as it
667 // may invoke the `on_register_command' hook
668 extract_keysym_resources ();
441 669
442 /* 670 /*
443 * set any defaults not already set 671 * set any defaults not already set
444 */ 672 */
445 if (cmd_argv && cmd_argv[0]) 673 if (cmd_argv && cmd_argv[0])
446 { 674 {
447 if (!rs[Rs_title]) 675 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 676 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
677
449 if (!rs[Rs_iconName]) 678 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 679 rs[Rs_iconName] = rs[Rs_title];
451 } 680 }
452 else 681 else
453 { 682 {
454 if (!rs[Rs_title]) 683 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 684 rs[Rs_title] = rs[Rs_name];
685
456 if (!rs[Rs_iconName]) 686 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 687 rs[Rs_iconName] = rs[Rs_name];
458 } 688 }
459 689
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 690 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
467 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 697 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
468 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 698 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
469 699
470 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 700 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
471 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 701 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
702
703 if (rs[Rs_letterSpace])
704 letterSpace = atoi (rs[Rs_letterSpace]);
472#endif 705#endif
473 706
474#ifdef POINTER_BLANK 707#ifdef POINTER_BLANK
475 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 708 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
476 pointerBlankDelay = i; 709 pointerBlankDelay = i;
477 else 710 else
478 pointerBlankDelay = 2; 711 pointerBlankDelay = 2;
479#endif 712#endif
480 713
714 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
715 multiClickTime = i;
716 else
717 multiClickTime = 500;
718
719 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
720
481 /* no point having a scrollbar without having any scrollback! */ 721 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 722 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 723 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 724
490 if (!rs[Rs_cutchars]) 725 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 726 rs[Rs_cutchars] = CUTCHARS;
492 727
493#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
… …
506# else 741# else
507 rs[Rs_delete_key] = "\033[3~"; 742 rs[Rs_delete_key] = "\033[3~";
508# endif 743# endif
509#endif 744#endif
510 745
511#ifdef HAVE_SCROLLBARS 746 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 747
515#ifdef XTERM_REVERSE_VIDEO 748#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 749 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 750 if (option (Opt_reverseVideo))
518 { 751 {
… …
538 color_aliases (Color_fg); 771 color_aliases (Color_fg);
539 color_aliases (Color_bg); 772 color_aliases (Color_bg);
540#ifndef NO_CURSORCOLOR 773#ifndef NO_CURSORCOLOR
541 color_aliases (Color_cursor); 774 color_aliases (Color_cursor);
542 color_aliases (Color_cursor2); 775 color_aliases (Color_cursor2);
543#endif /* NO_CURSORCOLOR */ 776#endif /* NO_CURSORCOLOR */
544 color_aliases (Color_pointer_fg); 777 color_aliases (Color_pointer_fg);
545 color_aliases (Color_pointer_bg); 778 color_aliases (Color_pointer_bg);
546 color_aliases (Color_border); 779 color_aliases (Color_border);
547#ifndef NO_BOLD_UNDERLINE_REVERSE 780#ifndef NO_BOLD_UNDERLINE_REVERSE
548 color_aliases (Color_BD); 781 color_aliases (Color_BD);
549 color_aliases (Color_UL); 782 color_aliases (Color_UL);
550 color_aliases (Color_RV); 783 color_aliases (Color_RV);
551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 784#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552 785
553 if (!rs[Rs_color + Color_border]) 786 if (!rs[Rs_color + Color_border])
554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 787 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555 788
556 return cmd_argv; 789 return cmd_argv;
790}
791
792/*----------------------------------------------------------------------*/
793void
794rxvt_term::init (stringvec *argv, stringvec *envv)
795{
796 argv->push_back (0);
797 envv->push_back (0);
798
799 this->argv = argv;
800 this->envv = envv;
801
802 env = new char *[this->envv->size ()];
803 for (int i = 0; i < this->envv->size (); i++)
804 env[i] = this->envv->at (i);
805
806 init2 (argv->size () - 1, argv->begin ());
807}
808
809void
810rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
811{
812#if ENABLE_PERL
813 // perl might want to access the stringvecs later, so we need to copy them
814 stringvec *args = new stringvec;
815 for (int i = 0; i < argc; i++)
816 args->push_back (strdup (argv [i]));
817
818 stringvec *envs = new stringvec;
819 for (const char *const *var = envv; *var; var++)
820 envs->push_back (strdup (*var));
821
822 init (args, envs);
823#else
824 init2 (argc, argv);
825#endif
826}
827
828void
829rxvt_term::init2 (int argc, const char *const *argv)
830{
831 SET_R (this);
832 set_locale ("");
833 set_environ (env); // a few things in X do not call setlocale :(
834
835 init_vars ();
836
837 const char **cmd_argv = init_resources (argc, argv);
838
839#ifdef KEYSYM_RESOURCE
840 keyboard->register_done ();
841#endif
842
843 if (const char *path = rs[Rs_chdir])
844 if (*path) // ignored if empty
845 {
846 if (*path != '/')
847 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
848
849 if (chdir (path))
850 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
851 }
852
853 if (option (Opt_scrollBar))
854 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
855
856 pty = ptytty::create ();
857
858 create_windows (argc, argv);
859
860 init_xlocale ();
861
862 scr_poweron (); // initialize screen
863
864#if 0
865 XSynchronize (dpy, True);
866#endif
867
868 if (option (Opt_scrollBar))
869 scrollBar.resize (); /* create and map scrollbar */
870
871#ifdef HAVE_BG_PIXMAP
872 bg_init ();
873#endif
874
875#if ENABLE_PERL
876 rootwin_ev.start (display, display->root);
877#endif
878
879 init_done = 1;
880
881 init_command (cmd_argv);
882
883 if (pty->pty >= 0)
884 pty_ev.start (pty->pty, ev::READ);
885
886 HOOK_INVOKE ((this, HOOK_START, DT_END));
887
888#if ENABLE_XEMBED
889 if (rs[Rs_embed])
890 {
891 long info[2] = { 0, XEMBED_MAPPED };
892
893 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
894 32, PropModeReplace, (unsigned char *)&info, 2);
895 }
896#endif
897
898#if HAVE_STARTUP_NOTIFICATION
899 SnDisplay *snDisplay;
900 SnLauncheeContext *snContext;
901
902 snDisplay = sn_display_new (dpy, NULL, NULL);
903 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
904
905 /* Tell the window manager that this window is part of the startup context */
906 if (snContext)
907 sn_launchee_context_setup_window (snContext, parent);
908#endif
909
910 XMapWindow (dpy, vt);
911 XMapWindow (dpy, parent);
912
913#if HAVE_STARTUP_NOTIFICATION
914 if (snContext)
915 {
916 /* Mark the startup process as complete */
917 sn_launchee_context_complete (snContext);
918
919 sn_launchee_context_unref (snContext);
920 }
921
922 sn_display_unref (snDisplay);
923#endif
924
925 refresh_check ();
557} 926}
558 927
559/*----------------------------------------------------------------------*/ 928/*----------------------------------------------------------------------*/
560void 929void
561rxvt_term::init_env () 930rxvt_term::init_env ()
562{ 931{
563 int i;
564 char *val; 932 char *val;
933 char *env_display;
934 char *env_windowid;
935 char *env_colorfgbg;
936 char *env_term;
565 937
566#ifdef DISPLAY_IS_IP 938#ifdef DISPLAY_IS_IP
567 /* Fixup display_name for export over pty to any interested terminal 939 /* Fixup display_name for export over pty to any interested terminal
568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 940 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
569 * (for the first non-loopback interface) that we get from 941 * (for the first non-loopback interface) that we get from
… …
576 */ 948 */
577 val = rxvt_network_display (rs[Rs_display_name]); 949 val = rxvt_network_display (rs[Rs_display_name]);
578 rs[Rs_display_name] = (const char *)val; 950 rs[Rs_display_name] = (const char *)val;
579 951
580 if (val == NULL) 952 if (val == NULL)
581#endif /* DISPLAY_IS_IP */ 953#endif /* DISPLAY_IS_IP */
582 val = XDisplayString (dpy); 954 val = XDisplayString (dpy);
583 955
584 if (rs[Rs_display_name] == NULL) 956 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 957 rs[Rs_display_name] = val; /* use broken `:0' value */
586 958
587 i = strlen (val);
588 env_display = (char *)rxvt_malloc (i + 9); 959 env_display = (char *)rxvt_malloc (strlen (val) + 9);
589 960
590 sprintf (env_display, "DISPLAY=%s", val); 961 sprintf (env_display, "DISPLAY=%s", val);
591 962
963 env_windowid = (char *)rxvt_malloc (21);
592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 964 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
593 965
594 /* add entries to the environment: 966 /* add entries to the environment:
595 * @ DISPLAY: in case we started with -display 967 * @ DISPLAY: in case we started with -display
596 * @ WINDOWID: X window id number of the window 968 * @ WINDOWID: X window id number of the window
597 * @ COLORTERM: terminal sub-name and also indicates its color 969 * @ COLORTERM: terminal sub-name and also indicates its color
… …
600 * @ COLORFGBG: fg;bg color codes 972 * @ COLORFGBG: fg;bg color codes
601 */ 973 */
602 putenv (env_display); 974 putenv (env_display);
603 putenv (env_windowid); 975 putenv (env_windowid);
604 976
605 if (env_colorfgbg) 977 env_colorfgbg = get_colorfgbg ();
606 putenv (env_colorfgbg); 978 putenv (env_colorfgbg);
607 979
608#ifdef RXVT_TERMINFO 980#ifdef RXVT_TERMINFO
609 putenv ("TERMINFO=" RXVT_TERMINFO); 981 putenv ("TERMINFO=" RXVT_TERMINFO);
610#endif 982#endif
611 983
… …
626#ifdef HAVE_UNSETENV 998#ifdef HAVE_UNSETENV
627 /* avoid passing old settings and confusing term size */ 999 /* avoid passing old settings and confusing term size */
628 unsetenv ("LINES"); 1000 unsetenv ("LINES");
629 unsetenv ("COLUMNS"); 1001 unsetenv ("COLUMNS");
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 1002 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 1003#endif /* HAVE_UNSETENV */
632} 1004}
633 1005
634/*----------------------------------------------------------------------*/ 1006/*----------------------------------------------------------------------*/
635/*
636 * This is more or less stolen straight from XFree86 xterm.
637 * This should support all European type languages.
638 */
639void 1007void
640rxvt_term::set_locale (const char *locale) 1008rxvt_term::set_locale (const char *locale)
641{ 1009{
642 set_environ (envv); 1010 set_environ (env);
643 1011
644#if HAVE_XSETLOCALE || HAVE_SETLOCALE
645 free (this->locale); 1012 free (this->locale);
646 this->locale = setlocale (LC_CTYPE, locale); 1013 this->locale = setlocale (LC_CTYPE, locale);
647 1014
648 if (!this->locale) 1015 if (!this->locale)
649 { 1016 {
… …
657 1024
658 this->locale = "C"; 1025 this->locale = "C";
659 } 1026 }
660 1027
661 1028
662 this->locale = rxvt_strdup (this->locale); 1029 this->locale = strdup (this->locale);
663 SET_LOCALE (this->locale); 1030 SET_LOCALE (this->locale);
664 mbstate.reset (); 1031 mbstate.reset ();
665#endif
666 1032
667#if HAVE_NL_LANGINFO 1033#if HAVE_NL_LANGINFO
668 char *codeset = strdup (nl_langinfo (CODESET)); 1034 char *codeset = nl_langinfo (CODESET);
669 // /^UTF.?8/i 1035 // /^UTF.?8/i
670 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1036 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
671 && (codeset[1] == 'T' || codeset[1] == 't') 1037 && (codeset[1] == 'T' || codeset[1] == 't')
672 && (codeset[2] == 'F' || codeset[2] == 'f') 1038 && (codeset[2] == 'F' || codeset[2] == 'f')
673 && (codeset[3] == '8' || codeset[4] == '8'); 1039 && (codeset[3] == '8' || codeset[4] == '8');
674 free (codeset);
675#else 1040#else
676 enc_utf8 = 0; 1041 enc_utf8 = 0;
677#endif 1042#endif
678} 1043}
679 1044
680void 1045void
681rxvt_term::init_xlocale () 1046rxvt_term::init_xlocale ()
682{ 1047{
683 set_environ (envv); 1048 set_environ (env);
684 1049
685#ifdef USE_XIM 1050#if USE_XIM
686 if (!locale) 1051 if (!locale)
687 rxvt_warn ("setting locale failed, working without locale support.\n"); 1052 rxvt_warn ("setting locale failed, continuing without locale support.\n");
688 else 1053 else
689 { 1054 {
690 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1055 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
691 1056
692 if (!XSupportsLocale ()) 1057 if (!XSupportsLocale ())
693 { 1058 {
694 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1059 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
695 return; 1060 return;
696 } 1061 }
697 1062
698 im_ev.start (display); 1063 im_ev.start (display);
699 1064
… …
740 run_command (argv); 1105 run_command (argv);
741} 1106}
742 1107
743/*----------------------------------------------------------------------*/ 1108/*----------------------------------------------------------------------*/
744void 1109void
745rxvt_term::Get_Colours () 1110rxvt_term::get_colors ()
746{ 1111{
747 int i; 1112 int i;
748 1113
749#ifdef OFF_FOCUS_FADING 1114#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 1115 pix_colors = pix_colors_focused;
751#endif 1116#endif
752 1117
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1118 for (i = 0; i < NRS_COLORS; i++)
754 {
755 const char *name = rs[Rs_color + i]; 1119 if (const char *name = rs[Rs_color + i])
756
757 if (!name)
758 continue;
759
760 rxvt_color xcol;
761
762 if (!set_color (xcol, name)) 1120 set_color (pix_colors [i], name);
763 {
764#ifndef XTERM_REVERSE_VIDEO
765 if (i < 2 && option (Opt_reverseVideo))
766 name = def_colorName [1 - i];
767 else
768#endif
769 name = def_colorName [i];
770
771 if (!name)
772 continue;
773
774 if (!set_color (xcol, name))
775 {
776 switch (i)
777 {
778 case Color_fg:
779 case Color_bg:
780 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
781 name = "";
782 break;
783#ifndef NO_CURSORCOLOR
784 case Color_cursor2:
785#endif
786 case Color_pointer_fg:
787 name = rs[Rs_color + Color_fg];
788 xcol.set (this, name);
789 break;
790 default:
791 name = rs[Rs_color + Color_bg];
792 xcol.set (this, name);
793 break;
794 }
795 }
796 }
797
798 pix_colors[i] = xcol;
799 rs[Rs_color + i] = name;
800 }
801
802 if (depth <= 2)
803 {
804 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
805 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
806 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
807 }
808 1121
809 /* 1122 /*
810 * get scrollBar shadow colors 1123 * get scrollBar shadow colors
811 * 1124 *
812 * The calculations of topShadow/bottomShadow values are adapted 1125 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 1126 * from the fvwm window manager.
814 */ 1127 */
815#ifdef KEEP_SCROLLCOLOR 1128#ifdef RXVT_SCROLLBAR
816 if (depth <= 2)
817 {
818 /* Monochrome */
819 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg);
821 alias_color (Color_bottomShadow, Color_bg);
822 }
823 else
824 {
825 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1129 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
826 1130
827 rgba cscroll; 1131 rgba cscroll;
828 pix_colors [Color_scroll].get (cscroll); 1132 pix_colors [Color_scroll].get (cscroll);
829 1133
830 /* topShadowColor */ 1134 /* topShadowColor */
831 if (!pix_colors[Color_topShadow].set (this, 1135 if (!pix_colors[Color_topShadow].set (this,
832 rgba ( 1136 rgba (
833 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
834 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1138 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1139 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 1140 cscroll.a)
837 )) 1141 ))
838 alias_color (Color_topShadow, Color_White); 1142 alias_color (Color_topShadow, Color_White);
839 } 1143#endif
840#endif /* KEEP_SCROLLCOLOR */
841 1144
842#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1146 for (i = 0; i < NRS_COLORS; i++)
844 update_fade_color (i); 1147 update_fade_color (i, true);
845#endif 1148#endif
846} 1149}
847 1150
848/*----------------------------------------------------------------------*/ 1151/*----------------------------------------------------------------------*/
849/* color aliases, fg/bg bright-bold */ 1152/* color aliases, fg/bg bright-bold */
850void 1153void
851rxvt_term::color_aliases (int idx) 1154rxvt_term::color_aliases (int idx)
852{ 1155{
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1156 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
854 { 1157 {
855 int i = atoi (rs[Rs_color + idx]); 1158 int i = atoi (rs[Rs_color + idx]);
856 1159
857 if (i >= 8 && i <= 15) 1160 if (i >= 8 && i <= 15)
858 { /* bright colors */ 1161 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1162 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 1163 else if (i >= 0 && i <= 7)
862 } 1164 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1165 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 1166 }
867} 1167}
868 1168
869/*----------------------------------------------------------------------*/ 1169/*----------------------------------------------------------------------*/
… …
901 for (j = map->max_keypermod; j--; k++) 1201 for (j = map->max_keypermod; j--; k++)
902 { 1202 {
903 if (kc[k] == 0) 1203 if (kc[k] == 0)
904 break; 1204 break;
905 1205
906 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1206 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
907 { 1207 {
908 case XK_Num_Lock: 1208 case XK_Num_Lock:
909 ModNumLockMask = modmasks[i - 1]; 1209 ModNumLockMask = modmasks[i - 1];
910 continue; 1210 continue;
911 1211
… …
953 1253
954 if (i) 1254 if (i)
955 ModMetaMask = modmasks[i - 1]; 1255 ModMetaMask = modmasks[i - 1];
956} 1256}
957 1257
1258void
1259rxvt_term::set_icon (const char *file)
1260{
1261#if HAVE_PIXBUF && ENABLE_EWMH
1262 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1263 if (!pixbuf)
1264 {
1265 rxvt_warn ("Loading image icon failed, continuing without.\n");
1266 return;
1267 }
1268
1269 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1270 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1271
1272 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1273 {
1274 rxvt_warn ("Icon image too big, continuing without.\n");
1275 g_object_unref (pixbuf);
1276 return;
1277 }
1278
1279 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1280 {
1281 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1282 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1283 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1284
1285 buffer [0] = w;
1286 buffer [1] = h;
1287 for (int i = 0; i < h; i++)
1288 {
1289 for (int j = 0; j < w; j++)
1290 {
1291 unsigned char *pixel = row + j * channels;
1292 long value;
1293
1294 if (channels == 4)
1295 value = pixel[3];
1296 else
1297 value = (unsigned char)0x00ff;
1298
1299 value = (value << 8) + pixel[0];
1300 value = (value << 8) + pixel[1];
1301 value = (value << 8) + pixel[2];
1302 buffer[(i * w + j) + 2] = value;
1303 }
1304
1305 row += rowstride;
1306 }
1307
1308 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1309 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1310 free (buffer);
1311 }
1312 else
1313 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1314
1315 g_object_unref (pixbuf);
1316#endif
1317}
1318
958/*----------------------------------------------------------------------*/ 1319/*----------------------------------------------------------------------*/
959/* rxvt_Create_Windows () - Open and map the window */ 1320/* Open and map the window */
960void 1321void
961rxvt_term::create_windows (int argc, const char *const *argv) 1322rxvt_term::create_windows (int argc, const char *const *argv)
962{ 1323{
963 XClassHint classHint; 1324 XClassHint classHint;
964 XWMHints wmHint; 1325 XWMHints wmHint;
… …
970 Window top, parent; 1331 Window top, parent;
971 1332
972 dLocal (Display *, dpy); 1333 dLocal (Display *, dpy);
973 1334
974 /* grab colors before netscape does */ 1335 /* grab colors before netscape does */
975 Get_Colours (); 1336 get_colors ();
976 1337
977 if (!set_fonts ()) 1338 if (!set_fonts ())
978 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1339 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
979 1340
980 parent = display->root; 1341 parent = display->root;
… …
1010 } 1371 }
1011#endif 1372#endif
1012 1373
1013 window_calc (0, 0); 1374 window_calc (0, 0);
1014 1375
1015 /* sub-window placement & size in rxvt_resize_subwindows () */ 1376 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1016 attributes.background_pixel = pix_colors_focused [Color_border]; 1377 attributes.background_pixel = pix_colors_focused [Color_border];
1017 attributes.border_pixel = pix_colors_focused [Color_border]; 1378 attributes.border_pixel = pix_colors_focused [Color_border];
1018 attributes.colormap = cmap; 1379 attributes.colormap = cmap;
1019 1380
1020 top = XCreateWindow (dpy, parent, 1381 top = XCreateWindow (dpy, parent,
… …
1023 ext_bwidth, 1384 ext_bwidth,
1024 depth, InputOutput, visual, 1385 depth, InputOutput, visual,
1025 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1386 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1026 &attributes); 1387 &attributes);
1027 1388
1028 this->parent[0] = top; 1389 this->parent = top;
1029 1390
1030 old_width = szHint.width; 1391 set_title (rs [Rs_title]);
1031 old_height = szHint.height; 1392 set_icon_name (rs [Rs_iconName]);
1032
1033 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1034 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1035 1393
1036 classHint.res_name = (char *)rs[Rs_name]; 1394 classHint.res_name = (char *)rs[Rs_name];
1037 classHint.res_class = (char *)RESCLASS; 1395 classHint.res_class = (char *)RESCLASS;
1038 1396
1039 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1397 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1040 wmHint.input = True; 1398 wmHint.input = True;
1041 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1399 wmHint.initial_state = option (Opt_iconic) ? IconicState
1400 : option (Opt_dockapp) ? WithdrawnState
1401 : NormalState;
1042 wmHint.window_group = top; 1402 wmHint.window_group = top;
1043 1403
1044 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1045 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH
1407 /*
1408 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon
1410 */
1411
1412 if (rs [Rs_iconfile])
1413 set_icon (rs [Rs_iconfile]);
1414#endif
1046 1415
1047#if ENABLE_FRILLS 1416#if ENABLE_FRILLS
1048 if (mwmhints.flags) 1417 if (mwmhints.flags)
1049 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1418 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1050 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1419 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1055#if ENABLE_EWMH 1424#if ENABLE_EWMH
1056 xa[XA_NET_WM_PING], 1425 xa[XA_NET_WM_PING],
1057#endif 1426#endif
1058 }; 1427 };
1059 1428
1060 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1429 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1061 1430
1062#if ENABLE_FRILLS 1431#if ENABLE_FRILLS
1063 if (rs[Rs_transient_for]) 1432 if (rs[Rs_transient_for])
1064 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1433 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1065#endif 1434#endif
… …
1083 | ExposureMask | StructureNotifyMask); 1452 | ExposureMask | StructureNotifyMask);
1084 1453
1085 termwin_ev.start (display, top); 1454 termwin_ev.start (display, top);
1086 1455
1087 /* vt cursor: Black-on-White is standard, but this is more popular */ 1456 /* vt cursor: Black-on-White is standard, but this is more popular */
1457 unsigned int shape = XC_xterm;
1458
1459#ifdef HAVE_XMU
1460 if (rs[Rs_pointerShape])
1461 {
1462 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1463 if (stmp >= 0)
1464 shape = stmp;
1465 }
1466#endif
1467
1088 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, shape);
1089
1090#ifdef HAVE_SCROLLBARS
1091 /* cursor scrollBar: Black-on-White */
1092 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1093#endif
1094 1469
1095 /* the vt window */ 1470 /* the vt window */
1096 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1097 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1098 width, height, 1473 vt_width, vt_height,
1099 0, 1474 0,
1100 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1101 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1102 1477
1103 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;
… …
1123 GCForeground | GCBackground | GCGraphicsExposures, 1498 GCForeground | GCBackground | GCGraphicsExposures,
1124 &gcvalue); 1499 &gcvalue);
1125 1500
1126 drawable = new rxvt_drawable (this, vt); 1501 drawable = new rxvt_drawable (this, vt);
1127 1502
1128#ifdef RXVT_SCROLLBAR
1129 gcvalue.foreground = pix_colors[Color_topShadow];
1130 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1131 gcvalue.foreground = pix_colors[Color_bottomShadow];
1132 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1133 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1134 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1135#endif
1136
1137#ifdef OFF_FOCUS_FADING 1503#ifdef OFF_FOCUS_FADING
1138 // initially we are in unfocused state 1504 // initially we are in unfocused state
1139 if (rs[Rs_fade]) 1505 if (rs[Rs_fade])
1140 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1141#endif 1507#endif
1142 1508
1143 pointer_unblank (); 1509 pointer_unblank ();
1144 scr_recolour (); 1510 scr_recolor ();
1145}
1146
1147/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */
1150void
1151rxvt_get_ttymode (ttymode_t *tio, int erase)
1152{
1153 /*
1154 * standard System V termios interface
1155 */
1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1157 {
1158 // return error - use system defaults,
1159 // where possible, and zero elsewhere
1160 memset (tio, 0, sizeof (ttymode_t));
1161
1162 tio->c_cc[VINTR] = CINTR;
1163 tio->c_cc[VQUIT] = CQUIT;
1164 tio->c_cc[VERASE] = CERASE;
1165#ifdef VERASE2
1166 tio->c_cc[VERASE2] = CERASE2;
1167#endif
1168 tio->c_cc[VKILL] = CKILL;
1169 tio->c_cc[VSTART] = CSTART;
1170 tio->c_cc[VSTOP] = CSTOP;
1171 tio->c_cc[VSUSP] = CSUSP;
1172# ifdef VDSUSP
1173 tio->c_cc[VDSUSP] = CDSUSP;
1174# endif
1175# ifdef VREPRINT
1176 tio->c_cc[VREPRINT] = CRPRNT;
1177# endif
1178# ifdef VDISCRD
1179 tio->c_cc[VDISCRD] = CFLUSH;
1180# endif
1181# ifdef VWERSE
1182 tio->c_cc[VWERSE] = CWERASE;
1183# endif
1184# ifdef VLNEXT
1185 tio->c_cc[VLNEXT] = CLNEXT;
1186# endif
1187 }
1188
1189 tio->c_cc[VEOF] = CEOF;
1190 tio->c_cc[VEOL] = VDISABLE;
1191# ifdef VEOL2
1192 tio->c_cc[VEOL2] = VDISABLE;
1193# endif
1194# ifdef VSWTC
1195 tio->c_cc[VSWTC] = VDISABLE;
1196# endif
1197# ifdef VSWTCH
1198 tio->c_cc[VSWTCH] = VDISABLE;
1199# endif
1200# if VMIN != VEOF
1201 tio->c_cc[VMIN] = 1;
1202# endif
1203# if VTIME != VEOL
1204 tio->c_cc[VTIME] = 0;
1205# endif
1206
1207 if (erase != -1)
1208 tio->c_cc[VERASE] = (char)erase;
1209
1210 /* input modes */
1211 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1212# ifdef IMAXBEL
1213 | IMAXBEL
1214# endif
1215 | IXON);
1216
1217 /* output modes */
1218 tio->c_oflag = (OPOST | ONLCR);
1219
1220 /* control modes */
1221 tio->c_cflag = (CS8 | CREAD);
1222
1223 /* line discipline modes */
1224 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1225# if defined (ECHOCTL) && defined (ECHOKE)
1226 | ECHOCTL | ECHOKE
1227# endif
1228 | ECHOE | ECHOK);
1229
1230 /*
1231 * Debugging
1232 */
1233#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n");
1237
1238 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \
1240 if ((tio->c_iflag) & flag) \
1241 fprintf (stderr, "%s ", name)
1242
1243 /* c_iflag bits */
1244 FOO (IGNBRK, "IGNBRK");
1245 FOO (BRKINT, "BRKINT");
1246 FOO (IGNPAR, "IGNPAR");
1247 FOO (PARMRK, "PARMRK");
1248 FOO (INPCK, "INPCK");
1249 FOO (ISTRIP, "ISTRIP");
1250 FOO (INLCR, "INLCR");
1251 FOO (IGNCR, "IGNCR");
1252 FOO (ICRNL, "ICRNL");
1253 FOO (IXON, "IXON");
1254 FOO (IXOFF, "IXOFF");
1255# ifdef IUCLC
1256 FOO (IUCLC, "IUCLC");
1257# endif
1258# ifdef IXANY
1259 FOO (IXANY, "IXANY");
1260# endif
1261# ifdef IMAXBEL
1262 FOO (IMAXBEL, "IMAXBEL");
1263# endif
1264
1265 fprintf (stderr, "\n");
1266
1267# undef FOO
1268# define FOO(entry, name) \
1269 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1270
1271 FOO (VINTR, "VINTR");
1272 FOO (VQUIT, "VQUIT");
1273 FOO (VERASE, "VERASE");
1274 FOO (VKILL, "VKILL");
1275 FOO (VEOF, "VEOF");
1276 FOO (VEOL, "VEOL");
1277# ifdef VEOL2
1278 FOO (VEOL2, "VEOL2");
1279# endif
1280# ifdef VSWTC
1281 FOO (VSWTC, "VSWTC");
1282# endif
1283# ifdef VSWTCH
1284 FOO (VSWTCH, "VSWTCH");
1285# endif
1286 FOO (VSTART, "VSTART");
1287 FOO (VSTOP, "VSTOP");
1288 FOO (VSUSP, "VSUSP");
1289# ifdef VDSUSP
1290 FOO (VDSUSP, "VDSUSP");
1291# endif
1292# ifdef VREPRINT
1293 FOO (VREPRINT, "VREPRINT");
1294# endif
1295# ifdef VDISCRD
1296 FOO (VDISCRD, "VDISCRD");
1297# endif
1298# ifdef VWERSE
1299 FOO (VWERSE, "VWERSE");
1300# endif
1301# ifdef VLNEXT
1302 FOO (VLNEXT, "VLNEXT");
1303# endif
1304
1305 fprintf (stderr, "\n");
1306# undef FOO
1307# endif /* HAVE_TERMIOS_H */
1308#endif /* DEBUG_TTYMODE */
1309} 1511}
1310 1512
1311/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1312/* 1514/*
1313 * Run the command in a subprocess and return a file descriptor for the 1515 * Run the command in a subprocess and return a file descriptor for the
… …
1325 if (pty->pty >= 0) 1527 if (pty->pty >= 0)
1326 { 1528 {
1327 if (getfd_hook) 1529 if (getfd_hook)
1328 pty->pty = (*getfd_hook) (pty->pty); 1530 pty->pty = (*getfd_hook) (pty->pty);
1329 1531
1330 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1532 if (pty->pty < 0)
1331 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1533 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1332 } 1534 }
1333 } 1535 }
1334 else 1536 else
1335#endif 1537#endif
1336 if (!pty->get ()) 1538 if (!pty->get ())
1337 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1539 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1338 1540
1339 int er; 1541 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1542
1543 struct termios tio = def_tio;
1340 1544
1341#ifndef NO_BACKSPACE_KEY 1545#ifndef NO_BACKSPACE_KEY
1342 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1546 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1343 er = rs[Rs_backspace_key][0]; 1547 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1344 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1548 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1345 er = '\177'; /* the initial state anyway */ 1549 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1346 else
1347#endif 1550#endif
1348 er = -1;
1349 1551
1350 rxvt_get_ttymode (&tio, er); 1552 /* init terminal attributes */
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1553 cfsetospeed (&tio, BAUDRATE);
1554 cfsetispeed (&tio, BAUDRATE);
1555 tcsetattr (pty->tty, TCSANOW, &tio);
1352 pty->set_utf8_mode (enc_utf8); 1556 pty->set_utf8_mode (enc_utf8);
1353 1557
1354 /* set initial window size */ 1558 /* set initial window size */
1355 tt_winch (); 1559 tt_winch ();
1356 1560
… …
1392 1596
1393 _exit (EXIT_FAILURE); 1597 _exit (EXIT_FAILURE);
1394 1598
1395 default: 1599 default:
1396 if (!option (Opt_utmpInhibit)) 1600 if (!option (Opt_utmpInhibit))
1601 {
1602#ifdef LOG_ONLY_ON_LOGIN
1603 bool login_shell = option (Opt_loginShell);
1604#else
1605 bool login_shell = true;
1606#endif
1397 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1607 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1608 }
1398 1609
1399 pty->close_tty (); 1610 pty->close_tty ();
1400 1611
1401 child_ev.start (cmd_pid); 1612 child_ev.start (cmd_pid);
1402 1613
… …
1416rxvt_term::run_child (const char *const *argv) 1627rxvt_term::run_child (const char *const *argv)
1417{ 1628{
1418 char *login; 1629 char *login;
1419 1630
1420 if (option (Opt_console)) 1631 if (option (Opt_console))
1632 {
1421 { /* be virtual console, fail silently */ 1633 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1634#ifdef TIOCCONS
1423 unsigned int on = 1; 1635 unsigned int on = 1;
1424 1636
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1637 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1638#elif defined (SRIOCSREDIR)
1427 int fd; 1639 int fd;
1428 1640
1429 fd = open (CONSOLE, O_WRONLY, 0); 1641 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1642 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1643 {
1644 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1432 close (fd); 1645 close (fd);
1433#endif /* SRIOCSREDIR */ 1646 }
1647#endif /* SRIOCSREDIR */
1434 } 1648 }
1435 1649
1436 /* reset signals and spin off the command interpreter */ 1650 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1651 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1652 signal (SIGQUIT, SIG_DFL);
1439 signal (SIGCHLD, SIG_DFL); 1653 signal (SIGCHLD, SIG_DFL);
1440 signal (SIGHUP, SIG_DFL); 1654 signal (SIGHUP, SIG_DFL);
1441 signal (SIGPIPE, SIG_DFL); 1655 signal (SIGPIPE, SIG_DFL);
1442 /* 1656 /*
1443 * mimick login's behavior by disabling the job control signals 1657 * mimic login's behavior by disabling the job control signals
1444 * a shell that wants them can turn them back on 1658 * a shell that wants them can turn them back on
1445 */ 1659 */
1446#ifdef SIGTSTP 1660#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1661 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1662 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1663 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1664#endif /* SIGTSTP */
1451
1452 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss;
1454 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0);
1456 1665
1457 /* command interpreter path */ 1666 /* command interpreter path */
1458 if (argv) 1667 if (argv)
1459 { 1668 {
1460# ifdef DEBUG_CMD 1669# ifdef DEBUG_CMD
… …
1472 const char *argv0, *shell; 1681 const char *argv0, *shell;
1473 1682
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1683 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1684 shell = "/bin/sh";
1476 1685
1477 argv0 = (const char *)rxvt_basename (shell); 1686 argv0 = rxvt_basename (shell);
1478 1687
1479 if (option (Opt_loginShell)) 1688 if (option (Opt_loginShell))
1480 { 1689 {
1481 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1690 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1691

Diff Legend

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