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.254 by root, Tue Nov 4 11:03:29 2008 UTC vs.
Revision 1.325 by sf-exg, Thu May 31 05:53:46 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
… …
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);
… …
392#if XFT 593#if XFT
393 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 596#endif
396 597
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
402 free (r_argv);
403
404 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
406 rs [i] = 0; 600 rs [i] = 0;
407 601
408#if ENABLE_PERL 602#if ENABLE_PERL
… …
415 { 609 {
416 rxvt_perl.init (this); 610 rxvt_perl.init (this);
417 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
418 } 612 }
419#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 ();
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])
425 { 623 {
426 if (!rs[Rs_title]) 624 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 625 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
626
428 if (!rs[Rs_iconName]) 627 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 628 rs[Rs_iconName] = rs[Rs_title];
430 } 629 }
431 else 630 else
432 { 631 {
433 if (!rs[Rs_title]) 632 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 633 rs[Rs_title] = rs[Rs_name];
634
435 if (!rs[Rs_iconName]) 635 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 636 rs[Rs_iconName] = rs[Rs_name];
437 } 637 }
438 638
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 639 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 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)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 648
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 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]);
451#endif 654#endif
452 655
453#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 658 pointerBlankDelay = i;
… …
528 return cmd_argv; 731 return cmd_argv;
529} 732}
530 733
531/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
532void 735void
533rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
534{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
535 this->envv = envv; 742 this->envv = envv;
536 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{
537 SET_R (this); 769 SET_R (this);
538 set_locale (""); 770 set_locale ("");
539 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 :(
540 772
541 init_vars (); 773 init_vars ();
542
543 init_secondary ();
544 774
545 const char **cmd_argv = init_resources (argc, argv); 775 const char **cmd_argv = init_resources (argc, argv);
546 776
547#ifdef KEYSYM_RESOURCE 777#ifdef KEYSYM_RESOURCE
548 keyboard->register_done (); 778 keyboard->register_done ();
… …
557 if (chdir (path)) 787 if (chdir (path))
558 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");
559 } 789 }
560 790
561 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
562 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
563 793
564 pty = ptytty::create (); 794 pty = ptytty::create ();
565 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
800
566 create_windows (argc, argv); 801 create_windows (argc, argv);
567 802
568 init_xlocale (); 803 init_xlocale ();
569 804
570 scr_reset (); // initialize screen 805 scr_poweron (); // initialize screen
571 806
572#if 0 807#if 0
573 XSynchronize (dpy, True); 808 XSynchronize (dpy, True);
574#endif 809#endif
575 810
576 if (option (Opt_scrollBar)) 811 if (option (Opt_scrollBar))
577 scrollBar.resize (); /* create and map scrollbar */ 812 scrollBar.resize (); /* create and map scrollbar */
578#ifdef HAVE_BG_PIXMAP 813#ifdef HAVE_BG_PIXMAP
579 { 814 {
580 bgPixmap.set_target (this); 815 bg_init ();
581 bgPixmap.invalidate ();
582 816
583#ifdef ENABLE_TRANSPARENCY 817#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
585 { 819 {
586 bgPixmap.set_transparent (); 820 bg_set_transparent ();
587 821
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 823 root_effects.set_blur (rs [Rs_blurradius]);
591#endif 824
592 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 826 root_effects.set_tint (pix_colors_focused [Color_tint]);
594 827
595 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]); 829 root_effects.set_shade (rs [Rs_shade]);
597 830
598 bgPixmap.set_root_pixmap (); 831 bg_set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
601 } 834 }
602#endif 835#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 } 836 }
623#endif 837#endif
624 838
625#if ENABLE_PERL 839#if ENABLE_PERL
626 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
627#endif 841#endif
628 842
629 set_colorfgbg (); 843 init_done = 1;
630 844
631 init_command (cmd_argv); 845 init_command (cmd_argv);
632
633 free (cmd_argv);
634 846
635 if (pty->pty >= 0) 847 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ); 848 pty_ev.start (pty->pty, ev::READ);
637 849
638 HOOK_INVOKE ((this, HOOK_START, DT_END)); 850 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
640#if ENABLE_XEMBED 852#if ENABLE_XEMBED
641 if (rs[Rs_embed]) 853 if (rs[Rs_embed])
642 { 854 {
643 long info[2] = { 0, XEMBED_MAPPED }; 855 long info[2] = { 0, XEMBED_MAPPED };
644 856
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 857 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2); 858 32, PropModeReplace, (unsigned char *)&info, 2);
647 } 859 }
648#endif 860#endif
649 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
650 XMapWindow (dpy, vt); 874 XMapWindow (dpy, vt);
651 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
652 888
653 refresh_check (); 889 refresh_check ();
654} 890}
655 891
656/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
657void 893void
658rxvt_term::init_env () 894rxvt_term::init_env ()
659{ 895{
660 int i;
661 char *val; 896 char *val;
897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
900 char *env_term;
662 901
663#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
664 /* Fixup display_name for export over pty to any interested terminal 903 /* Fixup display_name for export over pty to any interested terminal
665 * 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
666 * (for the first non-loopback interface) that we get from 905 * (for the first non-loopback interface) that we get from
… …
679 val = XDisplayString (dpy); 918 val = XDisplayString (dpy);
680 919
681 if (rs[Rs_display_name] == NULL) 920 if (rs[Rs_display_name] == NULL)
682 rs[Rs_display_name] = val; /* use broken `:0' value */ 921 rs[Rs_display_name] = val; /* use broken `:0' value */
683 922
684 i = strlen (val);
685 env_display = (char *)rxvt_malloc (i + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
686 924
687 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
688 926
927 env_windowid = (char *)rxvt_malloc (21);
689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
690 929
691 /* add entries to the environment: 930 /* add entries to the environment:
692 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
693 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
694 * @ COLORTERM: terminal sub-name and also indicates its color 933 * @ COLORTERM: terminal sub-name and also indicates its color
… …
697 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
698 */ 937 */
699 putenv (env_display); 938 putenv (env_display);
700 putenv (env_windowid); 939 putenv (env_windowid);
701 940
702 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
703 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
704 943
705#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
706 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
707#endif 946#endif
708 947
… …
727 unsetenv ("TERMCAP"); /* terminfo should be okay */ 966 unsetenv ("TERMCAP"); /* terminfo should be okay */
728#endif /* HAVE_UNSETENV */ 967#endif /* HAVE_UNSETENV */
729} 968}
730 969
731/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
732/*
733 * This is more or less stolen straight from XFree86 xterm.
734 * This should support all European type languages.
735 */
736void 971void
737rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
738{ 973{
739 set_environ (envv); 974 set_environ (envv);
740 975
741#if HAVE_XSETLOCALE || HAVE_SETLOCALE
742 free (this->locale); 976 free (this->locale);
743 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
744 978
745 if (!this->locale) 979 if (!this->locale)
746 { 980 {
… …
757 991
758 992
759 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
760 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
761 mbstate.reset (); 995 mbstate.reset ();
762#endif
763 996
764#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
765 char *codeset = strdup (nl_langinfo (CODESET)); 998 char *codeset = nl_langinfo (CODESET);
766 // /^UTF.?8/i 999 // /^UTF.?8/i
767 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
768 && (codeset[1] == 'T' || codeset[1] == 't') 1001 && (codeset[1] == 'T' || codeset[1] == 't')
769 && (codeset[2] == 'F' || codeset[2] == 'f') 1002 && (codeset[2] == 'F' || codeset[2] == 'f')
770 && (codeset[3] == '8' || codeset[4] == '8'); 1003 && (codeset[3] == '8' || codeset[4] == '8');
771 free (codeset);
772#else 1004#else
773 enc_utf8 = 0; 1005 enc_utf8 = 0;
774#endif 1006#endif
775} 1007}
776 1008
… …
779{ 1011{
780 set_environ (envv); 1012 set_environ (envv);
781 1013
782#ifdef USE_XIM 1014#ifdef USE_XIM
783 if (!locale) 1015 if (!locale)
784 rxvt_warn ("setting locale failed, working without locale support.\n"); 1016 rxvt_warn ("setting locale failed, continuing without locale support.\n");
785 else 1017 else
786 { 1018 {
787 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
788 1020
789 if (!XSupportsLocale ()) 1021 if (!XSupportsLocale ())
790 { 1022 {
791 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");
792 return; 1024 return;
793 } 1025 }
794 1026
795 im_ev.start (display); 1027 im_ev.start (display);
796 1028
… …
945/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
946/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
947void 1179void
948rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
949{ 1181{
950 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
951 { 1183 {
952 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
953 1185
954 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
955 /* bright colors */ 1187 /* bright colors */
… …
1047 1279
1048 if (i) 1280 if (i)
1049 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
1050} 1282}
1051 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
1052/*----------------------------------------------------------------------*/ 1345/*----------------------------------------------------------------------*/
1053/* rxvt_Create_Windows () - Open and map the window */ 1346/* Open and map the window */
1054void 1347void
1055rxvt_term::create_windows (int argc, const char *const *argv) 1348rxvt_term::create_windows (int argc, const char *const *argv)
1056{ 1349{
1057 XClassHint classHint; 1350 XClassHint classHint;
1058 XWMHints wmHint; 1351 XWMHints wmHint;
… …
1104 } 1397 }
1105#endif 1398#endif
1106 1399
1107 window_calc (0, 0); 1400 window_calc (0, 0);
1108 1401
1109 /* sub-window placement & size in rxvt_resize_subwindows () */ 1402 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1110 attributes.background_pixel = pix_colors_focused [Color_border]; 1403 attributes.background_pixel = pix_colors_focused [Color_border];
1111 attributes.border_pixel = pix_colors_focused [Color_border]; 1404 attributes.border_pixel = pix_colors_focused [Color_border];
1112 attributes.colormap = cmap; 1405 attributes.colormap = cmap;
1113 1406
1114 top = XCreateWindow (dpy, parent, 1407 top = XCreateWindow (dpy, parent,
… …
1117 ext_bwidth, 1410 ext_bwidth,
1118 depth, InputOutput, visual, 1411 depth, InputOutput, visual,
1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1412 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1120 &attributes); 1413 &attributes);
1121 1414
1122 this->parent[0] = top; 1415 this->parent = top;
1123 1416
1124 old_width = szHint.width; 1417 set_title (rs [Rs_title]);
1125 old_height = szHint.height; 1418 set_icon_name (rs [Rs_iconName]);
1126
1127 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1128 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1129 1419
1130 classHint.res_name = (char *)rs[Rs_name]; 1420 classHint.res_name = (char *)rs[Rs_name];
1131 classHint.res_class = (char *)RESCLASS; 1421 classHint.res_class = (char *)RESCLASS;
1132 1422
1133 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1423 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1425 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1136 wmHint.window_group = top; 1426 wmHint.window_group = top;
1137 1427
1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1428 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1139 &szHint, &wmHint, &classHint); 1429 &szHint, &wmHint, &classHint);
1140#if ENABLE_EWMH 1430#if ENABLE_EWMH
1141# ifdef HAVE_AFTERIMAGE
1142 /* 1431 /*
1143 * set up icon hint 1432 * set up icon hint
1144 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1433 * rs [Rs_iconfile] is path to icon
1145 */ 1434 */
1435
1146 if (rs [Rs_iconfile] && asv) 1436 if (rs [Rs_iconfile])
1147 {
1148 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1149 if (im)
1150 {
1151 int w = im->width;
1152 int h = im->height;
1153 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1154 ASImage *result = scale_asimage (asv, im,
1155 w, h, ASA_ARGB32,
1156 100, ASIMAGE_QUALITY_DEFAULT);
1157 destroy_asimage (&im);
1158
1159 if (buffer && result)
1160 {
1161 ARGB32 *asbuf = result->alt.argb32;
1162 buffer [0] = w;
1163 buffer [1] = h;
1164
1165 for (unsigned int i = 0; i < w * h; ++i)
1166 buffer [i + 2] = asbuf [i];
1167
1168 destroy_asimage (&result);
1169 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1170 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1171 free (buffer);
1172 }
1173 else
1174 {
1175 if (!buffer)
1176 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1177
1178 if (!result)
1179 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1180 }
1181 }
1182 else
1183 rxvt_warn ("Loading image icon failed, continuing without.\n");
1184 } 1437 {
1185# endif 1438 set_icon (rs [Rs_iconfile]);
1439 }
1186#endif 1440#endif
1187 1441
1188#if ENABLE_FRILLS 1442#if ENABLE_FRILLS
1189 if (mwmhints.flags) 1443 if (mwmhints.flags)
1190 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,
… …
1196#if ENABLE_EWMH 1450#if ENABLE_EWMH
1197 xa[XA_NET_WM_PING], 1451 xa[XA_NET_WM_PING],
1198#endif 1452#endif
1199 }; 1453 };
1200 1454
1201 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1455 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1202 1456
1203#if ENABLE_FRILLS 1457#if ENABLE_FRILLS
1204 if (rs[Rs_transient_for]) 1458 if (rs[Rs_transient_for])
1205 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1459 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1206#endif 1460#endif
… …
1229 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1230 1484
1231 /* the vt window */ 1485 /* the vt window */
1232 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1233 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1234 width, height, 1488 vt_width, vt_height,
1235 0, 1489 0,
1236 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1237 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1238 1492
1239 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
… …
1267 pix_colors = pix_colors_unfocused; 1521 pix_colors = pix_colors_unfocused;
1268#endif 1522#endif
1269 1523
1270 pointer_unblank (); 1524 pointer_unblank ();
1271 scr_recolour (); 1525 scr_recolour ();
1272}
1273
1274/* ------------------------------------------------------------------------- *
1275 * GET TTY CURRENT STATE *
1276 * ------------------------------------------------------------------------- */
1277void
1278rxvt_get_ttymode (struct termios *tio, int erase)
1279{
1280 /*
1281 * standard System V termios interface
1282 */
1283 if (tcgetattr (STDIN_FILENO, tio) < 0)
1284 {
1285 // return error - use system defaults,
1286 // where possible, and zero elsewhere
1287 memset (tio, 0, sizeof (struct termios));
1288
1289 tio->c_cc[VINTR] = CINTR;
1290 tio->c_cc[VQUIT] = CQUIT;
1291 tio->c_cc[VERASE] = CERASE;
1292#ifdef VERASE2
1293 tio->c_cc[VERASE2] = CERASE2;
1294#endif
1295 tio->c_cc[VKILL] = CKILL;
1296 tio->c_cc[VSTART] = CSTART;
1297 tio->c_cc[VSTOP] = CSTOP;
1298 tio->c_cc[VSUSP] = CSUSP;
1299# ifdef VDSUSP
1300 tio->c_cc[VDSUSP] = CDSUSP;
1301# endif
1302# ifdef VREPRINT
1303 tio->c_cc[VREPRINT] = CRPRNT;
1304# endif
1305# ifdef VDISCRD
1306 tio->c_cc[VDISCRD] = CFLUSH;
1307# endif
1308# ifdef VWERSE
1309 tio->c_cc[VWERSE] = CWERASE;
1310# endif
1311# ifdef VLNEXT
1312 tio->c_cc[VLNEXT] = CLNEXT;
1313# endif
1314 }
1315
1316 tio->c_cc[VEOF] = CEOF;
1317 tio->c_cc[VEOL] = VDISABLE;
1318# ifdef VEOL2
1319 tio->c_cc[VEOL2] = VDISABLE;
1320# endif
1321# ifdef VSWTC
1322 tio->c_cc[VSWTC] = VDISABLE;
1323# endif
1324# ifdef VSWTCH
1325 tio->c_cc[VSWTCH] = VDISABLE;
1326# endif
1327# if VMIN != VEOF
1328 tio->c_cc[VMIN] = 1;
1329# endif
1330# if VTIME != VEOL
1331 tio->c_cc[VTIME] = 0;
1332# endif
1333
1334 if (erase != -1)
1335 tio->c_cc[VERASE] = (char)erase;
1336
1337 /* input modes */
1338 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1339# ifdef IMAXBEL
1340 | IMAXBEL
1341# endif
1342 | IXON);
1343
1344 /* output modes */
1345 tio->c_oflag = (OPOST | ONLCR);
1346
1347 /* control modes */
1348 tio->c_cflag = (CS8 | CREAD);
1349
1350 /* line discipline modes */
1351 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1352# if defined (ECHOCTL) && defined (ECHOKE)
1353 | ECHOCTL | ECHOKE
1354# endif
1355 | ECHOE | ECHOK);
1356
1357 /*
1358 * Debugging
1359 */
1360#ifdef DEBUG_TTYMODE
1361 /* c_iflag bits */
1362 fprintf (stderr, "Input flags\n");
1363
1364 /* cpp token stringize doesn't work on all machines <sigh> */
1365# define FOO(flag,name) \
1366 if ((tio->c_iflag) & flag) \
1367 fprintf (stderr, "%s ", name)
1368
1369 /* c_iflag bits */
1370 FOO (IGNBRK, "IGNBRK");
1371 FOO (BRKINT, "BRKINT");
1372 FOO (IGNPAR, "IGNPAR");
1373 FOO (PARMRK, "PARMRK");
1374 FOO (INPCK, "INPCK");
1375 FOO (ISTRIP, "ISTRIP");
1376 FOO (INLCR, "INLCR");
1377 FOO (IGNCR, "IGNCR");
1378 FOO (ICRNL, "ICRNL");
1379 FOO (IXON, "IXON");
1380 FOO (IXOFF, "IXOFF");
1381# ifdef IUCLC
1382 FOO (IUCLC, "IUCLC");
1383# endif
1384# ifdef IXANY
1385 FOO (IXANY, "IXANY");
1386# endif
1387# ifdef IMAXBEL
1388 FOO (IMAXBEL, "IMAXBEL");
1389# endif
1390
1391 fprintf (stderr, "\n");
1392
1393# undef FOO
1394# define FOO(entry, name) \
1395 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1396
1397 FOO (VINTR, "VINTR");
1398 FOO (VQUIT, "VQUIT");
1399 FOO (VERASE, "VERASE");
1400 FOO (VKILL, "VKILL");
1401 FOO (VEOF, "VEOF");
1402 FOO (VEOL, "VEOL");
1403# ifdef VEOL2
1404 FOO (VEOL2, "VEOL2");
1405# endif
1406# ifdef VSWTC
1407 FOO (VSWTC, "VSWTC");
1408# endif
1409# ifdef VSWTCH
1410 FOO (VSWTCH, "VSWTCH");
1411# endif
1412 FOO (VSTART, "VSTART");
1413 FOO (VSTOP, "VSTOP");
1414 FOO (VSUSP, "VSUSP");
1415# ifdef VDSUSP
1416 FOO (VDSUSP, "VDSUSP");
1417# endif
1418# ifdef VREPRINT
1419 FOO (VREPRINT, "VREPRINT");
1420# endif
1421# ifdef VDISCRD
1422 FOO (VDISCRD, "VDISCRD");
1423# endif
1424# ifdef VWERSE
1425 FOO (VWERSE, "VWERSE");
1426# endif
1427# ifdef VLNEXT
1428 FOO (VLNEXT, "VLNEXT");
1429# endif
1430
1431 fprintf (stderr, "\n");
1432# undef FOO
1433#endif /* DEBUG_TTYMODE */
1434} 1526}
1435 1527
1436/*----------------------------------------------------------------------*/ 1528/*----------------------------------------------------------------------*/
1437/* 1529/*
1438 * 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
… …
1450 if (pty->pty >= 0) 1542 if (pty->pty >= 0)
1451 { 1543 {
1452 if (getfd_hook) 1544 if (getfd_hook)
1453 pty->pty = (*getfd_hook) (pty->pty); 1545 pty->pty = (*getfd_hook) (pty->pty);
1454 1546
1455 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1547 if (pty->pty < 0)
1456 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1548 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1457 } 1549 }
1458 } 1550 }
1459 else 1551 else
1460#endif 1552#endif
1461 if (!pty->get ()) 1553 if (!pty->get ())
1462 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1554 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1463 1555
1464 int er; 1556 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1557
1558 struct termios tio = def_tio;
1465 1559
1466#ifndef NO_BACKSPACE_KEY 1560#ifndef NO_BACKSPACE_KEY
1467 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1561 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1468 er = rs[Rs_backspace_key][0]; 1562 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1469 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1563 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1470 er = '\177'; /* the initial state anyway */ 1564 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1471 else
1472#endif 1565#endif
1473 er = -1;
1474 1566
1475 rxvt_get_ttymode (&tio, er);
1476 /* init terminal attributes */ 1567 /* init terminal attributes */
1477 cfsetospeed (&tio, BAUDRATE); 1568 cfsetospeed (&tio, BAUDRATE);
1478 cfsetispeed (&tio, BAUDRATE); 1569 cfsetispeed (&tio, BAUDRATE);
1479 tcsetattr (pty->tty, TCSANOW, &tio); 1570 tcsetattr (pty->tty, TCSANOW, &tio);
1480 pty->set_utf8_mode (enc_utf8); 1571 pty->set_utf8_mode (enc_utf8);
… …
1520 1611
1521 _exit (EXIT_FAILURE); 1612 _exit (EXIT_FAILURE);
1522 1613
1523 default: 1614 default:
1524 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
1525 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1622 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1623 }
1526 1624
1527 pty->close_tty (); 1625 pty->close_tty ();
1528 1626
1529 child_ev.start (cmd_pid); 1627 child_ev.start (cmd_pid);
1530 1628
… …
1555#elif defined (SRIOCSREDIR) 1653#elif defined (SRIOCSREDIR)
1556 int fd; 1654 int fd;
1557 1655
1558 fd = open (CONSOLE, O_WRONLY, 0); 1656 fd = open (CONSOLE, O_WRONLY, 0);
1559 if (fd >= 0) 1657 if (fd >= 0)
1560 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1658 {
1659 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1561 close (fd); 1660 close (fd);
1661 }
1562#endif /* SRIOCSREDIR */ 1662#endif /* SRIOCSREDIR */
1563 } 1663 }
1564 1664
1565 /* reset signals and spin off the command interpreter */ 1665 /* reset signals and spin off the command interpreter */
1566 signal (SIGINT, SIG_DFL); 1666 signal (SIGINT, SIG_DFL);
1567 signal (SIGQUIT, SIG_DFL); 1667 signal (SIGQUIT, SIG_DFL);
1568 signal (SIGCHLD, SIG_DFL); 1668 signal (SIGCHLD, SIG_DFL);
1569 signal (SIGHUP, SIG_DFL); 1669 signal (SIGHUP, SIG_DFL);
1570 signal (SIGPIPE, SIG_DFL); 1670 signal (SIGPIPE, SIG_DFL);
1571 /* 1671 /*
1572 * mimick login's behavior by disabling the job control signals 1672 * mimic login's behavior by disabling the job control signals
1573 * a shell that wants them can turn them back on 1673 * a shell that wants them can turn them back on
1574 */ 1674 */
1575#ifdef SIGTSTP 1675#ifdef SIGTSTP
1576 signal (SIGTSTP, SIG_IGN); 1676 signal (SIGTSTP, SIG_IGN);
1577 signal (SIGTTIN, SIG_IGN); 1677 signal (SIGTTIN, SIG_IGN);
… …
1596 const char *argv0, *shell; 1696 const char *argv0, *shell;
1597 1697
1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1698 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1599 shell = "/bin/sh"; 1699 shell = "/bin/sh";
1600 1700
1601 argv0 = (const char *)rxvt_basename (shell); 1701 argv0 = rxvt_basename (shell);
1602 1702
1603 if (option (Opt_loginShell)) 1703 if (option (Opt_loginShell))
1604 { 1704 {
1605 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1705 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1606 1706

Diff Legend

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