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.261 by sf-exg, Sat Jan 30 20:52:36 2010 UTC vs.
Revision 1.324 by root, Mon May 28 16:40:03 2012 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 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
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
… …
313 set_option (Opt_iso14755); 561 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 563 set_option (Opt_buffered);
316} 564}
317 565
318static void
319init_secondary ()
320{
321 int i;
322
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 dup2 (STDERR_FILENO, STDIN_FILENO);
326 }
327 else if (i != STDIN_FILENO)
328 {
329 dup2 (i, STDIN_FILENO);
330 close (i);
331 }
332
333 dup2 (STDERR_FILENO, STDOUT_FILENO);
334}
335
336/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
337const char ** 567const char **
338rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
339{ 569{
340 int i, r_argc; 570 int i;
341 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
342
343 /*
344 * Look for -e option. Find => split and make cmd_argv[] of command args
345 */
346 for (r_argc = 0; r_argc < argc; r_argc++)
347 if (!strcmp (argv[r_argc], "-e"))
348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
363
364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
365
366 for (i = 0; i < r_argc; i++)
367 r_argv[i] = (const char *)argv[i];
368
369 r_argv[i] = NULL;
370 572
371 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
372 574
373 /* 575 /*
374 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
375 */ 577 */
376 578
377 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
378 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
379 581
380 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
381 583
382 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
385 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]);
386 }
387 586
388 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
389 xa = display->xa; 588 xa = display->xa;
390 589
391 set (display); 590 set (display);
… …
394#if XFT 593#if XFT
395 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
396 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
397#endif 596#endif
398 597
399 free (r_argv);
400
401 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
402 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
403 rs [i] = 0; 600 rs [i] = 0;
404 601
405#ifdef HAVE_AFTERIMAGE
406 set_application_name ((char *)rs[Rs_name]);
407 set_output_threshold (OUTPUT_LEVEL_WARNING);
408#endif
409
410#if ENABLE_PERL 602#if ENABLE_PERL
411 if (!rs[Rs_perl_ext_1]) 603 if (!rs[Rs_perl_ext_1])
412 rs[Rs_perl_ext_1] = "default"; 604 rs[Rs_perl_ext_1] = "default";
413 605
414 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
417 { 609 {
418 rxvt_perl.init (this); 610 rxvt_perl.init (this);
419 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
420 } 612 }
421#endif 613#endif
614
615 // must be called after initialising the perl interpreter as it
616 // may invoke the `on_register_command' hook
617 extract_keysym_resources ();
422 618
423 /* 619 /*
424 * set any defaults not already set 620 * set any defaults not already set
425 */ 621 */
426 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
535 return cmd_argv; 731 return cmd_argv;
536} 732}
537 733
538/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
539void 735void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
541{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
542 this->envv = envv; 742 this->envv = envv;
543 743
744 init2 (argv->size () - 1, argv->begin ());
745}
746
747void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
749{
750#if ENABLE_PERL
751 // perl might want to access the stringvecs later, so we need to copy them
752 stringvec *args = new stringvec;
753 for (int i = 0; i < argc; i++)
754 args->push_back (strdup (argv [i]));
755
756 stringvec *envs = new stringvec;
757 for (const char *const *var = envv; *var; var++)
758 envs->push_back (strdup (*var));
759
760 init (args, envs);
761#else
762 init2 (argc, argv);
763#endif
764}
765
766void
767rxvt_term::init2 (int argc, const char *const *argv)
768{
544 SET_R (this); 769 SET_R (this);
545 set_locale (""); 770 set_locale ("");
546 set_environ (envv); // a few things in X do not call setlocale :( 771 set_environ (envv); // a few things in X do not call setlocale :(
547 772
548 init_vars (); 773 init_vars ();
549
550 init_secondary ();
551 774
552 const char **cmd_argv = init_resources (argc, argv); 775 const char **cmd_argv = init_resources (argc, argv);
553 776
554#ifdef KEYSYM_RESOURCE 777#ifdef KEYSYM_RESOURCE
555 keyboard->register_done (); 778 keyboard->register_done ();
… …
564 if (chdir (path)) 787 if (chdir (path))
565 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 788 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
566 } 789 }
567 790
568 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
570 793
571 pty = ptytty::create (); 794 pty = ptytty::create ();
795
796 // must be called before create_windows, because the latter may call set_icon
797#ifdef HAVE_PIXBUF
798 g_type_init ();
799#endif
572 800
573 create_windows (argc, argv); 801 create_windows (argc, argv);
574 802
575 init_xlocale (); 803 init_xlocale ();
576 804
… …
582 810
583 if (option (Opt_scrollBar)) 811 if (option (Opt_scrollBar))
584 scrollBar.resize (); /* create and map scrollbar */ 812 scrollBar.resize (); /* create and map scrollbar */
585#ifdef HAVE_BG_PIXMAP 813#ifdef HAVE_BG_PIXMAP
586 { 814 {
587 bgPixmap.set_target (this); 815 bg_init ();
588 bgPixmap.invalidate ();
589 816
590#ifdef ENABLE_TRANSPARENCY 817#ifdef ENABLE_TRANSPARENCY
591 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
592 { 819 {
593 bgPixmap.set_transparent (); 820 bg_set_transparent ();
594 821
595#ifdef HAVE_AFTERIMAGE
596 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
597 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 823 bg_set_blur (rs [Rs_blurradius]);
598#endif 824
599 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
600 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 826 bg_set_tint (pix_colors_focused [Color_tint]);
601 827
602 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
603 bgPixmap.set_shade (rs [Rs_shade]); 829 bg_set_shade (rs [Rs_shade]);
604 830
605 bgPixmap.set_root_pixmap (); 831 bg_set_root_pixmap ();
606 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
607 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
608 } 834 }
609#endif 835#endif
610
611#ifdef BG_IMAGE_FROM_FILE
612 if (rs[Rs_backgroundPixmap])
613 {
614 const char *p = rs[Rs_backgroundPixmap];
615
616 if ((p = strchr (p, ';')) != 0)
617 {
618 p++;
619 bgPixmap.set_geometry (p);
620 }
621 else
622 bgPixmap.set_defaultGeometry ();
623
624 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
625 if (!bgPixmap.window_position_sensitive ())
626 update_background ();
627 }
628#endif
629 } 836 }
630#endif 837#endif
631 838
632#if ENABLE_PERL 839#if ENABLE_PERL
633 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
634#endif 841#endif
635 842
636 set_colorfgbg (); 843 init_done = 1;
637 844
638 init_command (cmd_argv); 845 init_command (cmd_argv);
639
640 free (cmd_argv);
641 846
642 if (pty->pty >= 0) 847 if (pty->pty >= 0)
643 pty_ev.start (pty->pty, ev::READ); 848 pty_ev.start (pty->pty, ev::READ);
644 849
645 HOOK_INVOKE ((this, HOOK_START, DT_END)); 850 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
647#if ENABLE_XEMBED 852#if ENABLE_XEMBED
648 if (rs[Rs_embed]) 853 if (rs[Rs_embed])
649 { 854 {
650 long info[2] = { 0, XEMBED_MAPPED }; 855 long info[2] = { 0, XEMBED_MAPPED };
651 856
652 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 857 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
653 32, PropModeReplace, (unsigned char *)&info, 2); 858 32, PropModeReplace, (unsigned char *)&info, 2);
654 } 859 }
655#endif 860#endif
656 861
862#if HAVE_STARTUP_NOTIFICATION
863 SnDisplay *snDisplay;
864 SnLauncheeContext *snContext;
865
866 snDisplay = sn_display_new (dpy, NULL, NULL);
867 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
868
869 /* Tell the window manager that this window is part of the startup context */
870 if (snContext)
871 sn_launchee_context_setup_window (snContext, parent);
872#endif
873
657 XMapWindow (dpy, vt); 874 XMapWindow (dpy, vt);
658 XMapWindow (dpy, parent[0]); 875 XMapWindow (dpy, parent);
876
877#if HAVE_STARTUP_NOTIFICATION
878 if (snContext)
879 {
880 /* Mark the startup process as complete */
881 sn_launchee_context_complete (snContext);
882
883 sn_launchee_context_unref (snContext);
884 }
885
886 sn_display_unref (snDisplay);
887#endif
659 888
660 refresh_check (); 889 refresh_check ();
661} 890}
662 891
663/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
664void 893void
665rxvt_term::init_env () 894rxvt_term::init_env ()
666{ 895{
667 int i;
668 char *val; 896 char *val;
897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
900 char *env_term;
669 901
670#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
671 /* Fixup display_name for export over pty to any interested terminal 903 /* Fixup display_name for export over pty to any interested terminal
672 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 904 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
673 * (for the first non-loopback interface) that we get from 905 * (for the first non-loopback interface) that we get from
… …
686 val = XDisplayString (dpy); 918 val = XDisplayString (dpy);
687 919
688 if (rs[Rs_display_name] == NULL) 920 if (rs[Rs_display_name] == NULL)
689 rs[Rs_display_name] = val; /* use broken `:0' value */ 921 rs[Rs_display_name] = val; /* use broken `:0' value */
690 922
691 i = strlen (val);
692 env_display = (char *)rxvt_malloc (i + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
693 924
694 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
695 926
927 env_windowid = (char *)rxvt_malloc (21);
696 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
697 929
698 /* add entries to the environment: 930 /* add entries to the environment:
699 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
700 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
701 * @ COLORTERM: terminal sub-name and also indicates its color 933 * @ COLORTERM: terminal sub-name and also indicates its color
… …
704 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
705 */ 937 */
706 putenv (env_display); 938 putenv (env_display);
707 putenv (env_windowid); 939 putenv (env_windowid);
708 940
709 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
710 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
711 943
712#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
713 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
714#endif 946#endif
715 947
… …
734 unsetenv ("TERMCAP"); /* terminfo should be okay */ 966 unsetenv ("TERMCAP"); /* terminfo should be okay */
735#endif /* HAVE_UNSETENV */ 967#endif /* HAVE_UNSETENV */
736} 968}
737 969
738/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
739/*
740 * This is more or less stolen straight from XFree86 xterm.
741 * This should support all European type languages.
742 */
743void 971void
744rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
745{ 973{
746 set_environ (envv); 974 set_environ (envv);
747 975
748#if HAVE_XSETLOCALE || HAVE_SETLOCALE
749 free (this->locale); 976 free (this->locale);
750 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
751 978
752 if (!this->locale) 979 if (!this->locale)
753 { 980 {
… …
764 991
765 992
766 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
767 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
768 mbstate.reset (); 995 mbstate.reset ();
769#endif
770 996
771#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
772 char *codeset = strdup (nl_langinfo (CODESET)); 998 char *codeset = nl_langinfo (CODESET);
773 // /^UTF.?8/i 999 // /^UTF.?8/i
774 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
775 && (codeset[1] == 'T' || codeset[1] == 't') 1001 && (codeset[1] == 'T' || codeset[1] == 't')
776 && (codeset[2] == 'F' || codeset[2] == 'f') 1002 && (codeset[2] == 'F' || codeset[2] == 'f')
777 && (codeset[3] == '8' || codeset[4] == '8'); 1003 && (codeset[3] == '8' || codeset[4] == '8');
778 free (codeset);
779#else 1004#else
780 enc_utf8 = 0; 1005 enc_utf8 = 0;
781#endif 1006#endif
782} 1007}
783 1008
… …
786{ 1011{
787 set_environ (envv); 1012 set_environ (envv);
788 1013
789#ifdef USE_XIM 1014#ifdef USE_XIM
790 if (!locale) 1015 if (!locale)
791 rxvt_warn ("setting locale failed, working without locale support.\n"); 1016 rxvt_warn ("setting locale failed, continuing without locale support.\n");
792 else 1017 else
793 { 1018 {
794 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
795 1020
796 if (!XSupportsLocale ()) 1021 if (!XSupportsLocale ())
797 { 1022 {
798 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1023 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
799 return; 1024 return;
800 } 1025 }
801 1026
802 im_ev.start (display); 1027 im_ev.start (display);
803 1028
… …
952/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
953/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
954void 1179void
955rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
956{ 1181{
957 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
958 { 1183 {
959 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
960 1185
961 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
962 /* bright colors */ 1187 /* bright colors */
… …
1054 1279
1055 if (i) 1280 if (i)
1056 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
1057} 1282}
1058 1283
1284void
1285rxvt_term::set_icon (const char *file)
1286{
1287#ifdef HAVE_PIXBUF
1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1289 if (!pixbuf)
1290 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return;
1293 }
1294
1295 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1296 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1297
1298 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1299 {
1300 rxvt_warn ("Icon image too big, continuing without.\n");
1301 g_object_unref (pixbuf);
1302 return;
1303 }
1304
1305 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1306 {
1307 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1308 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1309 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1310
1311 buffer [0] = w;
1312 buffer [1] = h;
1313 for (int i = 0; i < h; i++)
1314 {
1315 for (int j = 0; j < w; j++)
1316 {
1317 unsigned char *pixel = row + j * channels;
1318 long value;
1319
1320 if (channels == 4)
1321 value = pixel[3];
1322 else
1323 value = (unsigned char)0x00ff;
1324
1325 value = (value << 8) + pixel[0];
1326 value = (value << 8) + pixel[1];
1327 value = (value << 8) + pixel[2];
1328 buffer[(i * w + j) + 2] = value;
1329 }
1330
1331 row += rowstride;
1332 }
1333
1334 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1335 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1336 free (buffer);
1337 }
1338 else
1339 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1340
1341 g_object_unref (pixbuf);
1342#endif
1343}
1344
1059/*----------------------------------------------------------------------*/ 1345/*----------------------------------------------------------------------*/
1060/* rxvt_Create_Windows () - Open and map the window */ 1346/* Open and map the window */
1061void 1347void
1062rxvt_term::create_windows (int argc, const char *const *argv) 1348rxvt_term::create_windows (int argc, const char *const *argv)
1063{ 1349{
1064 XClassHint classHint; 1350 XClassHint classHint;
1065 XWMHints wmHint; 1351 XWMHints wmHint;
… …
1111 } 1397 }
1112#endif 1398#endif
1113 1399
1114 window_calc (0, 0); 1400 window_calc (0, 0);
1115 1401
1116 /* sub-window placement & size in rxvt_resize_subwindows () */ 1402 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1117 attributes.background_pixel = pix_colors_focused [Color_border]; 1403 attributes.background_pixel = pix_colors_focused [Color_border];
1118 attributes.border_pixel = pix_colors_focused [Color_border]; 1404 attributes.border_pixel = pix_colors_focused [Color_border];
1119 attributes.colormap = cmap; 1405 attributes.colormap = cmap;
1120 1406
1121 top = XCreateWindow (dpy, parent, 1407 top = XCreateWindow (dpy, parent,
… …
1124 ext_bwidth, 1410 ext_bwidth,
1125 depth, InputOutput, visual, 1411 depth, InputOutput, visual,
1126 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1412 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1127 &attributes); 1413 &attributes);
1128 1414
1129 this->parent[0] = top; 1415 this->parent = top;
1130
1131 old_width = szHint.width;
1132 old_height = szHint.height;
1133 1416
1134 set_title (rs [Rs_title]); 1417 set_title (rs [Rs_title]);
1135 set_icon_name (rs [Rs_iconName]); 1418 set_icon_name (rs [Rs_iconName]);
1136 1419
1137 classHint.res_name = (char *)rs[Rs_name]; 1420 classHint.res_name = (char *)rs[Rs_name];
… …
1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1425 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1143 wmHint.window_group = top; 1426 wmHint.window_group = top;
1144 1427
1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1428 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1146 &szHint, &wmHint, &classHint); 1429 &szHint, &wmHint, &classHint);
1147#if ENABLE_EWMH 1430#if ENABLE_EWMH
1148# ifdef HAVE_AFTERIMAGE
1149 /* 1431 /*
1150 * set up icon hint 1432 * set up icon hint
1151 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1433 * rs [Rs_iconfile] is path to icon
1152 */ 1434 */
1153 1435
1154 if (rs [Rs_iconfile]) 1436 if (rs [Rs_iconfile])
1155 { 1437 {
1156 init_asv (); 1438 set_icon (rs [Rs_iconfile]);
1157
1158 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1159 if (asv && im)
1160 {
1161 int w = im->width;
1162 int h = im->height;
1163 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1164 ASImage *result = scale_asimage (asv, im,
1165 w, h, ASA_ARGB32,
1166 100, ASIMAGE_QUALITY_DEFAULT);
1167 destroy_asimage (&im);
1168
1169 if (buffer && result)
1170 {
1171 ARGB32 *asbuf = result->alt.argb32;
1172 buffer [0] = w;
1173 buffer [1] = h;
1174
1175 for (unsigned int i = 0; i < w * h; ++i)
1176 buffer [i + 2] = asbuf [i];
1177
1178 destroy_asimage (&result);
1179 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1180 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1181 free (buffer);
1182 }
1183 else
1184 {
1185 if (!buffer)
1186 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1187
1188 if (!result)
1189 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1190 }
1191 }
1192 else
1193 rxvt_warn ("Loading image icon failed, continuing without.\n");
1194 } 1439 }
1195# endif
1196#endif 1440#endif
1197 1441
1198#if ENABLE_FRILLS 1442#if ENABLE_FRILLS
1199 if (mwmhints.flags) 1443 if (mwmhints.flags)
1200 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1444 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1206#if ENABLE_EWMH 1450#if ENABLE_EWMH
1207 xa[XA_NET_WM_PING], 1451 xa[XA_NET_WM_PING],
1208#endif 1452#endif
1209 }; 1453 };
1210 1454
1211 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1455 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1212 1456
1213#if ENABLE_FRILLS 1457#if ENABLE_FRILLS
1214 if (rs[Rs_transient_for]) 1458 if (rs[Rs_transient_for])
1215 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1459 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1216#endif 1460#endif
… …
1239 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1240 1484
1241 /* the vt window */ 1485 /* the vt window */
1242 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1243 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1244 width, height, 1488 vt_width, vt_height,
1245 0, 1489 0,
1246 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1247 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1248 1492
1249 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
… …
1277 pix_colors = pix_colors_unfocused; 1521 pix_colors = pix_colors_unfocused;
1278#endif 1522#endif
1279 1523
1280 pointer_unblank (); 1524 pointer_unblank ();
1281 scr_recolour (); 1525 scr_recolour ();
1282}
1283
1284/* ------------------------------------------------------------------------- *
1285 * GET TTY CURRENT STATE *
1286 * ------------------------------------------------------------------------- */
1287void
1288rxvt_get_ttymode (struct termios *tio, int erase)
1289{
1290 /*
1291 * standard System V termios interface
1292 */
1293 if (tcgetattr (STDIN_FILENO, tio) < 0)
1294 {
1295 // return error - use system defaults,
1296 // where possible, and zero elsewhere
1297 memset (tio, 0, sizeof (struct termios));
1298
1299 tio->c_cc[VINTR] = CINTR;
1300 tio->c_cc[VQUIT] = CQUIT;
1301 tio->c_cc[VERASE] = CERASE;
1302#ifdef VERASE2
1303 tio->c_cc[VERASE2] = CERASE2;
1304#endif
1305 tio->c_cc[VKILL] = CKILL;
1306 tio->c_cc[VSTART] = CSTART;
1307 tio->c_cc[VSTOP] = CSTOP;
1308 tio->c_cc[VSUSP] = CSUSP;
1309# ifdef VDSUSP
1310 tio->c_cc[VDSUSP] = CDSUSP;
1311# endif
1312# ifdef VREPRINT
1313 tio->c_cc[VREPRINT] = CRPRNT;
1314# endif
1315# ifdef VDISCRD
1316 tio->c_cc[VDISCRD] = CFLUSH;
1317# endif
1318# ifdef VWERSE
1319 tio->c_cc[VWERSE] = CWERASE;
1320# endif
1321# ifdef VLNEXT
1322 tio->c_cc[VLNEXT] = CLNEXT;
1323# endif
1324 }
1325
1326 tio->c_cc[VEOF] = CEOF;
1327 tio->c_cc[VEOL] = VDISABLE;
1328# ifdef VEOL2
1329 tio->c_cc[VEOL2] = VDISABLE;
1330# endif
1331# ifdef VSWTC
1332 tio->c_cc[VSWTC] = VDISABLE;
1333# endif
1334# ifdef VSWTCH
1335 tio->c_cc[VSWTCH] = VDISABLE;
1336# endif
1337# if VMIN != VEOF
1338 tio->c_cc[VMIN] = 1;
1339# endif
1340# if VTIME != VEOL
1341 tio->c_cc[VTIME] = 0;
1342# endif
1343
1344 if (erase != -1)
1345 tio->c_cc[VERASE] = (char)erase;
1346
1347 /* input modes */
1348 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1349# ifdef IMAXBEL
1350 | IMAXBEL
1351# endif
1352 | IXON);
1353
1354 /* output modes */
1355 tio->c_oflag = (OPOST | ONLCR);
1356
1357 /* control modes */
1358 tio->c_cflag = (CS8 | CREAD);
1359
1360 /* line discipline modes */
1361 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1362# if defined (ECHOCTL) && defined (ECHOKE)
1363 | ECHOCTL | ECHOKE
1364# endif
1365 | ECHOE | ECHOK);
1366
1367 /*
1368 * Debugging
1369 */
1370#ifdef DEBUG_TTYMODE
1371 /* c_iflag bits */
1372 fprintf (stderr, "Input flags\n");
1373
1374 /* cpp token stringize doesn't work on all machines <sigh> */
1375# define FOO(flag,name) \
1376 if ((tio->c_iflag) & flag) \
1377 fprintf (stderr, "%s ", name)
1378
1379 /* c_iflag bits */
1380 FOO (IGNBRK, "IGNBRK");
1381 FOO (BRKINT, "BRKINT");
1382 FOO (IGNPAR, "IGNPAR");
1383 FOO (PARMRK, "PARMRK");
1384 FOO (INPCK, "INPCK");
1385 FOO (ISTRIP, "ISTRIP");
1386 FOO (INLCR, "INLCR");
1387 FOO (IGNCR, "IGNCR");
1388 FOO (ICRNL, "ICRNL");
1389 FOO (IXON, "IXON");
1390 FOO (IXOFF, "IXOFF");
1391# ifdef IUCLC
1392 FOO (IUCLC, "IUCLC");
1393# endif
1394# ifdef IXANY
1395 FOO (IXANY, "IXANY");
1396# endif
1397# ifdef IMAXBEL
1398 FOO (IMAXBEL, "IMAXBEL");
1399# endif
1400
1401 fprintf (stderr, "\n");
1402
1403# undef FOO
1404# define FOO(entry, name) \
1405 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1406
1407 FOO (VINTR, "VINTR");
1408 FOO (VQUIT, "VQUIT");
1409 FOO (VERASE, "VERASE");
1410 FOO (VKILL, "VKILL");
1411 FOO (VEOF, "VEOF");
1412 FOO (VEOL, "VEOL");
1413# ifdef VEOL2
1414 FOO (VEOL2, "VEOL2");
1415# endif
1416# ifdef VSWTC
1417 FOO (VSWTC, "VSWTC");
1418# endif
1419# ifdef VSWTCH
1420 FOO (VSWTCH, "VSWTCH");
1421# endif
1422 FOO (VSTART, "VSTART");
1423 FOO (VSTOP, "VSTOP");
1424 FOO (VSUSP, "VSUSP");
1425# ifdef VDSUSP
1426 FOO (VDSUSP, "VDSUSP");
1427# endif
1428# ifdef VREPRINT
1429 FOO (VREPRINT, "VREPRINT");
1430# endif
1431# ifdef VDISCRD
1432 FOO (VDISCRD, "VDISCRD");
1433# endif
1434# ifdef VWERSE
1435 FOO (VWERSE, "VWERSE");
1436# endif
1437# ifdef VLNEXT
1438 FOO (VLNEXT, "VLNEXT");
1439# endif
1440
1441 fprintf (stderr, "\n");
1442# undef FOO
1443#endif /* DEBUG_TTYMODE */
1444} 1526}
1445 1527
1446/*----------------------------------------------------------------------*/ 1528/*----------------------------------------------------------------------*/
1447/* 1529/*
1448 * Run the command in a subprocess and return a file descriptor for the 1530 * Run the command in a subprocess and return a file descriptor for the
… …
1460 if (pty->pty >= 0) 1542 if (pty->pty >= 0)
1461 { 1543 {
1462 if (getfd_hook) 1544 if (getfd_hook)
1463 pty->pty = (*getfd_hook) (pty->pty); 1545 pty->pty = (*getfd_hook) (pty->pty);
1464 1546
1465 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1547 if (pty->pty < 0)
1466 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1548 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1467 } 1549 }
1468 } 1550 }
1469 else 1551 else
1470#endif 1552#endif
1471 if (!pty->get ()) 1553 if (!pty->get ())
1472 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1554 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1473 1555
1474 int er; 1556 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1557
1558 struct termios tio = def_tio;
1475 1559
1476#ifndef NO_BACKSPACE_KEY 1560#ifndef NO_BACKSPACE_KEY
1477 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1561 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1478 er = rs[Rs_backspace_key][0]; 1562 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1479 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1563 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1480 er = '\177'; /* the initial state anyway */ 1564 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1481 else
1482#endif 1565#endif
1483 er = -1;
1484 1566
1485 rxvt_get_ttymode (&tio, er);
1486 /* init terminal attributes */ 1567 /* init terminal attributes */
1487 cfsetospeed (&tio, BAUDRATE); 1568 cfsetospeed (&tio, BAUDRATE);
1488 cfsetispeed (&tio, BAUDRATE); 1569 cfsetispeed (&tio, BAUDRATE);
1489 tcsetattr (pty->tty, TCSANOW, &tio); 1570 tcsetattr (pty->tty, TCSANOW, &tio);
1490 pty->set_utf8_mode (enc_utf8); 1571 pty->set_utf8_mode (enc_utf8);
… …
1530 1611
1531 _exit (EXIT_FAILURE); 1612 _exit (EXIT_FAILURE);
1532 1613
1533 default: 1614 default:
1534 if (!option (Opt_utmpInhibit)) 1615 if (!option (Opt_utmpInhibit))
1616 {
1617#ifdef LOG_ONLY_ON_LOGIN
1618 bool login_shell = option (Opt_loginShell);
1619#else
1620 bool login_shell = true;
1621#endif
1535 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1622 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1623 }
1536 1624
1537 pty->close_tty (); 1625 pty->close_tty ();
1538 1626
1539 child_ev.start (cmd_pid); 1627 child_ev.start (cmd_pid);
1540 1628
… …
1565#elif defined (SRIOCSREDIR) 1653#elif defined (SRIOCSREDIR)
1566 int fd; 1654 int fd;
1567 1655
1568 fd = open (CONSOLE, O_WRONLY, 0); 1656 fd = open (CONSOLE, O_WRONLY, 0);
1569 if (fd >= 0) 1657 if (fd >= 0)
1570 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1658 {
1659 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1571 close (fd); 1660 close (fd);
1661 }
1572#endif /* SRIOCSREDIR */ 1662#endif /* SRIOCSREDIR */
1573 } 1663 }
1574 1664
1575 /* reset signals and spin off the command interpreter */ 1665 /* reset signals and spin off the command interpreter */
1576 signal (SIGINT, SIG_DFL); 1666 signal (SIGINT, SIG_DFL);
1577 signal (SIGQUIT, SIG_DFL); 1667 signal (SIGQUIT, SIG_DFL);
1578 signal (SIGCHLD, SIG_DFL); 1668 signal (SIGCHLD, SIG_DFL);
1579 signal (SIGHUP, SIG_DFL); 1669 signal (SIGHUP, SIG_DFL);
1580 signal (SIGPIPE, SIG_DFL); 1670 signal (SIGPIPE, SIG_DFL);
1581 /* 1671 /*
1582 * mimick login's behavior by disabling the job control signals 1672 * mimic login's behavior by disabling the job control signals
1583 * a shell that wants them can turn them back on 1673 * a shell that wants them can turn them back on
1584 */ 1674 */
1585#ifdef SIGTSTP 1675#ifdef SIGTSTP
1586 signal (SIGTSTP, SIG_IGN); 1676 signal (SIGTSTP, SIG_IGN);
1587 signal (SIGTTIN, SIG_IGN); 1677 signal (SIGTTIN, SIG_IGN);

Diff Legend

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