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.231 by ayin, Tue Dec 18 12:04:50 2007 UTC vs.
Revision 1.299 by sf-exg, Fri Aug 19 17:49:08 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-2007 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.
… …
34 34
35#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
36#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
37#include "rxvtutil.h" 37#include "rxvtutil.h"
38#include "init.h" 38#include "init.h"
39#include "keyboard.h"
39 40
40#include <limits> 41#include <limits>
41 42
42#include <csignal> 43#include <csignal>
43 44
… …
142 143
143 return rval; 144 return rval;
144} 145}
145#endif 146#endif
146 147
147const char *const def_colorName[] = 148static const char *const def_colorName[] =
148 { 149 {
149 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
150 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
151 /* low-intensity colors */ 152 /* low-intensity colors */
152 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 178
179#if !USE_256_COLORS
178 // 88 xterm colours 180 // 88 xterm colours
179 "rgb:00/00/00", 181 "rgb:00/00/00",
180 "rgb:00/00/8b", 182 "rgb:00/00/8b",
181 "rgb:00/00/cd", 183 "rgb:00/00/cd",
182 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
250 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
251 496
252#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
… …
265#if ENABLE_FRILLS 510#if ENABLE_FRILLS
266 NULL, // Color_underline 511 NULL, // Color_underline
267#endif 512#endif
268#ifdef OPTION_HC 513#ifdef OPTION_HC
269 NULL, 514 NULL,
515 NULL,
270#endif 516#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 520#endif
275#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
276 NULL, 522 NULL,
277#endif 523#endif
278#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 525 "rgb:00/00/00",
… …
281 }; 527 };
282 528
283void 529void
284rxvt_term::init_vars () 530rxvt_term::init_vars ()
285{ 531{
286 pix_colors = // 532 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291 533
292 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
293 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
294 want_refresh = 1; 536 want_refresh = 1;
295 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
296 ncol = 80; 538 ncol = 80;
297 nrow = 24; 539 nrow = 24;
298 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
299 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
300 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
301 saveLines = SAVELINES; 544 saveLines = SAVELINES;
302 545
303 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
304 547
305 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
306 last_bot = last_state = -1;
307 549
308 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
309 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
310 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
311 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
312 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
313 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
314 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
315 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
316 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
317} 560 set_option (Opt_buffered);
318
319void
320rxvt_term::init_secondary ()
321{
322 int i;
323
324 /*
325 * Close all unused file descriptors
326 * We don't want them, we don't need them.
327 */
328 if ((i = open ("/dev/null", O_RDONLY)) < 0)
329 {
330 /* TODO: BOO HISS */
331 dup2 (STDERR_FILENO, STDIN_FILENO);
332 }
333 else if (i != STDIN_FILENO)
334 {
335 dup2 (i, STDIN_FILENO);
336 close (i);
337 }
338
339 dup2 (STDERR_FILENO, STDOUT_FILENO);
340
341#if 0 // schmorp sayz closing filies is murder
342 for (i = STDERR_FILENO + 1; i < num_fds; i++)
343 {
344#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
345 if (i == 4 || i == 7)
346 continue;
347#endif
348 close (i);
349 }
350#endif
351} 561}
352 562
353/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
354const char ** 564const char **
355rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
411#if XFT 621#if XFT
412 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
413 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
414#endif 624#endif
415 625
416#ifdef HAVE_AFTERIMAGE
417 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
418#endif
419 free (r_argv); 626 free (r_argv);
420 627
421 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
422 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
423 rs [i] = 0; 630 rs [i] = 0;
… …
440 */ 647 */
441 if (cmd_argv && cmd_argv[0]) 648 if (cmd_argv && cmd_argv[0])
442 { 649 {
443 if (!rs[Rs_title]) 650 if (!rs[Rs_title])
444 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 651 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
652
445 if (!rs[Rs_iconName]) 653 if (!rs[Rs_iconName])
446 rs[Rs_iconName] = rs[Rs_title]; 654 rs[Rs_iconName] = rs[Rs_title];
447 } 655 }
448 else 656 else
449 { 657 {
450 if (!rs[Rs_title]) 658 if (!rs[Rs_title])
451 rs[Rs_title] = rs[Rs_name]; 659 rs[Rs_title] = rs[Rs_name];
660
452 if (!rs[Rs_iconName]) 661 if (!rs[Rs_iconName])
453 rs[Rs_iconName] = rs[Rs_name]; 662 rs[Rs_iconName] = rs[Rs_name];
454 } 663 }
455 664
456 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 665 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
463 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 672 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
464 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 673 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
465 674
466 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 675 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
467 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 676 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
677
678 if (rs[Rs_letterSpace])
679 letterSpace = atoi (rs[Rs_letterSpace]);
468#endif 680#endif
469 681
470#ifdef POINTER_BLANK 682#ifdef POINTER_BLANK
471 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
472 pointerBlankDelay = i; 684 pointerBlankDelay = i;
… …
475#endif 687#endif
476 688
477 /* no point having a scrollbar without having any scrollback! */ 689 /* no point having a scrollbar without having any scrollback! */
478 if (!saveLines) 690 if (!saveLines)
479 set_option (Opt_scrollBar, 0); 691 set_option (Opt_scrollBar, 0);
480
481#ifdef PRINTPIPE
482 if (!rs[Rs_print_pipe])
483 rs[Rs_print_pipe] = PRINTPIPE;
484#endif
485 692
486 if (!rs[Rs_cutchars]) 693 if (!rs[Rs_cutchars])
487 rs[Rs_cutchars] = CUTCHARS; 694 rs[Rs_cutchars] = CUTCHARS;
488 695
489#ifndef NO_BACKSPACE_KEY 696#ifndef NO_BACKSPACE_KEY
… …
502# else 709# else
503 rs[Rs_delete_key] = "\033[3~"; 710 rs[Rs_delete_key] = "\033[3~";
504# endif 711# endif
505#endif 712#endif
506 713
507#ifdef HAVE_SCROLLBARS 714 scrollBar.setup (this);
508 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
509#endif
510 715
511#ifdef XTERM_REVERSE_VIDEO 716#ifdef XTERM_REVERSE_VIDEO
512 /* this is how xterm implements reverseVideo */ 717 /* this is how xterm implements reverseVideo */
513 if (option (Opt_reverseVideo)) 718 if (option (Opt_reverseVideo))
514 { 719 {
… …
552 return cmd_argv; 757 return cmd_argv;
553} 758}
554 759
555/*----------------------------------------------------------------------*/ 760/*----------------------------------------------------------------------*/
556void 761void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
763{
764 this->envv = envv;
765
766 SET_R (this);
767 set_locale ("");
768 set_environ (envv); // a few things in X do not call setlocale :(
769
770 init_vars ();
771
772 const char **cmd_argv = init_resources (argc, argv);
773
774#ifdef KEYSYM_RESOURCE
775 keyboard->register_done ();
776#endif
777
778 if (const char *path = rs[Rs_chdir])
779 if (*path) // ignored if empty
780 {
781 if (*path != '/')
782 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
783
784 if (chdir (path))
785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
786 }
787
788 if (option (Opt_scrollBar))
789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
790
791 pty = ptytty::create ();
792
793#ifdef HAVE_AFTERIMAGE
794 set_application_name ((char *)rs[Rs_name]);
795 set_output_threshold (OUTPUT_LEVEL_WARNING);
796#endif
797
798 // must be called before create_windows, because the latter may call set_icon
799#ifdef HAVE_PIXBUF
800 g_type_init ();
801#endif
802
803 create_windows (argc, argv);
804
805 init_xlocale ();
806
807 scr_poweron (); // initialize screen
808
809#if 0
810 XSynchronize (dpy, True);
811#endif
812
813 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */
815#ifdef HAVE_BG_PIXMAP
816 {
817 bg_init ();
818
819#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent))
821 {
822 bg_set_transparent ();
823
824 if (rs [Rs_blurradius])
825 bg_set_blur (rs [Rs_blurradius]);
826
827 if (ISSET_PIXCOLOR (Color_tint))
828 bg_set_tint (pix_colors_focused [Color_tint]);
829
830 if (rs [Rs_shade])
831 bg_set_shade (rs [Rs_shade]);
832
833 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root);
836 }
837#endif
838
839#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap])
841 {
842 if (bg_set_file (rs[Rs_backgroundPixmap]))
843 if (!bg_window_position_sensitive ())
844 update_background ();
845 }
846#endif
847 }
848#endif
849
850#if ENABLE_PERL
851 rootwin_ev.start (display, display->root);
852#endif
853
854 set_colorfgbg ();
855
856 init_command (cmd_argv);
857
858 free (cmd_argv);
859
860 if (pty->pty >= 0)
861 pty_ev.start (pty->pty, ev::READ);
862
863 HOOK_INVOKE ((this, HOOK_START, DT_END));
864
865#if ENABLE_XEMBED
866 if (rs[Rs_embed])
867 {
868 long info[2] = { 0, XEMBED_MAPPED };
869
870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
871 32, PropModeReplace, (unsigned char *)&info, 2);
872 }
873#endif
874
875 XMapWindow (dpy, vt);
876 XMapWindow (dpy, parent);
877
878 refresh_check ();
879}
880
881/*----------------------------------------------------------------------*/
882void
557rxvt_term::init_env () 883rxvt_term::init_env ()
558{ 884{
559 int i;
560 char *val; 885 char *val;
561 886
562#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
563 /* Fixup display_name for export over pty to any interested terminal 888 /* Fixup display_name for export over pty to any interested terminal
564 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
578 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
579 904
580 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
581 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
582 907
583 i = strlen (val);
584 env_display = (char *)rxvt_malloc (i + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
585 909
586 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
587 911
588 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
589 913
590 /* add entries to the environment: 914 /* add entries to the environment:
591 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
592 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
593 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
… …
736 run_command (argv); 1060 run_command (argv);
737} 1061}
738 1062
739/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
740void 1064void
741rxvt_term::Get_Colours () 1065rxvt_term::get_colours ()
742{ 1066{
743 int i; 1067 int i;
744 1068
745#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
746 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
… …
806 * get scrollBar shadow colors 1130 * get scrollBar shadow colors
807 * 1131 *
808 * The calculations of topShadow/bottomShadow values are adapted 1132 * The calculations of topShadow/bottomShadow values are adapted
809 * from the fvwm window manager. 1133 * from the fvwm window manager.
810 */ 1134 */
811#ifdef KEEP_SCROLLCOLOR 1135#ifdef RXVT_SCROLLBAR
812 if (depth <= 2) 1136 if (depth <= 2)
813 { 1137 {
814 /* Monochrome */ 1138 /* Monochrome */
815 alias_color (Color_scroll, Color_fg); 1139 alias_color (Color_scroll, Color_fg);
816 alias_color (Color_topShadow, Color_bg); 1140 alias_color (Color_topShadow, Color_bg);
… …
831 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1155 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
832 cscroll.a) 1156 cscroll.a)
833 )) 1157 ))
834 alias_color (Color_topShadow, Color_White); 1158 alias_color (Color_topShadow, Color_White);
835 } 1159 }
836#endif /* KEEP_SCROLLCOLOR */ 1160#endif
837 1161
838#ifdef OFF_FOCUS_FADING 1162#ifdef OFF_FOCUS_FADING
839 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1163 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
840 update_fade_color (i); 1164 update_fade_color (i);
841#endif 1165#endif
… …
946 1270
947 if (i) 1271 if (i)
948 ModMetaMask = modmasks[i - 1]; 1272 ModMetaMask = modmasks[i - 1];
949} 1273}
950 1274
1275void
1276rxvt_term::set_icon (const char *file)
1277{
1278#ifdef HAVE_AFTERIMAGE
1279 init_asv ();
1280
1281 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1282 if (!im)
1283 {
1284 rxvt_warn ("Loading image icon failed, continuing without.\n");
1285 return;
1286 }
1287
1288 unsigned int w = im->width;
1289 unsigned int h = im->height;
1290
1291 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1292 {
1293 rxvt_warn ("Icon image too big, continuing without.\n");
1294 destroy_asimage (&im);
1295 return;
1296 }
1297
1298 ASImage *result = scale_asimage (asv, im,
1299 w, h, ASA_ARGB32,
1300 100, ASIMAGE_QUALITY_DEFAULT);
1301 destroy_asimage (&im);
1302
1303 if (!result)
1304 {
1305 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1306 return;
1307 }
1308
1309 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1310 if (buffer)
1311 {
1312 ARGB32 *asbuf = result->alt.argb32;
1313 buffer [0] = w;
1314 buffer [1] = h;
1315
1316 for (unsigned int i = 0; i < w * h; ++i)
1317 buffer [i + 2] = asbuf [i];
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 destroy_asimage (&result);
1327#endif
1328
1329#ifdef HAVE_PIXBUF
1330 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf)
1332 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return;
1335 }
1336
1337 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1338 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1339
1340 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1341 {
1342 rxvt_warn ("Icon image too big, continuing without.\n");
1343 g_object_unref (pixbuf);
1344 return;
1345 }
1346
1347 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1348 {
1349 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1350 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1351 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1352
1353 buffer [0] = w;
1354 buffer [1] = h;
1355 for (int i = 0; i < h; i++)
1356 {
1357 for (int j = 0; j < w; j++)
1358 {
1359 unsigned char *pixel = row + j * channels;
1360 long value;
1361
1362 if (channels == 4)
1363 value = pixel[3];
1364 else
1365 value = (unsigned char)0x00ff;
1366
1367 value = (value << 8) + pixel[0];
1368 value = (value << 8) + pixel[1];
1369 value = (value << 8) + pixel[2];
1370 buffer[(i * w + j) + 2] = value;
1371 }
1372
1373 row += rowstride;
1374 }
1375
1376 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1377 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1378 free (buffer);
1379 }
1380 else
1381 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1382
1383 g_object_unref (pixbuf);
1384#endif
1385}
1386
951/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
952/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
953void 1389void
954rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
955{ 1391{
956 XClassHint classHint; 1392 XClassHint classHint;
957 XWMHints wmHint; 1393 XWMHints wmHint;
… …
963 Window top, parent; 1399 Window top, parent;
964 1400
965 dLocal (Display *, dpy); 1401 dLocal (Display *, dpy);
966 1402
967 /* grab colors before netscape does */ 1403 /* grab colors before netscape does */
968 Get_Colours (); 1404 get_colours ();
969 1405
970 if (!set_fonts ()) 1406 if (!set_fonts ())
971 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1407 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
972 1408
973 parent = display->root; 1409 parent = display->root;
… …
1003 } 1439 }
1004#endif 1440#endif
1005 1441
1006 window_calc (0, 0); 1442 window_calc (0, 0);
1007 1443
1008 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1009 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1010 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1011 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1012 1448
1013 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
1016 ext_bwidth, 1452 ext_bwidth,
1017 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
1018 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1019 &attributes); 1455 &attributes);
1020 1456
1021 this->parent[0] = top; 1457 this->parent = top;
1022 1458
1023 old_width = szHint.width; 1459 old_width = szHint.width;
1024 old_height = szHint.height; 1460 old_height = szHint.height;
1025 1461
1026 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1462 set_title (rs [Rs_title]);
1027 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1463 set_icon_name (rs [Rs_iconName]);
1028 1464
1029 classHint.res_name = (char *)rs[Rs_name]; 1465 classHint.res_name = (char *)rs[Rs_name];
1030 classHint.res_class = (char *)RESCLASS; 1466 classHint.res_class = (char *)RESCLASS;
1031 1467
1032 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1468 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1034 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1470 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1035 wmHint.window_group = top; 1471 wmHint.window_group = top;
1036 1472
1037 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1038 &szHint, &wmHint, &classHint); 1474 &szHint, &wmHint, &classHint);
1475#if ENABLE_EWMH
1476 /*
1477 * set up icon hint
1478 * rs [Rs_iconfile] is path to icon
1479 */
1480
1481 if (rs [Rs_iconfile])
1482 {
1483 set_icon (rs [Rs_iconfile]);
1484 }
1485#endif
1039 1486
1040#if ENABLE_FRILLS 1487#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1488 if (mwmhints.flags)
1042 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1489 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1490 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1048#if ENABLE_EWMH 1495#if ENABLE_EWMH
1049 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1050#endif 1497#endif
1051 }; 1498 };
1052 1499
1053 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1054 1501
1055#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1056 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1057 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1058#endif 1505#endif
… …
1077 1524
1078 termwin_ev.start (display, top); 1525 termwin_ev.start (display, top);
1079 1526
1080 /* vt cursor: Black-on-White is standard, but this is more popular */ 1527 /* vt cursor: Black-on-White is standard, but this is more popular */
1081 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1528 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1082
1083#ifdef HAVE_SCROLLBARS
1084 /* cursor scrollBar: Black-on-White */
1085 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1086#endif
1087 1529
1088 /* the vt window */ 1530 /* the vt window */
1089 vt = XCreateSimpleWindow (dpy, top, 1531 vt = XCreateSimpleWindow (dpy, top,
1090 window_vt_x, window_vt_y, 1532 window_vt_x, window_vt_y,
1091 width, height, 1533 width, height,
… …
1116 GCForeground | GCBackground | GCGraphicsExposures, 1558 GCForeground | GCBackground | GCGraphicsExposures,
1117 &gcvalue); 1559 &gcvalue);
1118 1560
1119 drawable = new rxvt_drawable (this, vt); 1561 drawable = new rxvt_drawable (this, vt);
1120 1562
1121#ifdef RXVT_SCROLLBAR
1122 gcvalue.foreground = pix_colors[Color_topShadow];
1123 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1124 gcvalue.foreground = pix_colors[Color_bottomShadow];
1125 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1127 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128#endif
1129
1130#ifdef OFF_FOCUS_FADING 1563#ifdef OFF_FOCUS_FADING
1131 // initially we are in unfocused state 1564 // initially we are in unfocused state
1132 if (rs[Rs_fade]) 1565 if (rs[Rs_fade])
1133 pix_colors = pix_colors_unfocused; 1566 pix_colors = pix_colors_unfocused;
1134#endif 1567#endif
1135 1568
1136 pointer_unblank (); 1569 pointer_unblank ();
1137 scr_recolour (); 1570 scr_recolour ();
1138}
1139
1140/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */
1143void
1144rxvt_get_ttymode (ttymode_t *tio, int erase)
1145{
1146 /*
1147 * standard System V termios interface
1148 */
1149 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1150 {
1151 // return error - use system defaults,
1152 // where possible, and zero elsewhere
1153 memset (tio, 0, sizeof (ttymode_t));
1154
1155 tio->c_cc[VINTR] = CINTR;
1156 tio->c_cc[VQUIT] = CQUIT;
1157 tio->c_cc[VERASE] = CERASE;
1158#ifdef VERASE2
1159 tio->c_cc[VERASE2] = CERASE2;
1160#endif
1161 tio->c_cc[VKILL] = CKILL;
1162 tio->c_cc[VSTART] = CSTART;
1163 tio->c_cc[VSTOP] = CSTOP;
1164 tio->c_cc[VSUSP] = CSUSP;
1165# ifdef VDSUSP
1166 tio->c_cc[VDSUSP] = CDSUSP;
1167# endif
1168# ifdef VREPRINT
1169 tio->c_cc[VREPRINT] = CRPRNT;
1170# endif
1171# ifdef VDISCRD
1172 tio->c_cc[VDISCRD] = CFLUSH;
1173# endif
1174# ifdef VWERSE
1175 tio->c_cc[VWERSE] = CWERASE;
1176# endif
1177# ifdef VLNEXT
1178 tio->c_cc[VLNEXT] = CLNEXT;
1179# endif
1180 }
1181
1182 tio->c_cc[VEOF] = CEOF;
1183 tio->c_cc[VEOL] = VDISABLE;
1184# ifdef VEOL2
1185 tio->c_cc[VEOL2] = VDISABLE;
1186# endif
1187# ifdef VSWTC
1188 tio->c_cc[VSWTC] = VDISABLE;
1189# endif
1190# ifdef VSWTCH
1191 tio->c_cc[VSWTCH] = VDISABLE;
1192# endif
1193# if VMIN != VEOF
1194 tio->c_cc[VMIN] = 1;
1195# endif
1196# if VTIME != VEOL
1197 tio->c_cc[VTIME] = 0;
1198# endif
1199
1200 if (erase != -1)
1201 tio->c_cc[VERASE] = (char)erase;
1202
1203 /* input modes */
1204 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1205# ifdef IMAXBEL
1206 | IMAXBEL
1207# endif
1208 | IXON);
1209
1210 /* output modes */
1211 tio->c_oflag = (OPOST | ONLCR);
1212
1213 /* control modes */
1214 tio->c_cflag = (CS8 | CREAD);
1215
1216 /* line discipline modes */
1217 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1218# if defined (ECHOCTL) && defined (ECHOKE)
1219 | ECHOCTL | ECHOKE
1220# endif
1221 | ECHOE | ECHOK);
1222
1223 /*
1224 * Debugging
1225 */
1226#ifdef DEBUG_TTYMODE
1227 /* c_iflag bits */
1228 fprintf (stderr, "Input flags\n");
1229
1230 /* cpp token stringize doesn't work on all machines <sigh> */
1231# define FOO(flag,name) \
1232 if ((tio->c_iflag) & flag) \
1233 fprintf (stderr, "%s ", name)
1234
1235 /* c_iflag bits */
1236 FOO (IGNBRK, "IGNBRK");
1237 FOO (BRKINT, "BRKINT");
1238 FOO (IGNPAR, "IGNPAR");
1239 FOO (PARMRK, "PARMRK");
1240 FOO (INPCK, "INPCK");
1241 FOO (ISTRIP, "ISTRIP");
1242 FOO (INLCR, "INLCR");
1243 FOO (IGNCR, "IGNCR");
1244 FOO (ICRNL, "ICRNL");
1245 FOO (IXON, "IXON");
1246 FOO (IXOFF, "IXOFF");
1247# ifdef IUCLC
1248 FOO (IUCLC, "IUCLC");
1249# endif
1250# ifdef IXANY
1251 FOO (IXANY, "IXANY");
1252# endif
1253# ifdef IMAXBEL
1254 FOO (IMAXBEL, "IMAXBEL");
1255# endif
1256
1257 fprintf (stderr, "\n");
1258
1259# undef FOO
1260# define FOO(entry, name) \
1261 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1262
1263 FOO (VINTR, "VINTR");
1264 FOO (VQUIT, "VQUIT");
1265 FOO (VERASE, "VERASE");
1266 FOO (VKILL, "VKILL");
1267 FOO (VEOF, "VEOF");
1268 FOO (VEOL, "VEOL");
1269# ifdef VEOL2
1270 FOO (VEOL2, "VEOL2");
1271# endif
1272# ifdef VSWTC
1273 FOO (VSWTC, "VSWTC");
1274# endif
1275# ifdef VSWTCH
1276 FOO (VSWTCH, "VSWTCH");
1277# endif
1278 FOO (VSTART, "VSTART");
1279 FOO (VSTOP, "VSTOP");
1280 FOO (VSUSP, "VSUSP");
1281# ifdef VDSUSP
1282 FOO (VDSUSP, "VDSUSP");
1283# endif
1284# ifdef VREPRINT
1285 FOO (VREPRINT, "VREPRINT");
1286# endif
1287# ifdef VDISCRD
1288 FOO (VDISCRD, "VDISCRD");
1289# endif
1290# ifdef VWERSE
1291 FOO (VWERSE, "VWERSE");
1292# endif
1293# ifdef VLNEXT
1294 FOO (VLNEXT, "VLNEXT");
1295# endif
1296
1297 fprintf (stderr, "\n");
1298# undef FOO
1299#endif /* DEBUG_TTYMODE */
1300} 1571}
1301 1572
1302/*----------------------------------------------------------------------*/ 1573/*----------------------------------------------------------------------*/
1303/* 1574/*
1304 * Run the command in a subprocess and return a file descriptor for the 1575 * Run the command in a subprocess and return a file descriptor for the
… …
1325 else 1596 else
1326#endif 1597#endif
1327 if (!pty->get ()) 1598 if (!pty->get ())
1328 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1329 1600
1330 int er; 1601 struct termios tio = def_tio;
1331 1602
1332#ifndef NO_BACKSPACE_KEY 1603#ifndef NO_BACKSPACE_KEY
1333 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1334 er = rs[Rs_backspace_key][0]; 1605 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1335 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1606 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1336 er = '\177'; /* the initial state anyway */ 1607 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1337 else
1338#endif 1608#endif
1339 er = -1;
1340 1609
1341 rxvt_get_ttymode (&tio, er); 1610 /* init terminal attributes */
1342 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1611 cfsetospeed (&tio, BAUDRATE);
1612 cfsetispeed (&tio, BAUDRATE);
1613 tcsetattr (pty->tty, TCSANOW, &tio);
1343 pty->set_utf8_mode (enc_utf8); 1614 pty->set_utf8_mode (enc_utf8);
1344 1615
1345 /* set initial window size */ 1616 /* set initial window size */
1346 tt_winch (); 1617 tt_winch ();
1347 1618
… …
1430 signal (SIGQUIT, SIG_DFL); 1701 signal (SIGQUIT, SIG_DFL);
1431 signal (SIGCHLD, SIG_DFL); 1702 signal (SIGCHLD, SIG_DFL);
1432 signal (SIGHUP, SIG_DFL); 1703 signal (SIGHUP, SIG_DFL);
1433 signal (SIGPIPE, SIG_DFL); 1704 signal (SIGPIPE, SIG_DFL);
1434 /* 1705 /*
1435 * mimick login's behavior by disabling the job control signals 1706 * mimic login's behavior by disabling the job control signals
1436 * a shell that wants them can turn them back on 1707 * a shell that wants them can turn them back on
1437 */ 1708 */
1438#ifdef SIGTSTP 1709#ifdef SIGTSTP
1439 signal (SIGTSTP, SIG_IGN); 1710 signal (SIGTSTP, SIG_IGN);
1440 signal (SIGTTIN, SIG_IGN); 1711 signal (SIGTTIN, SIG_IGN);
1441 signal (SIGTTOU, SIG_IGN); 1712 signal (SIGTTOU, SIG_IGN);
1442#endif /* SIGTSTP */ 1713#endif /* SIGTSTP */
1443 1714
1444 // unblock signals (signals are blocked by iom.C
1445 sigset_t ss;
1446 sigemptyset (&ss);
1447 sigprocmask (SIG_SETMASK, &ss, 0);
1448
1449 /* command interpreter path */ 1715 /* command interpreter path */
1450 if (argv) 1716 if (argv)
1451 { 1717 {
1452# ifdef DEBUG_CMD 1718# ifdef DEBUG_CMD
1453 int i; 1719 int i;
… …
1464 const char *argv0, *shell; 1730 const char *argv0, *shell;
1465 1731
1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1732 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1467 shell = "/bin/sh"; 1733 shell = "/bin/sh";
1468 1734
1469 argv0 = (const char *)rxvt_basename (shell); 1735 argv0 = rxvt_basename (shell);
1470 1736
1471 if (option (Opt_loginShell)) 1737 if (option (Opt_loginShell))
1472 { 1738 {
1473 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1739 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1474 1740

Diff Legend

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