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.246 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.306 by sf-exg, Tue Dec 6 11:39:30 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 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, r_argc;
339 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
340 574
341 /* 575 /*
342 * Look for -e option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
343 */ 577 */
344 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
… …
348 if (r_argc == argc) 582 if (r_argc == argc)
349 cmd_argv = NULL; 583 cmd_argv = NULL;
350 else if (!argv[r_argc + 1]) 584 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n"); 585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else 586 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]; 587 cmd_argv = (const char **)argv + 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 588
369 rs[Rs_name] = rxvt_basename (argv[0]); 589 rs[Rs_name] = rxvt_basename (argv[0]);
370 590
371 /* 591 /*
372 * Open display, get options/resources and create the window 592 * Open display, get options/resources and create the window
373 */ 593 */
374 594
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 596 rs[Rs_display_name] = ":0";
377 597
378 get_options (r_argc, r_argv); 598 get_options (r_argc, argv);
379 599
380 if (!(display = displays.get (rs[Rs_display_name]))) 600 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]); 601 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 602
386 // using a local pointer decreases code size a lot 603 // using a local pointer decreases code size a lot
387 xa = display->xa; 604 xa = display->xa;
388 605
389 set (display); 606 set (display);
… …
392#if XFT 609#if XFT
393 if (rs[Rs_depth]) 610 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 611 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 612#endif
396 613
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
402 free (r_argv);
403
404 for (int i = NUM_RESOURCES; i--; ) 614 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 615 if (rs [i] == resval_undef)
406 rs [i] = 0; 616 rs [i] = 0;
407 617
408#if ENABLE_PERL 618#if ENABLE_PERL
… …
415 { 625 {
416 rxvt_perl.init (this); 626 rxvt_perl.init (this);
417 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 627 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
418 } 628 }
419#endif 629#endif
630
631 // must be called after initialising the perl interpreter as it
632 // may invoke the `on_register_command' hook
633 extract_keysym_resources ();
420 634
421 /* 635 /*
422 * set any defaults not already set 636 * set any defaults not already set
423 */ 637 */
424 if (cmd_argv && cmd_argv[0]) 638 if (cmd_argv && cmd_argv[0])
425 { 639 {
426 if (!rs[Rs_title]) 640 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 641 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
642
428 if (!rs[Rs_iconName]) 643 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 644 rs[Rs_iconName] = rs[Rs_title];
430 } 645 }
431 else 646 else
432 { 647 {
433 if (!rs[Rs_title]) 648 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 649 rs[Rs_title] = rs[Rs_name];
650
435 if (!rs[Rs_iconName]) 651 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 652 rs[Rs_iconName] = rs[Rs_name];
437 } 653 }
438 654
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 655 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 662 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 663 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 664
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 665 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 666 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
667
668 if (rs[Rs_letterSpace])
669 letterSpace = atoi (rs[Rs_letterSpace]);
451#endif 670#endif
452 671
453#ifdef POINTER_BLANK 672#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 674 pointerBlankDelay = i;
… …
458#endif 677#endif
459 678
460 /* no point having a scrollbar without having any scrollback! */ 679 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 680 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 681 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 682
469 if (!rs[Rs_cutchars]) 683 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 684 rs[Rs_cutchars] = CUTCHARS;
471 685
472#ifndef NO_BACKSPACE_KEY 686#ifndef NO_BACKSPACE_KEY
… …
485# else 699# else
486 rs[Rs_delete_key] = "\033[3~"; 700 rs[Rs_delete_key] = "\033[3~";
487# endif 701# endif
488#endif 702#endif
489 703
490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 704 scrollBar.setup (this);
491 705
492#ifdef XTERM_REVERSE_VIDEO 706#ifdef XTERM_REVERSE_VIDEO
493 /* this is how xterm implements reverseVideo */ 707 /* this is how xterm implements reverseVideo */
494 if (option (Opt_reverseVideo)) 708 if (option (Opt_reverseVideo))
495 { 709 {
… …
533 return cmd_argv; 747 return cmd_argv;
534} 748}
535 749
536/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
537void 751void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 752rxvt_term::init (int argc, const char *const *argv)
539{ 753{
540 this->envv = envv;
541
542 SET_R (this); 754 SET_R (this);
543 set_locale (""); 755 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :( 756 set_environ (envv); // a few things in X do not call setlocale :(
545 757
546 init_vars (); 758 init_vars ();
547
548 init_secondary ();
549 759
550 const char **cmd_argv = init_resources (argc, argv); 760 const char **cmd_argv = init_resources (argc, argv);
551 761
552#ifdef KEYSYM_RESOURCE 762#ifdef KEYSYM_RESOURCE
553 keyboard->register_done (); 763 keyboard->register_done ();
554#endif 764#endif
555 765
766 if (const char *path = rs[Rs_chdir])
767 if (*path) // ignored if empty
768 {
769 if (*path != '/')
770 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
771
772 if (chdir (path))
773 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
774 }
775
556 if (option (Opt_scrollBar)) 776 if (option (Opt_scrollBar))
557 scrollBar.setIdle (); /* set existence for size calculations */ 777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
558 778
559 pty = ptytty::create (); 779 pty = ptytty::create ();
560 780
781#ifdef HAVE_AFTERIMAGE
782 set_application_name ((char *)rs[Rs_name]);
783 set_output_threshold (OUTPUT_LEVEL_WARNING);
784#endif
785
786 // must be called before create_windows, because the latter may call set_icon
787#ifdef HAVE_PIXBUF
788 g_type_init ();
789#endif
790
561 create_windows (argc, argv); 791 create_windows (argc, argv);
562 792
563 init_xlocale (); 793 init_xlocale ();
564 794
565 scr_reset (); // initialize screen 795 scr_poweron (); // initialize screen
566 796
567#if 0 797#if 0
568 XSynchronize (dpy, True); 798 XSynchronize (dpy, True);
569#endif 799#endif
570 800
571 if (option (Opt_scrollBar)) 801 if (option (Opt_scrollBar))
572 resize_scrollbar (); /* create and map scrollbar */ 802 scrollBar.resize (); /* create and map scrollbar */
573#ifdef HAVE_BG_PIXMAP 803#ifdef HAVE_BG_PIXMAP
574 { 804 {
575 bgPixmap.set_target (this); 805 bg_init ();
576 bgPixmap.invalidate ();
577 806
578#ifdef ENABLE_TRANSPARENCY 807#ifdef ENABLE_TRANSPARENCY
579 if (option (Opt_transparent)) 808 if (option (Opt_transparent))
580 { 809 {
581 bgPixmap.set_transparent (); 810 bg_set_transparent ();
582 811
583#ifdef HAVE_AFTERIMAGE
584 if (rs [Rs_blurradius]) 812 if (rs [Rs_blurradius])
585 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 813 bg_set_blur (rs [Rs_blurradius]);
586#endif 814
587 if (ISSET_PIXCOLOR (Color_tint)) 815 if (ISSET_PIXCOLOR (Color_tint))
588 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 816 bg_set_tint (pix_colors_focused [Color_tint]);
589 817
590 if (rs [Rs_shade]) 818 if (rs [Rs_shade])
591 bgPixmap.set_shade (rs [Rs_shade]); 819 bg_set_shade (rs [Rs_shade]);
592 820
593 bgPixmap.set_root_pixmap (); 821 bg_set_root_pixmap ();
594 XSelectInput (dpy, display->root, PropertyChangeMask); 822 XSelectInput (dpy, display->root, PropertyChangeMask);
595 rootwin_ev.start (display, display->root); 823 rootwin_ev.start (display, display->root);
596 } 824 }
597#endif 825#endif
598 826
599#ifdef BG_IMAGE_FROM_FILE 827#ifdef BG_IMAGE_FROM_FILE
600 if (rs[Rs_backgroundPixmap]) 828 if (rs[Rs_backgroundPixmap])
601 { 829 {
602 const char *p = rs[Rs_backgroundPixmap];
603
604 if ((p = strchr (p, ';')) != 0)
605 {
606 p++;
607 bgPixmap.set_geometry (p);
608 }
609 else
610 bgPixmap.set_defaultGeometry ();
611
612 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 830 if (bg_set_file (rs[Rs_backgroundPixmap]))
613 if (!bgPixmap.window_position_sensitive ()) 831 if (!bg_window_position_sensitive ())
614 update_background (); 832 update_background ();
615 } 833 }
616#endif 834#endif
617 } 835 }
618#endif 836#endif
… …
623 841
624 set_colorfgbg (); 842 set_colorfgbg ();
625 843
626 init_command (cmd_argv); 844 init_command (cmd_argv);
627 845
628 free (cmd_argv);
629
630 if (pty->pty >= 0) 846 if (pty->pty >= 0)
631 pty_ev.start (pty->pty, ev::READ); 847 pty_ev.start (pty->pty, ev::READ);
632 848
633 HOOK_INVOKE ((this, HOOK_START, DT_END)); 849 HOOK_INVOKE ((this, HOOK_START, DT_END));
634 850
635#if ENABLE_XEMBED 851#if ENABLE_XEMBED
636 if (rs[Rs_embed]) 852 if (rs[Rs_embed])
637 { 853 {
638 long info[2] = { 0, XEMBED_MAPPED }; 854 long info[2] = { 0, XEMBED_MAPPED };
639 855
640 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 856 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
641 32, PropModeReplace, (unsigned char *)&info, 2); 857 32, PropModeReplace, (unsigned char *)&info, 2);
642 } 858 }
643#endif 859#endif
644 860
861#if HAVE_STARTUP_NOTIFICATION
862 SnDisplay *snDisplay;
863 SnLauncheeContext *snContext;
864
865 snDisplay = sn_display_new (dpy, NULL, NULL);
866 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
867
868 /* Tell the window manager that this window is part of the startup context */
869 if (snContext)
870 sn_launchee_context_setup_window (snContext, parent);
871#endif
872
645 XMapWindow (dpy, vt); 873 XMapWindow (dpy, vt);
646 XMapWindow (dpy, parent[0]); 874 XMapWindow (dpy, parent);
875
876#if HAVE_STARTUP_NOTIFICATION
877 if (snContext)
878 {
879 /* Mark the startup process as complete */
880 sn_launchee_context_complete (snContext);
881
882 sn_launchee_context_unref (snContext);
883 }
884
885 sn_display_unref (snDisplay);
886#endif
647 887
648 refresh_check (); 888 refresh_check ();
649} 889}
650 890
651/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
652void 892void
653rxvt_term::init_env () 893rxvt_term::init_env ()
654{ 894{
655 int i;
656 char *val; 895 char *val;
657 896
658#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
659 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
660 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
674 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
675 914
676 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
677 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
678 917
679 i = strlen (val);
680 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
681 919
682 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
683 921
684 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
685 923
686 /* add entries to the environment: 924 /* add entries to the environment:
687 * @ DISPLAY: in case we started with -display 925 * @ DISPLAY: in case we started with -display
688 * @ WINDOWID: X window id number of the window 926 * @ WINDOWID: X window id number of the window
689 * @ COLORTERM: terminal sub-name and also indicates its color 927 * @ COLORTERM: terminal sub-name and also indicates its color
… …
832 run_command (argv); 1070 run_command (argv);
833} 1071}
834 1072
835/*----------------------------------------------------------------------*/ 1073/*----------------------------------------------------------------------*/
836void 1074void
837rxvt_term::Get_Colours () 1075rxvt_term::get_colours ()
838{ 1076{
839 int i; 1077 int i;
840 1078
841#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
842 pix_colors = pix_colors_focused; 1080 pix_colors = pix_colors_focused;
… …
1042 1280
1043 if (i) 1281 if (i)
1044 ModMetaMask = modmasks[i - 1]; 1282 ModMetaMask = modmasks[i - 1];
1045} 1283}
1046 1284
1285void
1286rxvt_term::set_icon (const char *file)
1287{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf)
1342 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return;
1345 }
1346
1347 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1348 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1349
1350 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1351 {
1352 rxvt_warn ("Icon image too big, continuing without.\n");
1353 g_object_unref (pixbuf);
1354 return;
1355 }
1356
1357 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1358 {
1359 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1360 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1361 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1362
1363 buffer [0] = w;
1364 buffer [1] = h;
1365 for (int i = 0; i < h; i++)
1366 {
1367 for (int j = 0; j < w; j++)
1368 {
1369 unsigned char *pixel = row + j * channels;
1370 long value;
1371
1372 if (channels == 4)
1373 value = pixel[3];
1374 else
1375 value = (unsigned char)0x00ff;
1376
1377 value = (value << 8) + pixel[0];
1378 value = (value << 8) + pixel[1];
1379 value = (value << 8) + pixel[2];
1380 buffer[(i * w + j) + 2] = value;
1381 }
1382
1383 row += rowstride;
1384 }
1385
1386 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer);
1389 }
1390 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1392
1393 g_object_unref (pixbuf);
1394#endif
1395}
1396
1047/*----------------------------------------------------------------------*/ 1397/*----------------------------------------------------------------------*/
1048/* rxvt_Create_Windows () - Open and map the window */ 1398/* Open and map the window */
1049void 1399void
1050rxvt_term::create_windows (int argc, const char *const *argv) 1400rxvt_term::create_windows (int argc, const char *const *argv)
1051{ 1401{
1052 XClassHint classHint; 1402 XClassHint classHint;
1053 XWMHints wmHint; 1403 XWMHints wmHint;
… …
1059 Window top, parent; 1409 Window top, parent;
1060 1410
1061 dLocal (Display *, dpy); 1411 dLocal (Display *, dpy);
1062 1412
1063 /* grab colors before netscape does */ 1413 /* grab colors before netscape does */
1064 Get_Colours (); 1414 get_colours ();
1065 1415
1066 if (!set_fonts ()) 1416 if (!set_fonts ())
1067 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1417 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1068 1418
1069 parent = display->root; 1419 parent = display->root;
… …
1099 } 1449 }
1100#endif 1450#endif
1101 1451
1102 window_calc (0, 0); 1452 window_calc (0, 0);
1103 1453
1104 /* sub-window placement & size in rxvt_resize_subwindows () */ 1454 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1105 attributes.background_pixel = pix_colors_focused [Color_border]; 1455 attributes.background_pixel = pix_colors_focused [Color_border];
1106 attributes.border_pixel = pix_colors_focused [Color_border]; 1456 attributes.border_pixel = pix_colors_focused [Color_border];
1107 attributes.colormap = cmap; 1457 attributes.colormap = cmap;
1108 1458
1109 top = XCreateWindow (dpy, parent, 1459 top = XCreateWindow (dpy, parent,
… …
1112 ext_bwidth, 1462 ext_bwidth,
1113 depth, InputOutput, visual, 1463 depth, InputOutput, visual,
1114 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1115 &attributes); 1465 &attributes);
1116 1466
1117 this->parent[0] = top; 1467 this->parent = top;
1118 1468
1119 old_width = szHint.width; 1469 old_width = szHint.width;
1120 old_height = szHint.height; 1470 old_height = szHint.height;
1121 1471
1122 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1472 set_title (rs [Rs_title]);
1123 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1473 set_icon_name (rs [Rs_iconName]);
1124 1474
1125 classHint.res_name = (char *)rs[Rs_name]; 1475 classHint.res_name = (char *)rs[Rs_name];
1126 classHint.res_class = (char *)RESCLASS; 1476 classHint.res_class = (char *)RESCLASS;
1127 1477
1128 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1478 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1130 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1131 wmHint.window_group = top; 1481 wmHint.window_group = top;
1132 1482
1133 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1134 &szHint, &wmHint, &classHint); 1484 &szHint, &wmHint, &classHint);
1485#if ENABLE_EWMH
1486 /*
1487 * set up icon hint
1488 * rs [Rs_iconfile] is path to icon
1489 */
1490
1491 if (rs [Rs_iconfile])
1492 {
1493 set_icon (rs [Rs_iconfile]);
1494 }
1495#endif
1135 1496
1136#if ENABLE_FRILLS 1497#if ENABLE_FRILLS
1137 if (mwmhints.flags) 1498 if (mwmhints.flags)
1138 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1499 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1139 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1500 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1144#if ENABLE_EWMH 1505#if ENABLE_EWMH
1145 xa[XA_NET_WM_PING], 1506 xa[XA_NET_WM_PING],
1146#endif 1507#endif
1147 }; 1508 };
1148 1509
1149 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1510 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1150 1511
1151#if ENABLE_FRILLS 1512#if ENABLE_FRILLS
1152 if (rs[Rs_transient_for]) 1513 if (rs[Rs_transient_for])
1153 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1154#endif 1515#endif
… …
1215 pix_colors = pix_colors_unfocused; 1576 pix_colors = pix_colors_unfocused;
1216#endif 1577#endif
1217 1578
1218 pointer_unblank (); 1579 pointer_unblank ();
1219 scr_recolour (); 1580 scr_recolour ();
1220}
1221
1222/* ------------------------------------------------------------------------- *
1223 * GET TTY CURRENT STATE *
1224 * ------------------------------------------------------------------------- */
1225void
1226rxvt_get_ttymode (struct termios *tio, int erase)
1227{
1228 /*
1229 * standard System V termios interface
1230 */
1231 if (tcgetattr (STDIN_FILENO, tio) < 0)
1232 {
1233 // return error - use system defaults,
1234 // where possible, and zero elsewhere
1235 memset (tio, 0, sizeof (struct termios));
1236
1237 tio->c_cc[VINTR] = CINTR;
1238 tio->c_cc[VQUIT] = CQUIT;
1239 tio->c_cc[VERASE] = CERASE;
1240#ifdef VERASE2
1241 tio->c_cc[VERASE2] = CERASE2;
1242#endif
1243 tio->c_cc[VKILL] = CKILL;
1244 tio->c_cc[VSTART] = CSTART;
1245 tio->c_cc[VSTOP] = CSTOP;
1246 tio->c_cc[VSUSP] = CSUSP;
1247# ifdef VDSUSP
1248 tio->c_cc[VDSUSP] = CDSUSP;
1249# endif
1250# ifdef VREPRINT
1251 tio->c_cc[VREPRINT] = CRPRNT;
1252# endif
1253# ifdef VDISCRD
1254 tio->c_cc[VDISCRD] = CFLUSH;
1255# endif
1256# ifdef VWERSE
1257 tio->c_cc[VWERSE] = CWERASE;
1258# endif
1259# ifdef VLNEXT
1260 tio->c_cc[VLNEXT] = CLNEXT;
1261# endif
1262 }
1263
1264 tio->c_cc[VEOF] = CEOF;
1265 tio->c_cc[VEOL] = VDISABLE;
1266# ifdef VEOL2
1267 tio->c_cc[VEOL2] = VDISABLE;
1268# endif
1269# ifdef VSWTC
1270 tio->c_cc[VSWTC] = VDISABLE;
1271# endif
1272# ifdef VSWTCH
1273 tio->c_cc[VSWTCH] = VDISABLE;
1274# endif
1275# if VMIN != VEOF
1276 tio->c_cc[VMIN] = 1;
1277# endif
1278# if VTIME != VEOL
1279 tio->c_cc[VTIME] = 0;
1280# endif
1281
1282 if (erase != -1)
1283 tio->c_cc[VERASE] = (char)erase;
1284
1285 /* input modes */
1286 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1287# ifdef IMAXBEL
1288 | IMAXBEL
1289# endif
1290 | IXON);
1291
1292 /* output modes */
1293 tio->c_oflag = (OPOST | ONLCR);
1294
1295 /* control modes */
1296 tio->c_cflag = (CS8 | CREAD);
1297
1298 /* line discipline modes */
1299 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1300# if defined (ECHOCTL) && defined (ECHOKE)
1301 | ECHOCTL | ECHOKE
1302# endif
1303 | ECHOE | ECHOK);
1304
1305 /*
1306 * Debugging
1307 */
1308#ifdef DEBUG_TTYMODE
1309 /* c_iflag bits */
1310 fprintf (stderr, "Input flags\n");
1311
1312 /* cpp token stringize doesn't work on all machines <sigh> */
1313# define FOO(flag,name) \
1314 if ((tio->c_iflag) & flag) \
1315 fprintf (stderr, "%s ", name)
1316
1317 /* c_iflag bits */
1318 FOO (IGNBRK, "IGNBRK");
1319 FOO (BRKINT, "BRKINT");
1320 FOO (IGNPAR, "IGNPAR");
1321 FOO (PARMRK, "PARMRK");
1322 FOO (INPCK, "INPCK");
1323 FOO (ISTRIP, "ISTRIP");
1324 FOO (INLCR, "INLCR");
1325 FOO (IGNCR, "IGNCR");
1326 FOO (ICRNL, "ICRNL");
1327 FOO (IXON, "IXON");
1328 FOO (IXOFF, "IXOFF");
1329# ifdef IUCLC
1330 FOO (IUCLC, "IUCLC");
1331# endif
1332# ifdef IXANY
1333 FOO (IXANY, "IXANY");
1334# endif
1335# ifdef IMAXBEL
1336 FOO (IMAXBEL, "IMAXBEL");
1337# endif
1338
1339 fprintf (stderr, "\n");
1340
1341# undef FOO
1342# define FOO(entry, name) \
1343 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1344
1345 FOO (VINTR, "VINTR");
1346 FOO (VQUIT, "VQUIT");
1347 FOO (VERASE, "VERASE");
1348 FOO (VKILL, "VKILL");
1349 FOO (VEOF, "VEOF");
1350 FOO (VEOL, "VEOL");
1351# ifdef VEOL2
1352 FOO (VEOL2, "VEOL2");
1353# endif
1354# ifdef VSWTC
1355 FOO (VSWTC, "VSWTC");
1356# endif
1357# ifdef VSWTCH
1358 FOO (VSWTCH, "VSWTCH");
1359# endif
1360 FOO (VSTART, "VSTART");
1361 FOO (VSTOP, "VSTOP");
1362 FOO (VSUSP, "VSUSP");
1363# ifdef VDSUSP
1364 FOO (VDSUSP, "VDSUSP");
1365# endif
1366# ifdef VREPRINT
1367 FOO (VREPRINT, "VREPRINT");
1368# endif
1369# ifdef VDISCRD
1370 FOO (VDISCRD, "VDISCRD");
1371# endif
1372# ifdef VWERSE
1373 FOO (VWERSE, "VWERSE");
1374# endif
1375# ifdef VLNEXT
1376 FOO (VLNEXT, "VLNEXT");
1377# endif
1378
1379 fprintf (stderr, "\n");
1380# undef FOO
1381#endif /* DEBUG_TTYMODE */
1382} 1581}
1383 1582
1384/*----------------------------------------------------------------------*/ 1583/*----------------------------------------------------------------------*/
1385/* 1584/*
1386 * Run the command in a subprocess and return a file descriptor for the 1585 * Run the command in a subprocess and return a file descriptor for the
… …
1407 else 1606 else
1408#endif 1607#endif
1409 if (!pty->get ()) 1608 if (!pty->get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411 1610
1412 int er; 1611 struct termios tio = def_tio;
1413 1612
1414#ifndef NO_BACKSPACE_KEY 1613#ifndef NO_BACKSPACE_KEY
1415 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1416 er = rs[Rs_backspace_key][0]; 1615 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1417 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1616 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1418 er = '\177'; /* the initial state anyway */ 1617 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1419 else
1420#endif 1618#endif
1421 er = -1;
1422 1619
1423 rxvt_get_ttymode (&tio, er);
1424 /* init terminal attributes */ 1620 /* init terminal attributes */
1425 cfsetospeed (&tio, BAUDRATE); 1621 cfsetospeed (&tio, BAUDRATE);
1426 cfsetispeed (&tio, BAUDRATE); 1622 cfsetispeed (&tio, BAUDRATE);
1427 tcsetattr (pty->tty, TCSANOW, &tio); 1623 tcsetattr (pty->tty, TCSANOW, &tio);
1428 pty->set_utf8_mode (enc_utf8); 1624 pty->set_utf8_mode (enc_utf8);
… …
1515 signal (SIGQUIT, SIG_DFL); 1711 signal (SIGQUIT, SIG_DFL);
1516 signal (SIGCHLD, SIG_DFL); 1712 signal (SIGCHLD, SIG_DFL);
1517 signal (SIGHUP, SIG_DFL); 1713 signal (SIGHUP, SIG_DFL);
1518 signal (SIGPIPE, SIG_DFL); 1714 signal (SIGPIPE, SIG_DFL);
1519 /* 1715 /*
1520 * mimick login's behavior by disabling the job control signals 1716 * mimic login's behavior by disabling the job control signals
1521 * a shell that wants them can turn them back on 1717 * a shell that wants them can turn them back on
1522 */ 1718 */
1523#ifdef SIGTSTP 1719#ifdef SIGTSTP
1524 signal (SIGTSTP, SIG_IGN); 1720 signal (SIGTSTP, SIG_IGN);
1525 signal (SIGTTIN, SIG_IGN); 1721 signal (SIGTTIN, SIG_IGN);
1526 signal (SIGTTOU, SIG_IGN); 1722 signal (SIGTTOU, SIG_IGN);
1527#endif /* SIGTSTP */ 1723#endif /* SIGTSTP */
1528 1724
1529 // unblock signals (signals are blocked by iom.C
1530 sigset_t ss;
1531 sigemptyset (&ss);
1532 sigprocmask (SIG_SETMASK, &ss, 0);
1533
1534 /* command interpreter path */ 1725 /* command interpreter path */
1535 if (argv) 1726 if (argv)
1536 { 1727 {
1537# ifdef DEBUG_CMD 1728# ifdef DEBUG_CMD
1538 int i; 1729 int i;
… …
1549 const char *argv0, *shell; 1740 const char *argv0, *shell;
1550 1741
1551 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1742 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1552 shell = "/bin/sh"; 1743 shell = "/bin/sh";
1553 1744
1554 argv0 = (const char *)rxvt_basename (shell); 1745 argv0 = rxvt_basename (shell);
1555 1746
1556 if (option (Opt_loginShell)) 1747 if (option (Opt_loginShell))
1557 { 1748 {
1558 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1749 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1559 1750

Diff Legend

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