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

Diff Legend

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