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.257 by root, Sun Apr 26 01:51:20 2009 UTC vs.
Revision 1.338 by sf-exg, Mon Oct 6 11:11:19 2014 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) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
… …
73#include <netinet/in.h> 76#include <netinet/in.h>
74#include <arpa/inet.h> 77#include <arpa/inet.h>
75#include <net/if.h> 78#include <net/if.h>
76#include <net/if_arp.h> 79#include <net/if_arp.h>
77 80
78static char * 81static char * ecb_cold
79rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
80{ 83{
81 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 85 struct ifconf ifc;
83 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
143 146
144 return rval; 147 return rval;
145} 148}
146#endif 149#endif
147 150
148const char *const def_colorName[] = 151static const char *const def_colorName[] =
149 { 152 {
150 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
152 /* low-intensity colors */ 155 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 181
182#if !USE_256_COLORS
179 // 88 xterm colours 183 // 88 xterm colours
180 "rgb:00/00/00", 184 "rgb:00/00/00",
181 "rgb:00/00/8b", 185 "rgb:00/00/8b",
182 "rgb:00/00/cd", 186 "rgb:00/00/cd",
183 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 255 "rgb:e7/e7/e7",
256#else
257 // 256 xterm colours
258 "rgb:00/00/00",
259 "rgb:00/00/5f",
260 "rgb:00/00/87",
261 "rgb:00/00/af",
262 "rgb:00/00/d7",
263 "rgb:00/00/ff",
264 "rgb:00/5f/00",
265 "rgb:00/5f/5f",
266 "rgb:00/5f/87",
267 "rgb:00/5f/af",
268 "rgb:00/5f/d7",
269 "rgb:00/5f/ff",
270 "rgb:00/87/00",
271 "rgb:00/87/5f",
272 "rgb:00/87/87",
273 "rgb:00/87/af",
274 "rgb:00/87/d7",
275 "rgb:00/87/ff",
276 "rgb:00/af/00",
277 "rgb:00/af/5f",
278 "rgb:00/af/87",
279 "rgb:00/af/af",
280 "rgb:00/af/d7",
281 "rgb:00/af/ff",
282 "rgb:00/d7/00",
283 "rgb:00/d7/5f",
284 "rgb:00/d7/87",
285 "rgb:00/d7/af",
286 "rgb:00/d7/d7",
287 "rgb:00/d7/ff",
288 "rgb:00/ff/00",
289 "rgb:00/ff/5f",
290 "rgb:00/ff/87",
291 "rgb:00/ff/af",
292 "rgb:00/ff/d7",
293 "rgb:00/ff/ff",
294 "rgb:5f/00/00",
295 "rgb:5f/00/5f",
296 "rgb:5f/00/87",
297 "rgb:5f/00/af",
298 "rgb:5f/00/d7",
299 "rgb:5f/00/ff",
300 "rgb:5f/5f/00",
301 "rgb:5f/5f/5f",
302 "rgb:5f/5f/87",
303 "rgb:5f/5f/af",
304 "rgb:5f/5f/d7",
305 "rgb:5f/5f/ff",
306 "rgb:5f/87/00",
307 "rgb:5f/87/5f",
308 "rgb:5f/87/87",
309 "rgb:5f/87/af",
310 "rgb:5f/87/d7",
311 "rgb:5f/87/ff",
312 "rgb:5f/af/00",
313 "rgb:5f/af/5f",
314 "rgb:5f/af/87",
315 "rgb:5f/af/af",
316 "rgb:5f/af/d7",
317 "rgb:5f/af/ff",
318 "rgb:5f/d7/00",
319 "rgb:5f/d7/5f",
320 "rgb:5f/d7/87",
321 "rgb:5f/d7/af",
322 "rgb:5f/d7/d7",
323 "rgb:5f/d7/ff",
324 "rgb:5f/ff/00",
325 "rgb:5f/ff/5f",
326 "rgb:5f/ff/87",
327 "rgb:5f/ff/af",
328 "rgb:5f/ff/d7",
329 "rgb:5f/ff/ff",
330 "rgb:87/00/00",
331 "rgb:87/00/5f",
332 "rgb:87/00/87",
333 "rgb:87/00/af",
334 "rgb:87/00/d7",
335 "rgb:87/00/ff",
336 "rgb:87/5f/00",
337 "rgb:87/5f/5f",
338 "rgb:87/5f/87",
339 "rgb:87/5f/af",
340 "rgb:87/5f/d7",
341 "rgb:87/5f/ff",
342 "rgb:87/87/00",
343 "rgb:87/87/5f",
344 "rgb:87/87/87",
345 "rgb:87/87/af",
346 "rgb:87/87/d7",
347 "rgb:87/87/ff",
348 "rgb:87/af/00",
349 "rgb:87/af/5f",
350 "rgb:87/af/87",
351 "rgb:87/af/af",
352 "rgb:87/af/d7",
353 "rgb:87/af/ff",
354 "rgb:87/d7/00",
355 "rgb:87/d7/5f",
356 "rgb:87/d7/87",
357 "rgb:87/d7/af",
358 "rgb:87/d7/d7",
359 "rgb:87/d7/ff",
360 "rgb:87/ff/00",
361 "rgb:87/ff/5f",
362 "rgb:87/ff/87",
363 "rgb:87/ff/af",
364 "rgb:87/ff/d7",
365 "rgb:87/ff/ff",
366 "rgb:af/00/00",
367 "rgb:af/00/5f",
368 "rgb:af/00/87",
369 "rgb:af/00/af",
370 "rgb:af/00/d7",
371 "rgb:af/00/ff",
372 "rgb:af/5f/00",
373 "rgb:af/5f/5f",
374 "rgb:af/5f/87",
375 "rgb:af/5f/af",
376 "rgb:af/5f/d7",
377 "rgb:af/5f/ff",
378 "rgb:af/87/00",
379 "rgb:af/87/5f",
380 "rgb:af/87/87",
381 "rgb:af/87/af",
382 "rgb:af/87/d7",
383 "rgb:af/87/ff",
384 "rgb:af/af/00",
385 "rgb:af/af/5f",
386 "rgb:af/af/87",
387 "rgb:af/af/af",
388 "rgb:af/af/d7",
389 "rgb:af/af/ff",
390 "rgb:af/d7/00",
391 "rgb:af/d7/5f",
392 "rgb:af/d7/87",
393 "rgb:af/d7/af",
394 "rgb:af/d7/d7",
395 "rgb:af/d7/ff",
396 "rgb:af/ff/00",
397 "rgb:af/ff/5f",
398 "rgb:af/ff/87",
399 "rgb:af/ff/af",
400 "rgb:af/ff/d7",
401 "rgb:af/ff/ff",
402 "rgb:d7/00/00",
403 "rgb:d7/00/5f",
404 "rgb:d7/00/87",
405 "rgb:d7/00/af",
406 "rgb:d7/00/d7",
407 "rgb:d7/00/ff",
408 "rgb:d7/5f/00",
409 "rgb:d7/5f/5f",
410 "rgb:d7/5f/87",
411 "rgb:d7/5f/af",
412 "rgb:d7/5f/d7",
413 "rgb:d7/5f/ff",
414 "rgb:d7/87/00",
415 "rgb:d7/87/5f",
416 "rgb:d7/87/87",
417 "rgb:d7/87/af",
418 "rgb:d7/87/d7",
419 "rgb:d7/87/ff",
420 "rgb:d7/af/00",
421 "rgb:d7/af/5f",
422 "rgb:d7/af/87",
423 "rgb:d7/af/af",
424 "rgb:d7/af/d7",
425 "rgb:d7/af/ff",
426 "rgb:d7/d7/00",
427 "rgb:d7/d7/5f",
428 "rgb:d7/d7/87",
429 "rgb:d7/d7/af",
430 "rgb:d7/d7/d7",
431 "rgb:d7/d7/ff",
432 "rgb:d7/ff/00",
433 "rgb:d7/ff/5f",
434 "rgb:d7/ff/87",
435 "rgb:d7/ff/af",
436 "rgb:d7/ff/d7",
437 "rgb:d7/ff/ff",
438 "rgb:ff/00/00",
439 "rgb:ff/00/5f",
440 "rgb:ff/00/87",
441 "rgb:ff/00/af",
442 "rgb:ff/00/d7",
443 "rgb:ff/00/ff",
444 "rgb:ff/5f/00",
445 "rgb:ff/5f/5f",
446 "rgb:ff/5f/87",
447 "rgb:ff/5f/af",
448 "rgb:ff/5f/d7",
449 "rgb:ff/5f/ff",
450 "rgb:ff/87/00",
451 "rgb:ff/87/5f",
452 "rgb:ff/87/87",
453 "rgb:ff/87/af",
454 "rgb:ff/87/d7",
455 "rgb:ff/87/ff",
456 "rgb:ff/af/00",
457 "rgb:ff/af/5f",
458 "rgb:ff/af/87",
459 "rgb:ff/af/af",
460 "rgb:ff/af/d7",
461 "rgb:ff/af/ff",
462 "rgb:ff/d7/00",
463 "rgb:ff/d7/5f",
464 "rgb:ff/d7/87",
465 "rgb:ff/d7/af",
466 "rgb:ff/d7/d7",
467 "rgb:ff/d7/ff",
468 "rgb:ff/ff/00",
469 "rgb:ff/ff/5f",
470 "rgb:ff/ff/87",
471 "rgb:ff/ff/af",
472 "rgb:ff/ff/d7",
473 "rgb:ff/ff/ff",
474 "rgb:08/08/08",
475 "rgb:12/12/12",
476 "rgb:1c/1c/1c",
477 "rgb:26/26/26",
478 "rgb:30/30/30",
479 "rgb:3a/3a/3a",
480 "rgb:44/44/44",
481 "rgb:4e/4e/4e",
482 "rgb:58/58/58",
483 "rgb:62/62/62",
484 "rgb:6c/6c/6c",
485 "rgb:76/76/76",
486 "rgb:80/80/80",
487 "rgb:8a/8a/8a",
488 "rgb:94/94/94",
489 "rgb:9e/9e/9e",
490 "rgb:a8/a8/a8",
491 "rgb:b2/b2/b2",
492 "rgb:bc/bc/bc",
493 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0",
495 "rgb:da/da/da",
496 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee",
498#endif
252 499
253#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 513#if ENABLE_FRILLS
267 NULL, // Color_underline 514 NULL, // Color_underline
268#endif 515#endif
269#ifdef OPTION_HC 516#ifdef OPTION_HC
270 NULL, 517 NULL,
518 NULL,
271#endif 519#endif
272 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
275#endif 523#endif
276#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
277 NULL, 525 NULL,
278#endif 526#endif
279#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 528 "rgb:00/00/00",
281#endif 529#endif
… …
293 ncol = 80; 541 ncol = 80;
294 nrow = 24; 542 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 547 saveLines = SAVELINES;
299 548
300 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
301 550
302 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 563 set_option (Opt_buffered);
314}
315
316static void
317init_secondary ()
318{
319 int i;
320
321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
322 {
323 dup2 (STDERR_FILENO, STDIN_FILENO);
324 }
325 else if (i != STDIN_FILENO)
326 {
327 dup2 (i, STDIN_FILENO);
328 close (i);
329 }
330
331 dup2 (STDERR_FILENO, STDOUT_FILENO);
332} 564}
333 565
334/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
335const char ** 567const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
337{ 569{
338 int i, r_argc; 570 int i;
339 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
340
341 /*
342 * Look for -e option. Find => split and make cmd_argv[] of command args
343 */
344 for (r_argc = 0; r_argc < argc; r_argc++)
345 if (!strcmp (argv[r_argc], "-e"))
346 break;
347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
363
364 for (i = 0; i < r_argc; i++)
365 r_argv[i] = (const char *)argv[i];
366
367 r_argv[i] = NULL;
368 572
369 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
370 574
371 /* 575 /*
372 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
373 */ 577 */
374 578
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
377 581
378 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
379 583
380 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 586
386 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
387 xa = display->xa; 588 xa = display->xa;
388 589
389 set (display); 590 set (display);
390 extract_resources (); 591 extract_resources ();
391 592
392#if XFT 593#if ENABLE_FRILLS
393 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
395#endif 598#endif
396
397 free (r_argv);
398 599
399 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
400 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
401 rs [i] = 0; 602 rs [i] = 0;
402 603
403#ifdef HAVE_AFTERIMAGE
404 set_application_name ((char *)rs[Rs_name]);
405 set_output_threshold (OUTPUT_LEVEL_WARNING);
406#endif
407
408#if ENABLE_PERL 604#if ENABLE_PERL
409 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
410 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
411 607
412 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
415 { 611 {
416 rxvt_perl.init (this); 612 rxvt_perl.init (this);
417 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
418 } 614 }
419#endif 615#endif
616
617 extract_keysym_resources ();
420 618
421 /* 619 /*
422 * set any defaults not already set 620 * set any defaults not already set
423 */ 621 */
424 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
448 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 646 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 648
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 650 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
651
652 if (rs[Rs_letterSpace])
653 letterSpace = atoi (rs[Rs_letterSpace]);
453#endif 654#endif
454 655
455#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 658 pointerBlankDelay = i;
458 else 659 else
459 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
460#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
461 669
462 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
463 if (!saveLines) 671 if (!saveLines)
464 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
465 673
… …
530 return cmd_argv; 738 return cmd_argv;
531} 739}
532 740
533/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
534void 742void
535rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 743rxvt_term::init (stringvec *argv, stringvec *envv)
536{ 744{
745 argv->push_back (0);
746 envv->push_back (0);
747
748 this->argv = argv;
537 this->envv = envv; 749 this->envv = envv;
538 750
751 env = new char *[this->envv->size ()];
752 for (int i = 0; i < this->envv->size (); i++)
753 env[i] = this->envv->at (i);
754
755 init2 (argv->size () - 1, argv->begin ());
756}
757
758void
759rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
760{
761#if ENABLE_PERL
762 // perl might want to access the stringvecs later, so we need to copy them
763 stringvec *args = new stringvec;
764 for (int i = 0; i < argc; i++)
765 args->push_back (strdup (argv [i]));
766
767 stringvec *envs = new stringvec;
768 for (const char *const *var = envv; *var; var++)
769 envs->push_back (strdup (*var));
770
771 init (args, envs);
772#else
773 init2 (argc, argv);
774#endif
775}
776
777void
778rxvt_term::init2 (int argc, const char *const *argv)
779{
539 SET_R (this); 780 SET_R (this);
540 set_locale (""); 781 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :( 782 set_environ (env); // a few things in X do not call setlocale :(
542 783
543 init_vars (); 784 init_vars ();
544
545 init_secondary ();
546 785
547 const char **cmd_argv = init_resources (argc, argv); 786 const char **cmd_argv = init_resources (argc, argv);
548 787
549#ifdef KEYSYM_RESOURCE 788#ifdef KEYSYM_RESOURCE
550 keyboard->register_done (); 789 keyboard->register_done ();
… …
559 if (chdir (path)) 798 if (chdir (path))
560 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 799 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
561 } 800 }
562 801
563 if (option (Opt_scrollBar)) 802 if (option (Opt_scrollBar))
564 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 803 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
565 804
566 pty = ptytty::create (); 805 pty = ptytty::create ();
567 806
568 create_windows (argc, argv); 807 create_windows (argc, argv);
569 808
… …
575 XSynchronize (dpy, True); 814 XSynchronize (dpy, True);
576#endif 815#endif
577 816
578 if (option (Opt_scrollBar)) 817 if (option (Opt_scrollBar))
579 scrollBar.resize (); /* create and map scrollbar */ 818 scrollBar.resize (); /* create and map scrollbar */
819
580#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
581 { 821 bg_init ();
582 bgPixmap.set_target (this);
583 bgPixmap.invalidate ();
584
585#ifdef ENABLE_TRANSPARENCY
586 if (option (Opt_transparent))
587 {
588 bgPixmap.set_transparent ();
589
590#ifdef HAVE_AFTERIMAGE
591 if (rs [Rs_blurradius])
592 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
593#endif
594 if (ISSET_PIXCOLOR (Color_tint))
595 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
596
597 if (rs [Rs_shade])
598 bgPixmap.set_shade (rs [Rs_shade]);
599
600 bgPixmap.set_root_pixmap ();
601 XSelectInput (dpy, display->root, PropertyChangeMask);
602 rootwin_ev.start (display, display->root);
603 }
604#endif
605
606#ifdef BG_IMAGE_FROM_FILE
607 if (rs[Rs_backgroundPixmap])
608 {
609 const char *p = rs[Rs_backgroundPixmap];
610
611 if ((p = strchr (p, ';')) != 0)
612 {
613 p++;
614 bgPixmap.set_geometry (p);
615 }
616 else
617 bgPixmap.set_defaultGeometry ();
618
619 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
620 if (!bgPixmap.window_position_sensitive ())
621 update_background ();
622 }
623#endif
624 }
625#endif 822#endif
626 823
627#if ENABLE_PERL 824#if ENABLE_PERL
628 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
629#endif 826#endif
630 827
631 set_colorfgbg (); 828 init_done = 1;
632 829
633 init_command (cmd_argv); 830 init_command (cmd_argv);
634
635 free (cmd_argv);
636 831
637 if (pty->pty >= 0) 832 if (pty->pty >= 0)
638 pty_ev.start (pty->pty, ev::READ); 833 pty_ev.start (pty->pty, ev::READ);
639 834
640 HOOK_INVOKE ((this, HOOK_START, DT_END)); 835 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
642#if ENABLE_XEMBED 837#if ENABLE_XEMBED
643 if (rs[Rs_embed]) 838 if (rs[Rs_embed])
644 { 839 {
645 long info[2] = { 0, XEMBED_MAPPED }; 840 long info[2] = { 0, XEMBED_MAPPED };
646 841
647 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 842 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
648 32, PropModeReplace, (unsigned char *)&info, 2); 843 32, PropModeReplace, (unsigned char *)&info, 2);
649 } 844 }
650#endif 845#endif
651 846
847#if HAVE_STARTUP_NOTIFICATION
848 SnDisplay *snDisplay;
849 SnLauncheeContext *snContext;
850
851 snDisplay = sn_display_new (dpy, NULL, NULL);
852 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
853
854 /* Tell the window manager that this window is part of the startup context */
855 if (snContext)
856 sn_launchee_context_setup_window (snContext, parent);
857#endif
858
652 XMapWindow (dpy, vt); 859 XMapWindow (dpy, vt);
653 XMapWindow (dpy, parent[0]); 860 XMapWindow (dpy, parent);
861
862#if HAVE_STARTUP_NOTIFICATION
863 if (snContext)
864 {
865 /* Mark the startup process as complete */
866 sn_launchee_context_complete (snContext);
867
868 sn_launchee_context_unref (snContext);
869 }
870
871 sn_display_unref (snDisplay);
872#endif
654 873
655 refresh_check (); 874 refresh_check ();
656} 875}
657 876
658/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
659void 878void
660rxvt_term::init_env () 879rxvt_term::init_env ()
661{ 880{
662 int i;
663 char *val; 881 char *val;
882 char *env_display;
883 char *env_windowid;
884 char *env_colorfgbg;
885 char *env_term;
664 886
665#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
666 /* Fixup display_name for export over pty to any interested terminal 888 /* Fixup display_name for export over pty to any interested terminal
667 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
668 * (for the first non-loopback interface) that we get from 890 * (for the first non-loopback interface) that we get from
… …
681 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
682 904
683 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
684 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
685 907
686 i = strlen (val);
687 env_display = (char *)rxvt_malloc (i + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
688 909
689 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
690 911
912 env_windowid = (char *)rxvt_malloc (21);
691 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 913 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
692 914
693 /* add entries to the environment: 915 /* add entries to the environment:
694 * @ DISPLAY: in case we started with -display 916 * @ DISPLAY: in case we started with -display
695 * @ WINDOWID: X window id number of the window 917 * @ WINDOWID: X window id number of the window
696 * @ COLORTERM: terminal sub-name and also indicates its color 918 * @ COLORTERM: terminal sub-name and also indicates its color
… …
699 * @ COLORFGBG: fg;bg color codes 921 * @ COLORFGBG: fg;bg color codes
700 */ 922 */
701 putenv (env_display); 923 putenv (env_display);
702 putenv (env_windowid); 924 putenv (env_windowid);
703 925
704 if (env_colorfgbg) 926 env_colorfgbg = get_colorfgbg ();
705 putenv (env_colorfgbg); 927 putenv (env_colorfgbg);
706 928
707#ifdef RXVT_TERMINFO 929#ifdef RXVT_TERMINFO
708 putenv ("TERMINFO=" RXVT_TERMINFO); 930 putenv ("TERMINFO=" RXVT_TERMINFO);
709#endif 931#endif
710 932
… …
729 unsetenv ("TERMCAP"); /* terminfo should be okay */ 951 unsetenv ("TERMCAP"); /* terminfo should be okay */
730#endif /* HAVE_UNSETENV */ 952#endif /* HAVE_UNSETENV */
731} 953}
732 954
733/*----------------------------------------------------------------------*/ 955/*----------------------------------------------------------------------*/
734/*
735 * This is more or less stolen straight from XFree86 xterm.
736 * This should support all European type languages.
737 */
738void 956void
739rxvt_term::set_locale (const char *locale) 957rxvt_term::set_locale (const char *locale)
740{ 958{
741 set_environ (envv); 959 set_environ (env);
742 960
743#if HAVE_XSETLOCALE || HAVE_SETLOCALE
744 free (this->locale); 961 free (this->locale);
745 this->locale = setlocale (LC_CTYPE, locale); 962 this->locale = setlocale (LC_CTYPE, locale);
746 963
747 if (!this->locale) 964 if (!this->locale)
748 { 965 {
… …
759 976
760 977
761 this->locale = strdup (this->locale); 978 this->locale = strdup (this->locale);
762 SET_LOCALE (this->locale); 979 SET_LOCALE (this->locale);
763 mbstate.reset (); 980 mbstate.reset ();
764#endif
765 981
766#if HAVE_NL_LANGINFO 982#if HAVE_NL_LANGINFO
767 char *codeset = strdup (nl_langinfo (CODESET)); 983 char *codeset = nl_langinfo (CODESET);
768 // /^UTF.?8/i 984 // /^UTF.?8/i
769 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 985 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
770 && (codeset[1] == 'T' || codeset[1] == 't') 986 && (codeset[1] == 'T' || codeset[1] == 't')
771 && (codeset[2] == 'F' || codeset[2] == 'f') 987 && (codeset[2] == 'F' || codeset[2] == 'f')
772 && (codeset[3] == '8' || codeset[4] == '8'); 988 && (codeset[3] == '8' || codeset[4] == '8');
773 free (codeset);
774#else 989#else
775 enc_utf8 = 0; 990 enc_utf8 = 0;
776#endif 991#endif
777} 992}
778 993
779void 994void
780rxvt_term::init_xlocale () 995rxvt_term::init_xlocale ()
781{ 996{
782 set_environ (envv); 997 set_environ (env);
783 998
784#ifdef USE_XIM 999#if USE_XIM
785 if (!locale) 1000 if (!locale)
786 rxvt_warn ("setting locale failed, working without locale support.\n"); 1001 rxvt_warn ("setting locale failed, continuing without locale support.\n");
787 else 1002 else
788 { 1003 {
789 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1004 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
790 1005
791 if (!XSupportsLocale ()) 1006 if (!XSupportsLocale ())
792 { 1007 {
793 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1008 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
794 return; 1009 return;
795 } 1010 }
796 1011
797 im_ev.start (display); 1012 im_ev.start (display);
798 1013
… …
947/*----------------------------------------------------------------------*/ 1162/*----------------------------------------------------------------------*/
948/* color aliases, fg/bg bright-bold */ 1163/* color aliases, fg/bg bright-bold */
949void 1164void
950rxvt_term::color_aliases (int idx) 1165rxvt_term::color_aliases (int idx)
951{ 1166{
952 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1167 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
953 { 1168 {
954 int i = atoi (rs[Rs_color + idx]); 1169 int i = atoi (rs[Rs_color + idx]);
955 1170
956 if (i >= 8 && i <= 15) 1171 if (i >= 8 && i <= 15)
957 /* bright colors */ 1172 /* bright colors */
… …
997 for (j = map->max_keypermod; j--; k++) 1212 for (j = map->max_keypermod; j--; k++)
998 { 1213 {
999 if (kc[k] == 0) 1214 if (kc[k] == 0)
1000 break; 1215 break;
1001 1216
1002 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1217 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1003 { 1218 {
1004 case XK_Num_Lock: 1219 case XK_Num_Lock:
1005 ModNumLockMask = modmasks[i - 1]; 1220 ModNumLockMask = modmasks[i - 1];
1006 continue; 1221 continue;
1007 1222
… …
1049 1264
1050 if (i) 1265 if (i)
1051 ModMetaMask = modmasks[i - 1]; 1266 ModMetaMask = modmasks[i - 1];
1052} 1267}
1053 1268
1269void
1270rxvt_term::set_icon (const char *file)
1271{
1272#if HAVE_PIXBUF
1273 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1274 if (!pixbuf)
1275 {
1276 rxvt_warn ("Loading image icon failed, continuing without.\n");
1277 return;
1278 }
1279
1280 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1281 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1282
1283 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1284 {
1285 rxvt_warn ("Icon image too big, continuing without.\n");
1286 g_object_unref (pixbuf);
1287 return;
1288 }
1289
1290 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1291 {
1292 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1293 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1294 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1295
1296 buffer [0] = w;
1297 buffer [1] = h;
1298 for (int i = 0; i < h; i++)
1299 {
1300 for (int j = 0; j < w; j++)
1301 {
1302 unsigned char *pixel = row + j * channels;
1303 long value;
1304
1305 if (channels == 4)
1306 value = pixel[3];
1307 else
1308 value = (unsigned char)0x00ff;
1309
1310 value = (value << 8) + pixel[0];
1311 value = (value << 8) + pixel[1];
1312 value = (value << 8) + pixel[2];
1313 buffer[(i * w + j) + 2] = value;
1314 }
1315
1316 row += rowstride;
1317 }
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 g_object_unref (pixbuf);
1327#endif
1328}
1329
1054/*----------------------------------------------------------------------*/ 1330/*----------------------------------------------------------------------*/
1055/* rxvt_Create_Windows () - Open and map the window */ 1331/* Open and map the window */
1056void 1332void
1057rxvt_term::create_windows (int argc, const char *const *argv) 1333rxvt_term::create_windows (int argc, const char *const *argv)
1058{ 1334{
1059 XClassHint classHint; 1335 XClassHint classHint;
1060 XWMHints wmHint; 1336 XWMHints wmHint;
… …
1106 } 1382 }
1107#endif 1383#endif
1108 1384
1109 window_calc (0, 0); 1385 window_calc (0, 0);
1110 1386
1111 /* sub-window placement & size in rxvt_resize_subwindows () */ 1387 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1112 attributes.background_pixel = pix_colors_focused [Color_border]; 1388 attributes.background_pixel = pix_colors_focused [Color_border];
1113 attributes.border_pixel = pix_colors_focused [Color_border]; 1389 attributes.border_pixel = pix_colors_focused [Color_border];
1114 attributes.colormap = cmap; 1390 attributes.colormap = cmap;
1115 1391
1116 top = XCreateWindow (dpy, parent, 1392 top = XCreateWindow (dpy, parent,
… …
1119 ext_bwidth, 1395 ext_bwidth,
1120 depth, InputOutput, visual, 1396 depth, InputOutput, visual,
1121 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1397 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1122 &attributes); 1398 &attributes);
1123 1399
1124 this->parent[0] = top; 1400 this->parent = top;
1125
1126 old_width = szHint.width;
1127 old_height = szHint.height;
1128 1401
1129 set_title (rs [Rs_title]); 1402 set_title (rs [Rs_title]);
1130 set_icon_name (rs [Rs_iconName]); 1403 set_icon_name (rs [Rs_iconName]);
1131 1404
1132 classHint.res_name = (char *)rs[Rs_name]; 1405 classHint.res_name = (char *)rs[Rs_name];
1133 classHint.res_class = (char *)RESCLASS; 1406 classHint.res_class = (char *)RESCLASS;
1134 1407
1135 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1408 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1136 wmHint.input = True; 1409 wmHint.input = True;
1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1410 wmHint.initial_state = option (Opt_iconic) ? IconicState
1411 : option (Opt_dockapp) ? WithdrawnState
1412 : NormalState;
1138 wmHint.window_group = top; 1413 wmHint.window_group = top;
1139 1414
1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1415 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1141 &szHint, &wmHint, &classHint); 1416 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH 1417#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE
1144 /* 1418 /*
1145 * set up icon hint 1419 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1420 * rs [Rs_iconfile] is path to icon
1147 */ 1421 */
1148 1422
1149 if (rs [Rs_iconfile]) 1423 if (rs [Rs_iconfile])
1150 { 1424 set_icon (rs [Rs_iconfile]);
1151 init_asv ();
1152
1153 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1154 if (asv && im)
1155 {
1156 int w = im->width;
1157 int h = im->height;
1158 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1159 ASImage *result = scale_asimage (asv, im,
1160 w, h, ASA_ARGB32,
1161 100, ASIMAGE_QUALITY_DEFAULT);
1162 destroy_asimage (&im);
1163
1164 if (buffer && result)
1165 {
1166 ARGB32 *asbuf = result->alt.argb32;
1167 buffer [0] = w;
1168 buffer [1] = h;
1169
1170 for (unsigned int i = 0; i < w * h; ++i)
1171 buffer [i + 2] = asbuf [i];
1172
1173 destroy_asimage (&result);
1174 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1175 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1176 free (buffer);
1177 }
1178 else
1179 {
1180 if (!buffer)
1181 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1182
1183 if (!result)
1184 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1185 }
1186 }
1187 else
1188 rxvt_warn ("Loading image icon failed, continuing without.\n");
1189 }
1190# endif
1191#endif 1425#endif
1192 1426
1193#if ENABLE_FRILLS 1427#if ENABLE_FRILLS
1194 if (mwmhints.flags) 1428 if (mwmhints.flags)
1195 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1429 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1201#if ENABLE_EWMH 1435#if ENABLE_EWMH
1202 xa[XA_NET_WM_PING], 1436 xa[XA_NET_WM_PING],
1203#endif 1437#endif
1204 }; 1438 };
1205 1439
1206 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1440 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1207 1441
1208#if ENABLE_FRILLS 1442#if ENABLE_FRILLS
1209 if (rs[Rs_transient_for]) 1443 if (rs[Rs_transient_for])
1210 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1444 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1211#endif 1445#endif
… …
1234 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1235 1469
1236 /* the vt window */ 1470 /* the vt window */
1237 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1238 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1239 width, height, 1473 vt_width, vt_height,
1240 0, 1474 0,
1241 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1242 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1243 1477
1244 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;
… …
1272 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1273#endif 1507#endif
1274 1508
1275 pointer_unblank (); 1509 pointer_unblank ();
1276 scr_recolour (); 1510 scr_recolour ();
1277}
1278
1279/* ------------------------------------------------------------------------- *
1280 * GET TTY CURRENT STATE *
1281 * ------------------------------------------------------------------------- */
1282void
1283rxvt_get_ttymode (struct termios *tio, int erase)
1284{
1285 /*
1286 * standard System V termios interface
1287 */
1288 if (tcgetattr (STDIN_FILENO, tio) < 0)
1289 {
1290 // return error - use system defaults,
1291 // where possible, and zero elsewhere
1292 memset (tio, 0, sizeof (struct termios));
1293
1294 tio->c_cc[VINTR] = CINTR;
1295 tio->c_cc[VQUIT] = CQUIT;
1296 tio->c_cc[VERASE] = CERASE;
1297#ifdef VERASE2
1298 tio->c_cc[VERASE2] = CERASE2;
1299#endif
1300 tio->c_cc[VKILL] = CKILL;
1301 tio->c_cc[VSTART] = CSTART;
1302 tio->c_cc[VSTOP] = CSTOP;
1303 tio->c_cc[VSUSP] = CSUSP;
1304# ifdef VDSUSP
1305 tio->c_cc[VDSUSP] = CDSUSP;
1306# endif
1307# ifdef VREPRINT
1308 tio->c_cc[VREPRINT] = CRPRNT;
1309# endif
1310# ifdef VDISCRD
1311 tio->c_cc[VDISCRD] = CFLUSH;
1312# endif
1313# ifdef VWERSE
1314 tio->c_cc[VWERSE] = CWERASE;
1315# endif
1316# ifdef VLNEXT
1317 tio->c_cc[VLNEXT] = CLNEXT;
1318# endif
1319 }
1320
1321 tio->c_cc[VEOF] = CEOF;
1322 tio->c_cc[VEOL] = VDISABLE;
1323# ifdef VEOL2
1324 tio->c_cc[VEOL2] = VDISABLE;
1325# endif
1326# ifdef VSWTC
1327 tio->c_cc[VSWTC] = VDISABLE;
1328# endif
1329# ifdef VSWTCH
1330 tio->c_cc[VSWTCH] = VDISABLE;
1331# endif
1332# if VMIN != VEOF
1333 tio->c_cc[VMIN] = 1;
1334# endif
1335# if VTIME != VEOL
1336 tio->c_cc[VTIME] = 0;
1337# endif
1338
1339 if (erase != -1)
1340 tio->c_cc[VERASE] = (char)erase;
1341
1342 /* input modes */
1343 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1344# ifdef IMAXBEL
1345 | IMAXBEL
1346# endif
1347 | IXON);
1348
1349 /* output modes */
1350 tio->c_oflag = (OPOST | ONLCR);
1351
1352 /* control modes */
1353 tio->c_cflag = (CS8 | CREAD);
1354
1355 /* line discipline modes */
1356 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1357# if defined (ECHOCTL) && defined (ECHOKE)
1358 | ECHOCTL | ECHOKE
1359# endif
1360 | ECHOE | ECHOK);
1361
1362 /*
1363 * Debugging
1364 */
1365#ifdef DEBUG_TTYMODE
1366 /* c_iflag bits */
1367 fprintf (stderr, "Input flags\n");
1368
1369 /* cpp token stringize doesn't work on all machines <sigh> */
1370# define FOO(flag,name) \
1371 if ((tio->c_iflag) & flag) \
1372 fprintf (stderr, "%s ", name)
1373
1374 /* c_iflag bits */
1375 FOO (IGNBRK, "IGNBRK");
1376 FOO (BRKINT, "BRKINT");
1377 FOO (IGNPAR, "IGNPAR");
1378 FOO (PARMRK, "PARMRK");
1379 FOO (INPCK, "INPCK");
1380 FOO (ISTRIP, "ISTRIP");
1381 FOO (INLCR, "INLCR");
1382 FOO (IGNCR, "IGNCR");
1383 FOO (ICRNL, "ICRNL");
1384 FOO (IXON, "IXON");
1385 FOO (IXOFF, "IXOFF");
1386# ifdef IUCLC
1387 FOO (IUCLC, "IUCLC");
1388# endif
1389# ifdef IXANY
1390 FOO (IXANY, "IXANY");
1391# endif
1392# ifdef IMAXBEL
1393 FOO (IMAXBEL, "IMAXBEL");
1394# endif
1395
1396 fprintf (stderr, "\n");
1397
1398# undef FOO
1399# define FOO(entry, name) \
1400 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1401
1402 FOO (VINTR, "VINTR");
1403 FOO (VQUIT, "VQUIT");
1404 FOO (VERASE, "VERASE");
1405 FOO (VKILL, "VKILL");
1406 FOO (VEOF, "VEOF");
1407 FOO (VEOL, "VEOL");
1408# ifdef VEOL2
1409 FOO (VEOL2, "VEOL2");
1410# endif
1411# ifdef VSWTC
1412 FOO (VSWTC, "VSWTC");
1413# endif
1414# ifdef VSWTCH
1415 FOO (VSWTCH, "VSWTCH");
1416# endif
1417 FOO (VSTART, "VSTART");
1418 FOO (VSTOP, "VSTOP");
1419 FOO (VSUSP, "VSUSP");
1420# ifdef VDSUSP
1421 FOO (VDSUSP, "VDSUSP");
1422# endif
1423# ifdef VREPRINT
1424 FOO (VREPRINT, "VREPRINT");
1425# endif
1426# ifdef VDISCRD
1427 FOO (VDISCRD, "VDISCRD");
1428# endif
1429# ifdef VWERSE
1430 FOO (VWERSE, "VWERSE");
1431# endif
1432# ifdef VLNEXT
1433 FOO (VLNEXT, "VLNEXT");
1434# endif
1435
1436 fprintf (stderr, "\n");
1437# undef FOO
1438#endif /* DEBUG_TTYMODE */
1439} 1511}
1440 1512
1441/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1442/* 1514/*
1443 * 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
… …
1455 if (pty->pty >= 0) 1527 if (pty->pty >= 0)
1456 { 1528 {
1457 if (getfd_hook) 1529 if (getfd_hook)
1458 pty->pty = (*getfd_hook) (pty->pty); 1530 pty->pty = (*getfd_hook) (pty->pty);
1459 1531
1460 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1532 if (pty->pty < 0)
1461 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1533 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1462 } 1534 }
1463 } 1535 }
1464 else 1536 else
1465#endif 1537#endif
1466 if (!pty->get ()) 1538 if (!pty->get ())
1467 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1539 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1468 1540
1469 int er; 1541 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1542
1543 struct termios tio = def_tio;
1470 1544
1471#ifndef NO_BACKSPACE_KEY 1545#ifndef NO_BACKSPACE_KEY
1472 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1546 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1473 er = rs[Rs_backspace_key][0]; 1547 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1474 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1548 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1475 er = '\177'; /* the initial state anyway */ 1549 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1476 else
1477#endif 1550#endif
1478 er = -1;
1479 1551
1480 rxvt_get_ttymode (&tio, er);
1481 /* init terminal attributes */ 1552 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE); 1553 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE); 1554 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio); 1555 tcsetattr (pty->tty, TCSANOW, &tio);
1485 pty->set_utf8_mode (enc_utf8); 1556 pty->set_utf8_mode (enc_utf8);
… …
1525 1596
1526 _exit (EXIT_FAILURE); 1597 _exit (EXIT_FAILURE);
1527 1598
1528 default: 1599 default:
1529 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
1530 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1607 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1608 }
1531 1609
1532 pty->close_tty (); 1610 pty->close_tty ();
1533 1611
1534 child_ev.start (cmd_pid); 1612 child_ev.start (cmd_pid);
1535 1613
… …
1560#elif defined (SRIOCSREDIR) 1638#elif defined (SRIOCSREDIR)
1561 int fd; 1639 int fd;
1562 1640
1563 fd = open (CONSOLE, O_WRONLY, 0); 1641 fd = open (CONSOLE, O_WRONLY, 0);
1564 if (fd >= 0) 1642 if (fd >= 0)
1565 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1643 {
1644 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1566 close (fd); 1645 close (fd);
1646 }
1567#endif /* SRIOCSREDIR */ 1647#endif /* SRIOCSREDIR */
1568 } 1648 }
1569 1649
1570 /* reset signals and spin off the command interpreter */ 1650 /* reset signals and spin off the command interpreter */
1571 signal (SIGINT, SIG_DFL); 1651 signal (SIGINT, SIG_DFL);
1572 signal (SIGQUIT, SIG_DFL); 1652 signal (SIGQUIT, SIG_DFL);
1573 signal (SIGCHLD, SIG_DFL); 1653 signal (SIGCHLD, SIG_DFL);
1574 signal (SIGHUP, SIG_DFL); 1654 signal (SIGHUP, SIG_DFL);
1575 signal (SIGPIPE, SIG_DFL); 1655 signal (SIGPIPE, SIG_DFL);
1576 /* 1656 /*
1577 * mimick login's behavior by disabling the job control signals 1657 * mimic login's behavior by disabling the job control signals
1578 * a shell that wants them can turn them back on 1658 * a shell that wants them can turn them back on
1579 */ 1659 */
1580#ifdef SIGTSTP 1660#ifdef SIGTSTP
1581 signal (SIGTSTP, SIG_IGN); 1661 signal (SIGTSTP, SIG_IGN);
1582 signal (SIGTTIN, SIG_IGN); 1662 signal (SIGTTIN, SIG_IGN);
… …
1601 const char *argv0, *shell; 1681 const char *argv0, *shell;
1602 1682
1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1683 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604 shell = "/bin/sh"; 1684 shell = "/bin/sh";
1605 1685
1606 argv0 = (const char *)rxvt_basename (shell); 1686 argv0 = rxvt_basename (shell);
1607 1687
1608 if (option (Opt_loginShell)) 1688 if (option (Opt_loginShell))
1609 { 1689 {
1610 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1690 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1611 1691

Diff Legend

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