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.315 by sf-exg, Mon Jan 9 15:34:56 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.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 183
184#if !USE_256_COLORS
179 // 88 xterm colours 185 // 88 xterm colours
180 "rgb:00/00/00", 186 "rgb:00/00/00",
181 "rgb:00/00/8b", 187 "rgb:00/00/8b",
182 "rgb:00/00/cd", 188 "rgb:00/00/cd",
183 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
476 "rgb:08/08/08",
477 "rgb:12/12/12",
478 "rgb:1c/1c/1c",
479 "rgb:26/26/26",
480 "rgb:30/30/30",
481 "rgb:3a/3a/3a",
482 "rgb:44/44/44",
483 "rgb:4e/4e/4e",
484 "rgb:58/58/58",
485 "rgb:62/62/62",
486 "rgb:6c/6c/6c",
487 "rgb:76/76/76",
488 "rgb:80/80/80",
489 "rgb:8a/8a/8a",
490 "rgb:94/94/94",
491 "rgb:9e/9e/9e",
492 "rgb:a8/a8/a8",
493 "rgb:b2/b2/b2",
494 "rgb:bc/bc/bc",
495 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0",
497 "rgb:da/da/da",
498 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee",
500#endif
252 501
253#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 515#if ENABLE_FRILLS
267 NULL, // Color_underline 516 NULL, // Color_underline
268#endif 517#endif
269#ifdef OPTION_HC 518#ifdef OPTION_HC
270 NULL, 519 NULL,
520 NULL,
271#endif 521#endif
272 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 523#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
275#endif 525#endif
… …
293 ncol = 80; 543 ncol = 80;
294 nrow = 24; 544 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 549 saveLines = SAVELINES;
299 550
300 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
301 552
302 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 565 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} 566}
333 567
334/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
335const char ** 569const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
337{ 571{
338 int i, r_argc; 572 int i;
339 const char **cmd_argv, **r_argv; 573 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 574
369 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
370 576
371 /* 577 /*
372 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
373 */ 579 */
374 580
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
377 583
378 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
379 585
380 if (!(display = displays.get (rs[Rs_display_name]))) 586 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]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 588
386 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
387 xa = display->xa; 590 xa = display->xa;
388 591
389 set (display); 592 set (display);
… …
392#if XFT 595#if XFT
393 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 598#endif
396 599
397 free (r_argv);
398
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 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
420 620
421 /* 621 /*
422 * set any defaults not already set 622 * set any defaults not already set
423 */ 623 */
424 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
448 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 648 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 650
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 652 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
653
654 if (rs[Rs_letterSpace])
655 letterSpace = atoi (rs[Rs_letterSpace]);
453#endif 656#endif
454 657
455#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
530 return cmd_argv; 733 return cmd_argv;
531} 734}
532 735
533/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
534void 737void
535rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
536{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
537 this->envv = envv; 744 this->envv = envv;
538 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
539 SET_R (this); 771 SET_R (this);
540 set_locale (""); 772 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
542 774
543 init_vars (); 775 init_vars ();
544
545 init_secondary ();
546 776
547 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
548 778
549#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
550 keyboard->register_done (); 780 keyboard->register_done ();
… …
559 if (chdir (path)) 789 if (chdir (path))
560 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
561 } 791 }
562 792
563 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
564 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
565 795
566 pty = ptytty::create (); 796 pty = ptytty::create ();
797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
567 807
568 create_windows (argc, argv); 808 create_windows (argc, argv);
569 809
570 init_xlocale (); 810 init_xlocale ();
571 811
… …
577 817
578 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
579 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
580#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
581 { 821 {
582 bgPixmap.set_target (this); 822 bg_init ();
583 bgPixmap.invalidate ();
584 823
585#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
586 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
587 { 826 {
588 bgPixmap.set_transparent (); 827 bg_set_transparent ();
589 828
590#ifdef HAVE_AFTERIMAGE
591 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
592 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
593#endif 831
594 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
595 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
596 834
597 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
598 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
599 837
600 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
601 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
602 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
603 } 841 }
604#endif 842#endif
605 843
606#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
607 if (rs[Rs_backgroundPixmap]) 845 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])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
620 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
621 update_background (); 848 update_background ();
622 }
623#endif 849#endif
624 } 850 }
625#endif 851#endif
626 852
627#if ENABLE_PERL 853#if ENABLE_PERL
628 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
629#endif 855#endif
630 856
631 set_colorfgbg (); 857 set_colorfgbg ();
858 init_done = 1;
632 859
633 init_command (cmd_argv); 860 init_command (cmd_argv);
634
635 free (cmd_argv);
636 861
637 if (pty->pty >= 0) 862 if (pty->pty >= 0)
638 pty_ev.start (pty->pty, ev::READ); 863 pty_ev.start (pty->pty, ev::READ);
639 864
640 HOOK_INVOKE ((this, HOOK_START, DT_END)); 865 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
642#if ENABLE_XEMBED 867#if ENABLE_XEMBED
643 if (rs[Rs_embed]) 868 if (rs[Rs_embed])
644 { 869 {
645 long info[2] = { 0, XEMBED_MAPPED }; 870 long info[2] = { 0, XEMBED_MAPPED };
646 871
647 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 872 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
648 32, PropModeReplace, (unsigned char *)&info, 2); 873 32, PropModeReplace, (unsigned char *)&info, 2);
649 } 874 }
650#endif 875#endif
651 876
877#if HAVE_STARTUP_NOTIFICATION
878 SnDisplay *snDisplay;
879 SnLauncheeContext *snContext;
880
881 snDisplay = sn_display_new (dpy, NULL, NULL);
882 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
883
884 /* Tell the window manager that this window is part of the startup context */
885 if (snContext)
886 sn_launchee_context_setup_window (snContext, parent);
887#endif
888
652 XMapWindow (dpy, vt); 889 XMapWindow (dpy, vt);
653 XMapWindow (dpy, parent[0]); 890 XMapWindow (dpy, parent);
891
892#if HAVE_STARTUP_NOTIFICATION
893 if (snContext)
894 {
895 /* Mark the startup process as complete */
896 sn_launchee_context_complete (snContext);
897
898 sn_launchee_context_unref (snContext);
899 }
900
901 sn_display_unref (snDisplay);
902#endif
654 903
655 refresh_check (); 904 refresh_check ();
656} 905}
657 906
658/*----------------------------------------------------------------------*/ 907/*----------------------------------------------------------------------*/
659void 908void
660rxvt_term::init_env () 909rxvt_term::init_env ()
661{ 910{
662 int i;
663 char *val; 911 char *val;
912 char *env_display;
913 char *env_term;
664 914
665#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
666 /* Fixup display_name for export over pty to any interested terminal 916 /* 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 917 * 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 918 * (for the first non-loopback interface) that we get from
… …
681 val = XDisplayString (dpy); 931 val = XDisplayString (dpy);
682 932
683 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
684 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
685 935
686 i = strlen (val);
687 env_display = (char *)rxvt_malloc (i + 9); 936 env_display = (char *)rxvt_malloc (strlen (val) + 9);
688 937
689 sprintf (env_display, "DISPLAY=%s", val); 938 sprintf (env_display, "DISPLAY=%s", val);
690 939
691 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
692 941
693 /* add entries to the environment: 942 /* add entries to the environment:
694 * @ DISPLAY: in case we started with -display 943 * @ DISPLAY: in case we started with -display
695 * @ WINDOWID: X window id number of the window 944 * @ WINDOWID: X window id number of the window
696 * @ COLORTERM: terminal sub-name and also indicates its color 945 * @ COLORTERM: terminal sub-name and also indicates its color
… …
729 unsetenv ("TERMCAP"); /* terminfo should be okay */ 978 unsetenv ("TERMCAP"); /* terminfo should be okay */
730#endif /* HAVE_UNSETENV */ 979#endif /* HAVE_UNSETENV */
731} 980}
732 981
733/*----------------------------------------------------------------------*/ 982/*----------------------------------------------------------------------*/
734/*
735 * This is more or less stolen straight from XFree86 xterm.
736 * This should support all European type languages.
737 */
738void 983void
739rxvt_term::set_locale (const char *locale) 984rxvt_term::set_locale (const char *locale)
740{ 985{
741 set_environ (envv); 986 set_environ (envv);
742 987
… …
762 SET_LOCALE (this->locale); 1007 SET_LOCALE (this->locale);
763 mbstate.reset (); 1008 mbstate.reset ();
764#endif 1009#endif
765 1010
766#if HAVE_NL_LANGINFO 1011#if HAVE_NL_LANGINFO
767 char *codeset = strdup (nl_langinfo (CODESET)); 1012 char *codeset = nl_langinfo (CODESET);
768 // /^UTF.?8/i 1013 // /^UTF.?8/i
769 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1014 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
770 && (codeset[1] == 'T' || codeset[1] == 't') 1015 && (codeset[1] == 'T' || codeset[1] == 't')
771 && (codeset[2] == 'F' || codeset[2] == 'f') 1016 && (codeset[2] == 'F' || codeset[2] == 'f')
772 && (codeset[3] == '8' || codeset[4] == '8'); 1017 && (codeset[3] == '8' || codeset[4] == '8');
773 free (codeset);
774#else 1018#else
775 enc_utf8 = 0; 1019 enc_utf8 = 0;
776#endif 1020#endif
777} 1021}
778 1022
… …
781{ 1025{
782 set_environ (envv); 1026 set_environ (envv);
783 1027
784#ifdef USE_XIM 1028#ifdef USE_XIM
785 if (!locale) 1029 if (!locale)
786 rxvt_warn ("setting locale failed, working without locale support.\n"); 1030 rxvt_warn ("setting locale failed, continuing without locale support.\n");
787 else 1031 else
788 { 1032 {
789 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1033 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
790 1034
791 if (!XSupportsLocale ()) 1035 if (!XSupportsLocale ())
792 { 1036 {
793 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1037 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
794 return; 1038 return;
795 } 1039 }
796 1040
797 im_ev.start (display); 1041 im_ev.start (display);
798 1042
… …
1049 1293
1050 if (i) 1294 if (i)
1051 ModMetaMask = modmasks[i - 1]; 1295 ModMetaMask = modmasks[i - 1];
1052} 1296}
1053 1297
1298void
1299rxvt_term::set_icon (const char *file)
1300{
1301#ifdef HAVE_AFTERIMAGE
1302 init_asv ();
1303
1304 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1305 if (!im)
1306 {
1307 rxvt_warn ("Loading image icon failed, continuing without.\n");
1308 return;
1309 }
1310
1311 unsigned int w = im->width;
1312 unsigned int h = im->height;
1313
1314 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1315 {
1316 rxvt_warn ("Icon image too big, continuing without.\n");
1317 destroy_asimage (&im);
1318 return;
1319 }
1320
1321 ASImage *result = scale_asimage (asv, im,
1322 w, h, ASA_ARGB32,
1323 100, ASIMAGE_QUALITY_DEFAULT);
1324 destroy_asimage (&im);
1325
1326 if (!result)
1327 {
1328 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1329 return;
1330 }
1331
1332 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1333 if (buffer)
1334 {
1335 ARGB32 *asbuf = result->alt.argb32;
1336 buffer [0] = w;
1337 buffer [1] = h;
1338
1339 for (unsigned int i = 0; i < w * h; ++i)
1340 buffer [i + 2] = asbuf [i];
1341
1342 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1343 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1344 free (buffer);
1345 }
1346 else
1347 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1348
1349 destroy_asimage (&result);
1350#endif
1351
1352#ifdef HAVE_PIXBUF
1353 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1354 if (!pixbuf)
1355 {
1356 rxvt_warn ("Loading image icon failed, continuing without.\n");
1357 return;
1358 }
1359
1360 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1361 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1362
1363 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1364 {
1365 rxvt_warn ("Icon image too big, continuing without.\n");
1366 g_object_unref (pixbuf);
1367 return;
1368 }
1369
1370 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1371 {
1372 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1373 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1374 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1375
1376 buffer [0] = w;
1377 buffer [1] = h;
1378 for (int i = 0; i < h; i++)
1379 {
1380 for (int j = 0; j < w; j++)
1381 {
1382 unsigned char *pixel = row + j * channels;
1383 long value;
1384
1385 if (channels == 4)
1386 value = pixel[3];
1387 else
1388 value = (unsigned char)0x00ff;
1389
1390 value = (value << 8) + pixel[0];
1391 value = (value << 8) + pixel[1];
1392 value = (value << 8) + pixel[2];
1393 buffer[(i * w + j) + 2] = value;
1394 }
1395
1396 row += rowstride;
1397 }
1398
1399 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1400 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1401 free (buffer);
1402 }
1403 else
1404 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1405
1406 g_object_unref (pixbuf);
1407#endif
1408}
1409
1054/*----------------------------------------------------------------------*/ 1410/*----------------------------------------------------------------------*/
1055/* rxvt_Create_Windows () - Open and map the window */ 1411/* Open and map the window */
1056void 1412void
1057rxvt_term::create_windows (int argc, const char *const *argv) 1413rxvt_term::create_windows (int argc, const char *const *argv)
1058{ 1414{
1059 XClassHint classHint; 1415 XClassHint classHint;
1060 XWMHints wmHint; 1416 XWMHints wmHint;
… …
1106 } 1462 }
1107#endif 1463#endif
1108 1464
1109 window_calc (0, 0); 1465 window_calc (0, 0);
1110 1466
1111 /* sub-window placement & size in rxvt_resize_subwindows () */ 1467 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1112 attributes.background_pixel = pix_colors_focused [Color_border]; 1468 attributes.background_pixel = pix_colors_focused [Color_border];
1113 attributes.border_pixel = pix_colors_focused [Color_border]; 1469 attributes.border_pixel = pix_colors_focused [Color_border];
1114 attributes.colormap = cmap; 1470 attributes.colormap = cmap;
1115 1471
1116 top = XCreateWindow (dpy, parent, 1472 top = XCreateWindow (dpy, parent,
… …
1119 ext_bwidth, 1475 ext_bwidth,
1120 depth, InputOutput, visual, 1476 depth, InputOutput, visual,
1121 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1477 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1122 &attributes); 1478 &attributes);
1123 1479
1124 this->parent[0] = top; 1480 this->parent = top;
1125
1126 old_width = szHint.width;
1127 old_height = szHint.height;
1128 1481
1129 set_title (rs [Rs_title]); 1482 set_title (rs [Rs_title]);
1130 set_icon_name (rs [Rs_iconName]); 1483 set_icon_name (rs [Rs_iconName]);
1131 1484
1132 classHint.res_name = (char *)rs[Rs_name]; 1485 classHint.res_name = (char *)rs[Rs_name];
… …
1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1490 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1138 wmHint.window_group = top; 1491 wmHint.window_group = top;
1139 1492
1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1141 &szHint, &wmHint, &classHint); 1494 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH 1495#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE
1144 /* 1496 /*
1145 * set up icon hint 1497 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1498 * rs [Rs_iconfile] is path to icon
1147 */ 1499 */
1148 1500
1149 if (rs [Rs_iconfile]) 1501 if (rs [Rs_iconfile])
1150 { 1502 {
1151 init_asv (); 1503 set_icon (rs [Rs_iconfile]);
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 } 1504 }
1190# endif
1191#endif 1505#endif
1192 1506
1193#if ENABLE_FRILLS 1507#if ENABLE_FRILLS
1194 if (mwmhints.flags) 1508 if (mwmhints.flags)
1195 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1509 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1201#if ENABLE_EWMH 1515#if ENABLE_EWMH
1202 xa[XA_NET_WM_PING], 1516 xa[XA_NET_WM_PING],
1203#endif 1517#endif
1204 }; 1518 };
1205 1519
1206 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1520 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1207 1521
1208#if ENABLE_FRILLS 1522#if ENABLE_FRILLS
1209 if (rs[Rs_transient_for]) 1523 if (rs[Rs_transient_for])
1210 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1524 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1211#endif 1525#endif
… …
1272 pix_colors = pix_colors_unfocused; 1586 pix_colors = pix_colors_unfocused;
1273#endif 1587#endif
1274 1588
1275 pointer_unblank (); 1589 pointer_unblank ();
1276 scr_recolour (); 1590 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} 1591}
1440 1592
1441/*----------------------------------------------------------------------*/ 1593/*----------------------------------------------------------------------*/
1442/* 1594/*
1443 * Run the command in a subprocess and return a file descriptor for the 1595 * Run the command in a subprocess and return a file descriptor for the
… …
1455 if (pty->pty >= 0) 1607 if (pty->pty >= 0)
1456 { 1608 {
1457 if (getfd_hook) 1609 if (getfd_hook)
1458 pty->pty = (*getfd_hook) (pty->pty); 1610 pty->pty = (*getfd_hook) (pty->pty);
1459 1611
1460 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1612 if (pty->pty < 0)
1461 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1462 } 1614 }
1463 } 1615 }
1464 else 1616 else
1465#endif 1617#endif
1466 if (!pty->get ()) 1618 if (!pty->get ())
1467 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1619 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1468 1620
1469 int er; 1621 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1622
1623 struct termios tio = def_tio;
1470 1624
1471#ifndef NO_BACKSPACE_KEY 1625#ifndef NO_BACKSPACE_KEY
1472 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1626 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1473 er = rs[Rs_backspace_key][0]; 1627 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1474 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1628 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1475 er = '\177'; /* the initial state anyway */ 1629 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1476 else
1477#endif 1630#endif
1478 er = -1;
1479 1631
1480 rxvt_get_ttymode (&tio, er);
1481 /* init terminal attributes */ 1632 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE); 1633 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE); 1634 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio); 1635 tcsetattr (pty->tty, TCSANOW, &tio);
1485 pty->set_utf8_mode (enc_utf8); 1636 pty->set_utf8_mode (enc_utf8);
… …
1525 1676
1526 _exit (EXIT_FAILURE); 1677 _exit (EXIT_FAILURE);
1527 1678
1528 default: 1679 default:
1529 if (!option (Opt_utmpInhibit)) 1680 if (!option (Opt_utmpInhibit))
1681 {
1682#ifdef LOG_ONLY_ON_LOGIN
1683 bool login_shell = option (Opt_loginShell);
1684#else
1685 bool login_shell = true;
1686#endif
1530 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1687 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1688 }
1531 1689
1532 pty->close_tty (); 1690 pty->close_tty ();
1533 1691
1534 child_ev.start (cmd_pid); 1692 child_ev.start (cmd_pid);
1535 1693
… …
1560#elif defined (SRIOCSREDIR) 1718#elif defined (SRIOCSREDIR)
1561 int fd; 1719 int fd;
1562 1720
1563 fd = open (CONSOLE, O_WRONLY, 0); 1721 fd = open (CONSOLE, O_WRONLY, 0);
1564 if (fd >= 0) 1722 if (fd >= 0)
1565 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1723 {
1724 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1566 close (fd); 1725 close (fd);
1726 }
1567#endif /* SRIOCSREDIR */ 1727#endif /* SRIOCSREDIR */
1568 } 1728 }
1569 1729
1570 /* reset signals and spin off the command interpreter */ 1730 /* reset signals and spin off the command interpreter */
1571 signal (SIGINT, SIG_DFL); 1731 signal (SIGINT, SIG_DFL);
1572 signal (SIGQUIT, SIG_DFL); 1732 signal (SIGQUIT, SIG_DFL);
1573 signal (SIGCHLD, SIG_DFL); 1733 signal (SIGCHLD, SIG_DFL);
1574 signal (SIGHUP, SIG_DFL); 1734 signal (SIGHUP, SIG_DFL);
1575 signal (SIGPIPE, SIG_DFL); 1735 signal (SIGPIPE, SIG_DFL);
1576 /* 1736 /*
1577 * mimick login's behavior by disabling the job control signals 1737 * mimic login's behavior by disabling the job control signals
1578 * a shell that wants them can turn them back on 1738 * a shell that wants them can turn them back on
1579 */ 1739 */
1580#ifdef SIGTSTP 1740#ifdef SIGTSTP
1581 signal (SIGTSTP, SIG_IGN); 1741 signal (SIGTSTP, SIG_IGN);
1582 signal (SIGTTIN, SIG_IGN); 1742 signal (SIGTTIN, SIG_IGN);
… …
1601 const char *argv0, *shell; 1761 const char *argv0, *shell;
1602 1762
1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1763 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604 shell = "/bin/sh"; 1764 shell = "/bin/sh";
1605 1765
1606 argv0 = (const char *)rxvt_basename (shell); 1766 argv0 = rxvt_basename (shell);
1607 1767
1608 if (option (Opt_loginShell)) 1768 if (option (Opt_loginShell))
1609 { 1769 {
1610 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1770 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1611 1771

Diff Legend

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