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.243 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 2011 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#ifdef KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 525#endif
276#if ENABLE_TRANSPARENCY 526#if ENABLE_TRANSPARENCY
277 NULL, 527 NULL,
278#endif 528#endif
279#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 530 "rgb:00/00/00",
… …
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} 565 set_option (Opt_buffered);
314
315static void
316init_secondary ()
317{
318 int i;
319
320 if ((i = open ("/dev/null", O_RDONLY)) < 0)
321 {
322 dup2 (STDERR_FILENO, STDIN_FILENO);
323 }
324 else if (i != STDIN_FILENO)
325 {
326 dup2 (i, STDIN_FILENO);
327 close (i);
328 }
329
330 dup2 (STDERR_FILENO, STDOUT_FILENO);
331} 566}
332 567
333/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
334const char ** 569const char **
335rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
… …
391#if XFT 626#if XFT
392 if (rs[Rs_depth]) 627 if (rs[Rs_depth])
393 select_visual (strtol (rs[Rs_depth], 0, 0)); 628 select_visual (strtol (rs[Rs_depth], 0, 0));
394#endif 629#endif
395 630
396#ifdef HAVE_AFTERIMAGE
397 set_application_name ((char*)rs[Rs_name]);
398 set_output_threshold (OUTPUT_LEVEL_WARNING);
399 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
400#endif
401 free (r_argv); 631 free (r_argv);
402 632
403 for (int i = NUM_RESOURCES; i--; ) 633 for (int i = NUM_RESOURCES; i--; )
404 if (rs [i] == resval_undef) 634 if (rs [i] == resval_undef)
405 rs [i] = 0; 635 rs [i] = 0;
… …
414 { 644 {
415 rxvt_perl.init (this); 645 rxvt_perl.init (this);
416 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 646 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
417 } 647 }
418#endif 648#endif
649
650 // must be called after initialising the perl interpreter as it
651 // may invoke the `on_register_command' hook
652 extract_keysym_resources ();
419 653
420 /* 654 /*
421 * set any defaults not already set 655 * set any defaults not already set
422 */ 656 */
423 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
424 { 658 {
425 if (!rs[Rs_title]) 659 if (!rs[Rs_title])
426 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 660 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
661
427 if (!rs[Rs_iconName]) 662 if (!rs[Rs_iconName])
428 rs[Rs_iconName] = rs[Rs_title]; 663 rs[Rs_iconName] = rs[Rs_title];
429 } 664 }
430 else 665 else
431 { 666 {
432 if (!rs[Rs_title]) 667 if (!rs[Rs_title])
433 rs[Rs_title] = rs[Rs_name]; 668 rs[Rs_title] = rs[Rs_name];
669
434 if (!rs[Rs_iconName]) 670 if (!rs[Rs_iconName])
435 rs[Rs_iconName] = rs[Rs_name]; 671 rs[Rs_iconName] = rs[Rs_name];
436 } 672 }
437 673
438 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 674 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
445 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 681 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
446 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 682 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
447 683
448 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 684 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
449 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 685 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
686
687 if (rs[Rs_letterSpace])
688 letterSpace = atoi (rs[Rs_letterSpace]);
450#endif 689#endif
451 690
452#ifdef POINTER_BLANK 691#ifdef POINTER_BLANK
453 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
454 pointerBlankDelay = i; 693 pointerBlankDelay = i;
… …
457#endif 696#endif
458 697
459 /* no point having a scrollbar without having any scrollback! */ 698 /* no point having a scrollbar without having any scrollback! */
460 if (!saveLines) 699 if (!saveLines)
461 set_option (Opt_scrollBar, 0); 700 set_option (Opt_scrollBar, 0);
462
463#ifdef PRINTPIPE
464 if (!rs[Rs_print_pipe])
465 rs[Rs_print_pipe] = PRINTPIPE;
466#endif
467 701
468 if (!rs[Rs_cutchars]) 702 if (!rs[Rs_cutchars])
469 rs[Rs_cutchars] = CUTCHARS; 703 rs[Rs_cutchars] = CUTCHARS;
470 704
471#ifndef NO_BACKSPACE_KEY 705#ifndef NO_BACKSPACE_KEY
… …
484# else 718# else
485 rs[Rs_delete_key] = "\033[3~"; 719 rs[Rs_delete_key] = "\033[3~";
486# endif 720# endif
487#endif 721#endif
488 722
489#ifdef HAVE_SCROLLBARS 723 scrollBar.setup (this);
490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
491#endif
492 724
493#ifdef XTERM_REVERSE_VIDEO 725#ifdef XTERM_REVERSE_VIDEO
494 /* this is how xterm implements reverseVideo */ 726 /* this is how xterm implements reverseVideo */
495 if (option (Opt_reverseVideo)) 727 if (option (Opt_reverseVideo))
496 { 728 {
… …
540{ 772{
541 this->envv = envv; 773 this->envv = envv;
542 774
543 SET_R (this); 775 SET_R (this);
544 set_locale (""); 776 set_locale ("");
545 set_environ (envv); // few things in X do not call setlocale :( 777 set_environ (envv); // a few things in X do not call setlocale :(
546 778
547 init_vars (); 779 init_vars ();
548
549 init_secondary ();
550 780
551 const char **cmd_argv = init_resources (argc, argv); 781 const char **cmd_argv = init_resources (argc, argv);
552 782
553#ifdef KEYSYM_RESOURCE 783#ifdef KEYSYM_RESOURCE
554 keyboard->register_done (); 784 keyboard->register_done ();
555#endif 785#endif
556 786
557#ifdef HAVE_SCROLLBARS 787 if (const char *path = rs[Rs_chdir])
788 if (*path) // ignored if empty
789 {
790 if (*path != '/')
791 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
792
793 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 }
796
558 if (option (Opt_scrollBar)) 797 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */ 798 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
560#endif
561 799
562 pty = ptytty::create (); 800 pty = ptytty::create ();
563 801
802#ifdef HAVE_AFTERIMAGE
803 set_application_name ((char *)rs[Rs_name]);
804 set_output_threshold (OUTPUT_LEVEL_WARNING);
805#endif
806
807 // must be called before create_windows, because the latter may call set_icon
808#ifdef HAVE_PIXBUF
809 g_type_init ();
810#endif
811
564 create_windows (argc, argv); 812 create_windows (argc, argv);
565 813
566 init_xlocale (); 814 init_xlocale ();
567 815
568 scr_reset (); // initialize screen 816 scr_poweron (); // initialize screen
569 817
570#if 0 818#if 0
571 XSynchronize (dpy, True); 819 XSynchronize (dpy, True);
572#endif 820#endif
573 821
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar)) 822 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */ 823 scrollBar.resize (); /* create and map scrollbar */
577#endif
578#ifdef HAVE_BG_PIXMAP 824#ifdef HAVE_BG_PIXMAP
579 { 825 {
580 bgPixmap.set_target (this); 826 bg_init ();
581 bgPixmap.invalidate ();
582 827
583#ifdef ENABLE_TRANSPARENCY 828#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent)) 829 if (option (Opt_transparent))
585 { 830 {
586 bgPixmap.set_transparent (); 831 bg_set_transparent ();
587 832
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius]) 833 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 834 bg_set_blur (rs [Rs_blurradius]);
591#endif 835
592 if (ISSET_PIXCOLOR (Color_tint)) 836 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 837 bg_set_tint (pix_colors_focused [Color_tint]);
594 838
595 if (rs [Rs_shade]) 839 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]); 840 bg_set_shade (rs [Rs_shade]);
597 841
598 bgPixmap.set_root_pixmap (); 842 bg_set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask); 843 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root); 844 rootwin_ev.start (display, display->root);
601 } 845 }
602#endif 846#endif
603 847
604#ifdef BG_IMAGE_FROM_FILE 848#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap]) 849 if (rs[Rs_backgroundPixmap])
606 { 850 {
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])) 851 if (bg_set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ()) 852 if (!bg_window_position_sensitive ())
619 update_background (); 853 update_background ();
620 } 854 }
621#endif 855#endif
622 } 856 }
623#endif 857#endif
… …
640#if ENABLE_XEMBED 874#if ENABLE_XEMBED
641 if (rs[Rs_embed]) 875 if (rs[Rs_embed])
642 { 876 {
643 long info[2] = { 0, XEMBED_MAPPED }; 877 long info[2] = { 0, XEMBED_MAPPED };
644 878
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2); 880 32, PropModeReplace, (unsigned char *)&info, 2);
647 } 881 }
648#endif 882#endif
649 883
884#if HAVE_STARTUP_NOTIFICATION
885 SnDisplay *snDisplay;
886 SnLauncheeContext *snContext;
887
888 snDisplay = sn_display_new (dpy, NULL, NULL);
889 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
890
891 /* Tell the window manager that this window is part of the startup context */
892 if (snContext)
893 sn_launchee_context_setup_window (snContext, parent);
894#endif
895
650 XMapWindow (dpy, vt); 896 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]); 897 XMapWindow (dpy, parent);
898
899#if HAVE_STARTUP_NOTIFICATION
900 if (snContext)
901 {
902 /* Mark the startup process as complete */
903 sn_launchee_context_complete (snContext);
904
905 sn_launchee_context_unref (snContext);
906 }
907
908 sn_display_unref (snDisplay);
909#endif
652 910
653 refresh_check (); 911 refresh_check ();
654} 912}
655 913
656/*----------------------------------------------------------------------*/ 914/*----------------------------------------------------------------------*/
657void 915void
658rxvt_term::init_env () 916rxvt_term::init_env ()
659{ 917{
660 int i;
661 char *val; 918 char *val;
662 919
663#ifdef DISPLAY_IS_IP 920#ifdef DISPLAY_IS_IP
664 /* Fixup display_name for export over pty to any interested terminal 921 /* 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 922 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
679 val = XDisplayString (dpy); 936 val = XDisplayString (dpy);
680 937
681 if (rs[Rs_display_name] == NULL) 938 if (rs[Rs_display_name] == NULL)
682 rs[Rs_display_name] = val; /* use broken `:0' value */ 939 rs[Rs_display_name] = val; /* use broken `:0' value */
683 940
684 i = strlen (val);
685 env_display = (char *)rxvt_malloc (i + 9); 941 env_display = (char *)rxvt_malloc (strlen (val) + 9);
686 942
687 sprintf (env_display, "DISPLAY=%s", val); 943 sprintf (env_display, "DISPLAY=%s", val);
688 944
689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 945 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
690 946
691 /* add entries to the environment: 947 /* add entries to the environment:
692 * @ DISPLAY: in case we started with -display 948 * @ DISPLAY: in case we started with -display
693 * @ WINDOWID: X window id number of the window 949 * @ WINDOWID: X window id number of the window
694 * @ COLORTERM: terminal sub-name and also indicates its color 950 * @ COLORTERM: terminal sub-name and also indicates its color
… …
837 run_command (argv); 1093 run_command (argv);
838} 1094}
839 1095
840/*----------------------------------------------------------------------*/ 1096/*----------------------------------------------------------------------*/
841void 1097void
842rxvt_term::Get_Colours () 1098rxvt_term::get_colours ()
843{ 1099{
844 int i; 1100 int i;
845 1101
846#ifdef OFF_FOCUS_FADING 1102#ifdef OFF_FOCUS_FADING
847 pix_colors = pix_colors_focused; 1103 pix_colors = pix_colors_focused;
… …
907 * get scrollBar shadow colors 1163 * get scrollBar shadow colors
908 * 1164 *
909 * The calculations of topShadow/bottomShadow values are adapted 1165 * The calculations of topShadow/bottomShadow values are adapted
910 * from the fvwm window manager. 1166 * from the fvwm window manager.
911 */ 1167 */
912#ifdef KEEP_SCROLLCOLOR 1168#ifdef RXVT_SCROLLBAR
913 if (depth <= 2) 1169 if (depth <= 2)
914 { 1170 {
915 /* Monochrome */ 1171 /* Monochrome */
916 alias_color (Color_scroll, Color_fg); 1172 alias_color (Color_scroll, Color_fg);
917 alias_color (Color_topShadow, Color_bg); 1173 alias_color (Color_topShadow, Color_bg);
… …
932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1188 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
933 cscroll.a) 1189 cscroll.a)
934 )) 1190 ))
935 alias_color (Color_topShadow, Color_White); 1191 alias_color (Color_topShadow, Color_White);
936 } 1192 }
937#endif /* KEEP_SCROLLCOLOR */ 1193#endif
938 1194
939#ifdef OFF_FOCUS_FADING 1195#ifdef OFF_FOCUS_FADING
940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1196 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
941 update_fade_color (i); 1197 update_fade_color (i);
942#endif 1198#endif
… …
1047 1303
1048 if (i) 1304 if (i)
1049 ModMetaMask = modmasks[i - 1]; 1305 ModMetaMask = modmasks[i - 1];
1050} 1306}
1051 1307
1308void
1309rxvt_term::set_icon (const char *file)
1310{
1311#ifdef HAVE_AFTERIMAGE
1312 init_asv ();
1313
1314 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1315 if (!im)
1316 {
1317 rxvt_warn ("Loading image icon failed, continuing without.\n");
1318 return;
1319 }
1320
1321 unsigned int w = im->width;
1322 unsigned int h = im->height;
1323
1324 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1325 {
1326 rxvt_warn ("Icon image too big, continuing without.\n");
1327 destroy_asimage (&im);
1328 return;
1329 }
1330
1331 ASImage *result = scale_asimage (asv, im,
1332 w, h, ASA_ARGB32,
1333 100, ASIMAGE_QUALITY_DEFAULT);
1334 destroy_asimage (&im);
1335
1336 if (!result)
1337 {
1338 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1339 return;
1340 }
1341
1342 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1343 if (buffer)
1344 {
1345 ARGB32 *asbuf = result->alt.argb32;
1346 buffer [0] = w;
1347 buffer [1] = h;
1348
1349 for (unsigned int i = 0; i < w * h; ++i)
1350 buffer [i + 2] = asbuf [i];
1351
1352 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1353 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1354 free (buffer);
1355 }
1356 else
1357 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1358
1359 destroy_asimage (&result);
1360#endif
1361
1362#ifdef HAVE_PIXBUF
1363 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1364 if (!pixbuf)
1365 {
1366 rxvt_warn ("Loading image icon failed, continuing without.\n");
1367 return;
1368 }
1369
1370 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1371 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1372
1373 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1374 {
1375 rxvt_warn ("Icon image too big, continuing without.\n");
1376 g_object_unref (pixbuf);
1377 return;
1378 }
1379
1380 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1381 {
1382 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1383 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1384 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1385
1386 buffer [0] = w;
1387 buffer [1] = h;
1388 for (int i = 0; i < h; i++)
1389 {
1390 for (int j = 0; j < w; j++)
1391 {
1392 unsigned char *pixel = row + j * channels;
1393 long value;
1394
1395 if (channels == 4)
1396 value = pixel[3];
1397 else
1398 value = (unsigned char)0x00ff;
1399
1400 value = (value << 8) + pixel[0];
1401 value = (value << 8) + pixel[1];
1402 value = (value << 8) + pixel[2];
1403 buffer[(i * w + j) + 2] = value;
1404 }
1405
1406 row += rowstride;
1407 }
1408
1409 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1410 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1411 free (buffer);
1412 }
1413 else
1414 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1415
1416 g_object_unref (pixbuf);
1417#endif
1418}
1419
1052/*----------------------------------------------------------------------*/ 1420/*----------------------------------------------------------------------*/
1053/* rxvt_Create_Windows () - Open and map the window */ 1421/* Open and map the window */
1054void 1422void
1055rxvt_term::create_windows (int argc, const char *const *argv) 1423rxvt_term::create_windows (int argc, const char *const *argv)
1056{ 1424{
1057 XClassHint classHint; 1425 XClassHint classHint;
1058 XWMHints wmHint; 1426 XWMHints wmHint;
… …
1064 Window top, parent; 1432 Window top, parent;
1065 1433
1066 dLocal (Display *, dpy); 1434 dLocal (Display *, dpy);
1067 1435
1068 /* grab colors before netscape does */ 1436 /* grab colors before netscape does */
1069 Get_Colours (); 1437 get_colours ();
1070 1438
1071 if (!set_fonts ()) 1439 if (!set_fonts ())
1072 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1440 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1073 1441
1074 parent = display->root; 1442 parent = display->root;
… …
1104 } 1472 }
1105#endif 1473#endif
1106 1474
1107 window_calc (0, 0); 1475 window_calc (0, 0);
1108 1476
1109 /* sub-window placement & size in rxvt_resize_subwindows () */ 1477 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1110 attributes.background_pixel = pix_colors_focused [Color_border]; 1478 attributes.background_pixel = pix_colors_focused [Color_border];
1111 attributes.border_pixel = pix_colors_focused [Color_border]; 1479 attributes.border_pixel = pix_colors_focused [Color_border];
1112 attributes.colormap = cmap; 1480 attributes.colormap = cmap;
1113 1481
1114 top = XCreateWindow (dpy, parent, 1482 top = XCreateWindow (dpy, parent,
… …
1117 ext_bwidth, 1485 ext_bwidth,
1118 depth, InputOutput, visual, 1486 depth, InputOutput, visual,
1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1120 &attributes); 1488 &attributes);
1121 1489
1122 this->parent[0] = top; 1490 this->parent = top;
1123 1491
1124 old_width = szHint.width; 1492 old_width = szHint.width;
1125 old_height = szHint.height; 1493 old_height = szHint.height;
1126 1494
1127 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1495 set_title (rs [Rs_title]);
1128 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1496 set_icon_name (rs [Rs_iconName]);
1129 1497
1130 classHint.res_name = (char *)rs[Rs_name]; 1498 classHint.res_name = (char *)rs[Rs_name];
1131 classHint.res_class = (char *)RESCLASS; 1499 classHint.res_class = (char *)RESCLASS;
1132 1500
1133 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1501 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1503 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1136 wmHint.window_group = top; 1504 wmHint.window_group = top;
1137 1505
1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1506 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1139 &szHint, &wmHint, &classHint); 1507 &szHint, &wmHint, &classHint);
1508#if ENABLE_EWMH
1509 /*
1510 * set up icon hint
1511 * rs [Rs_iconfile] is path to icon
1512 */
1513
1514 if (rs [Rs_iconfile])
1515 {
1516 set_icon (rs [Rs_iconfile]);
1517 }
1518#endif
1140 1519
1141#if ENABLE_FRILLS 1520#if ENABLE_FRILLS
1142 if (mwmhints.flags) 1521 if (mwmhints.flags)
1143 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1522 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1144 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1523 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1149#if ENABLE_EWMH 1528#if ENABLE_EWMH
1150 xa[XA_NET_WM_PING], 1529 xa[XA_NET_WM_PING],
1151#endif 1530#endif
1152 }; 1531 };
1153 1532
1154 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1533 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1155 1534
1156#if ENABLE_FRILLS 1535#if ENABLE_FRILLS
1157 if (rs[Rs_transient_for]) 1536 if (rs[Rs_transient_for])
1158 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1537 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1159#endif 1538#endif
… …
1220 pix_colors = pix_colors_unfocused; 1599 pix_colors = pix_colors_unfocused;
1221#endif 1600#endif
1222 1601
1223 pointer_unblank (); 1602 pointer_unblank ();
1224 scr_recolour (); 1603 scr_recolour ();
1225}
1226
1227/* ------------------------------------------------------------------------- *
1228 * GET TTY CURRENT STATE *
1229 * ------------------------------------------------------------------------- */
1230void
1231rxvt_get_ttymode (struct termios *tio, int erase)
1232{
1233 /*
1234 * standard System V termios interface
1235 */
1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1237 {
1238 // return error - use system defaults,
1239 // where possible, and zero elsewhere
1240 memset (tio, 0, sizeof (struct termios));
1241
1242 tio->c_cc[VINTR] = CINTR;
1243 tio->c_cc[VQUIT] = CQUIT;
1244 tio->c_cc[VERASE] = CERASE;
1245#ifdef VERASE2
1246 tio->c_cc[VERASE2] = CERASE2;
1247#endif
1248 tio->c_cc[VKILL] = CKILL;
1249 tio->c_cc[VSTART] = CSTART;
1250 tio->c_cc[VSTOP] = CSTOP;
1251 tio->c_cc[VSUSP] = CSUSP;
1252# ifdef VDSUSP
1253 tio->c_cc[VDSUSP] = CDSUSP;
1254# endif
1255# ifdef VREPRINT
1256 tio->c_cc[VREPRINT] = CRPRNT;
1257# endif
1258# ifdef VDISCRD
1259 tio->c_cc[VDISCRD] = CFLUSH;
1260# endif
1261# ifdef VWERSE
1262 tio->c_cc[VWERSE] = CWERASE;
1263# endif
1264# ifdef VLNEXT
1265 tio->c_cc[VLNEXT] = CLNEXT;
1266# endif
1267 }
1268
1269 tio->c_cc[VEOF] = CEOF;
1270 tio->c_cc[VEOL] = VDISABLE;
1271# ifdef VEOL2
1272 tio->c_cc[VEOL2] = VDISABLE;
1273# endif
1274# ifdef VSWTC
1275 tio->c_cc[VSWTC] = VDISABLE;
1276# endif
1277# ifdef VSWTCH
1278 tio->c_cc[VSWTCH] = VDISABLE;
1279# endif
1280# if VMIN != VEOF
1281 tio->c_cc[VMIN] = 1;
1282# endif
1283# if VTIME != VEOL
1284 tio->c_cc[VTIME] = 0;
1285# endif
1286
1287 if (erase != -1)
1288 tio->c_cc[VERASE] = (char)erase;
1289
1290 /* input modes */
1291 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1292# ifdef IMAXBEL
1293 | IMAXBEL
1294# endif
1295 | IXON);
1296
1297 /* output modes */
1298 tio->c_oflag = (OPOST | ONLCR);
1299
1300 /* control modes */
1301 tio->c_cflag = (CS8 | CREAD);
1302
1303 /* line discipline modes */
1304 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1305# if defined (ECHOCTL) && defined (ECHOKE)
1306 | ECHOCTL | ECHOKE
1307# endif
1308 | ECHOE | ECHOK);
1309
1310 /*
1311 * Debugging
1312 */
1313#ifdef DEBUG_TTYMODE
1314 /* c_iflag bits */
1315 fprintf (stderr, "Input flags\n");
1316
1317 /* cpp token stringize doesn't work on all machines <sigh> */
1318# define FOO(flag,name) \
1319 if ((tio->c_iflag) & flag) \
1320 fprintf (stderr, "%s ", name)
1321
1322 /* c_iflag bits */
1323 FOO (IGNBRK, "IGNBRK");
1324 FOO (BRKINT, "BRKINT");
1325 FOO (IGNPAR, "IGNPAR");
1326 FOO (PARMRK, "PARMRK");
1327 FOO (INPCK, "INPCK");
1328 FOO (ISTRIP, "ISTRIP");
1329 FOO (INLCR, "INLCR");
1330 FOO (IGNCR, "IGNCR");
1331 FOO (ICRNL, "ICRNL");
1332 FOO (IXON, "IXON");
1333 FOO (IXOFF, "IXOFF");
1334# ifdef IUCLC
1335 FOO (IUCLC, "IUCLC");
1336# endif
1337# ifdef IXANY
1338 FOO (IXANY, "IXANY");
1339# endif
1340# ifdef IMAXBEL
1341 FOO (IMAXBEL, "IMAXBEL");
1342# endif
1343
1344 fprintf (stderr, "\n");
1345
1346# undef FOO
1347# define FOO(entry, name) \
1348 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1349
1350 FOO (VINTR, "VINTR");
1351 FOO (VQUIT, "VQUIT");
1352 FOO (VERASE, "VERASE");
1353 FOO (VKILL, "VKILL");
1354 FOO (VEOF, "VEOF");
1355 FOO (VEOL, "VEOL");
1356# ifdef VEOL2
1357 FOO (VEOL2, "VEOL2");
1358# endif
1359# ifdef VSWTC
1360 FOO (VSWTC, "VSWTC");
1361# endif
1362# ifdef VSWTCH
1363 FOO (VSWTCH, "VSWTCH");
1364# endif
1365 FOO (VSTART, "VSTART");
1366 FOO (VSTOP, "VSTOP");
1367 FOO (VSUSP, "VSUSP");
1368# ifdef VDSUSP
1369 FOO (VDSUSP, "VDSUSP");
1370# endif
1371# ifdef VREPRINT
1372 FOO (VREPRINT, "VREPRINT");
1373# endif
1374# ifdef VDISCRD
1375 FOO (VDISCRD, "VDISCRD");
1376# endif
1377# ifdef VWERSE
1378 FOO (VWERSE, "VWERSE");
1379# endif
1380# ifdef VLNEXT
1381 FOO (VLNEXT, "VLNEXT");
1382# endif
1383
1384 fprintf (stderr, "\n");
1385# undef FOO
1386#endif /* DEBUG_TTYMODE */
1387} 1604}
1388 1605
1389/*----------------------------------------------------------------------*/ 1606/*----------------------------------------------------------------------*/
1390/* 1607/*
1391 * Run the command in a subprocess and return a file descriptor for the 1608 * Run the command in a subprocess and return a file descriptor for the
… …
1412 else 1629 else
1413#endif 1630#endif
1414 if (!pty->get ()) 1631 if (!pty->get ())
1415 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1632 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1416 1633
1417 int er; 1634 struct termios tio = def_tio;
1418 1635
1419#ifndef NO_BACKSPACE_KEY 1636#ifndef NO_BACKSPACE_KEY
1420 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1637 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1421 er = rs[Rs_backspace_key][0]; 1638 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1422 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1639 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1423 er = '\177'; /* the initial state anyway */ 1640 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1424 else
1425#endif 1641#endif
1426 er = -1;
1427 1642
1428 rxvt_get_ttymode (&tio, er);
1429 /* init terminal attributes */ 1643 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE); 1644 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE); 1645 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio); 1646 tcsetattr (pty->tty, TCSANOW, &tio);
1433 pty->set_utf8_mode (enc_utf8); 1647 pty->set_utf8_mode (enc_utf8);
… …
1520 signal (SIGQUIT, SIG_DFL); 1734 signal (SIGQUIT, SIG_DFL);
1521 signal (SIGCHLD, SIG_DFL); 1735 signal (SIGCHLD, SIG_DFL);
1522 signal (SIGHUP, SIG_DFL); 1736 signal (SIGHUP, SIG_DFL);
1523 signal (SIGPIPE, SIG_DFL); 1737 signal (SIGPIPE, SIG_DFL);
1524 /* 1738 /*
1525 * mimick login's behavior by disabling the job control signals 1739 * mimic login's behavior by disabling the job control signals
1526 * a shell that wants them can turn them back on 1740 * a shell that wants them can turn them back on
1527 */ 1741 */
1528#ifdef SIGTSTP 1742#ifdef SIGTSTP
1529 signal (SIGTSTP, SIG_IGN); 1743 signal (SIGTSTP, SIG_IGN);
1530 signal (SIGTTIN, SIG_IGN); 1744 signal (SIGTTIN, SIG_IGN);
1531 signal (SIGTTOU, SIG_IGN); 1745 signal (SIGTTOU, SIG_IGN);
1532#endif /* SIGTSTP */ 1746#endif /* SIGTSTP */
1533 1747
1534 // unblock signals (signals are blocked by iom.C
1535 sigset_t ss;
1536 sigemptyset (&ss);
1537 sigprocmask (SIG_SETMASK, &ss, 0);
1538
1539 /* command interpreter path */ 1748 /* command interpreter path */
1540 if (argv) 1749 if (argv)
1541 { 1750 {
1542# ifdef DEBUG_CMD 1751# ifdef DEBUG_CMD
1543 int i; 1752 int i;
… …
1554 const char *argv0, *shell; 1763 const char *argv0, *shell;
1555 1764
1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1765 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1557 shell = "/bin/sh"; 1766 shell = "/bin/sh";
1558 1767
1559 argv0 = (const char *)rxvt_basename (shell); 1768 argv0 = rxvt_basename (shell);
1560 1769
1561 if (option (Opt_loginShell)) 1770 if (option (Opt_loginShell))
1562 { 1771 {
1563 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1772 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1564 1773

Diff Legend

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