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.238 by ayin, Fri Jan 4 17:57:28 2008 UTC vs.
Revision 1.305 by sf-exg, Tue Dec 6 11:29:52 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
… …
52# endif 53# endif
53#endif 54#endif
54 55
55#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
57#endif 63#endif
58 64
59#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h> 67#include <sys/types.h>
… …
142 148
143 return rval; 149 return rval;
144} 150}
145#endif 151#endif
146 152
147const char *const def_colorName[] = 153static const char *const def_colorName[] =
148 { 154 {
149 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
150 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
151 /* low-intensity colors */ 157 /* low-intensity colors */
152 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 183
184#if !USE_256_COLORS
178 // 88 xterm colours 185 // 88 xterm colours
179 "rgb:00/00/00", 186 "rgb:00/00/00",
180 "rgb:00/00/8b", 187 "rgb:00/00/8b",
181 "rgb:00/00/cd", 188 "rgb:00/00/cd",
182 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
250 "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
251 501
252#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
… …
265#if ENABLE_FRILLS 515#if ENABLE_FRILLS
266 NULL, // Color_underline 516 NULL, // Color_underline
267#endif 517#endif
268#ifdef OPTION_HC 518#ifdef OPTION_HC
269 NULL, 519 NULL,
520 NULL,
270#endif 521#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 525#endif
275#if ENABLE_TRANSPARENCY 526#if ENABLE_TRANSPARENCY
276 NULL, 527 NULL,
277#endif 528#endif
278#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 530 "rgb:00/00/00",
… …
292 ncol = 80; 543 ncol = 80;
293 nrow = 24; 544 nrow = 24;
294 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
295 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
296 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
297 saveLines = SAVELINES; 549 saveLines = SAVELINES;
298 550
299 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
300 552
301 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
… …
306 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
307 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
308 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
309 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
310 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
311 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
312} 565 set_option (Opt_buffered);
313
314void
315rxvt_term::init_secondary ()
316{
317 int i;
318
319 /*
320 * Close all unused file descriptors
321 * We don't want them, we don't need them.
322 */
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 /* TODO: BOO HISS */
326 dup2 (STDERR_FILENO, STDIN_FILENO);
327 }
328 else if (i != STDIN_FILENO)
329 {
330 dup2 (i, STDIN_FILENO);
331 close (i);
332 }
333
334 dup2 (STDERR_FILENO, STDOUT_FILENO);
335
336#if 0 // schmorp sayz closing filies is murder
337 for (i = STDERR_FILENO + 1; i < num_fds; i++)
338 {
339#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
340 if (i == 4 || i == 7)
341 continue;
342#endif
343 close (i);
344 }
345#endif
346} 566}
347 567
348/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
349const char ** 569const char **
350rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
351{ 571{
352 int i, r_argc; 572 int i, r_argc;
353 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
354 574
355 /* 575 /*
356 * 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
357 */ 577 */
358 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
… …
371 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
372 592
373 cmd_argv[i] = NULL; 593 cmd_argv[i] = NULL;
374 } 594 }
375 595
376 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
377
378 for (i = 0; i < r_argc; i++)
379 r_argv[i] = (const char *)argv[i];
380
381 r_argv[i] = NULL;
382
383 rs[Rs_name] = rxvt_basename (argv[0]); 596 rs[Rs_name] = rxvt_basename (argv[0]);
384 597
385 /* 598 /*
386 * Open display, get options/resources and create the window 599 * Open display, get options/resources and create the window
387 */ 600 */
388 601
389 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
390 rs[Rs_display_name] = ":0"; 603 rs[Rs_display_name] = ":0";
391 604
392 get_options (r_argc, r_argv); 605 get_options (r_argc, argv);
393 606
394 if (!(display = displays.get (rs[Rs_display_name]))) 607 if (!(display = displays.get (rs[Rs_display_name])))
395 {
396 free (r_argv);
397 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
398 }
399 609
400 // using a local pointer decreases code size a lot 610 // using a local pointer decreases code size a lot
401 xa = display->xa; 611 xa = display->xa;
402 612
403 set (display); 613 set (display);
… …
406#if XFT 616#if XFT
407 if (rs[Rs_depth]) 617 if (rs[Rs_depth])
408 select_visual (strtol (rs[Rs_depth], 0, 0)); 618 select_visual (strtol (rs[Rs_depth], 0, 0));
409#endif 619#endif
410 620
411#ifdef HAVE_AFTERIMAGE
412 set_application_name ((char*)rs[Rs_name]);
413 set_output_threshold (OUTPUT_LEVEL_WARNING);
414 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
415#endif
416 free (r_argv);
417
418 for (int i = NUM_RESOURCES; i--; ) 621 for (int i = NUM_RESOURCES; i--; )
419 if (rs [i] == resval_undef) 622 if (rs [i] == resval_undef)
420 rs [i] = 0; 623 rs [i] = 0;
421 624
422#if ENABLE_PERL 625#if ENABLE_PERL
… …
429 { 632 {
430 rxvt_perl.init (this); 633 rxvt_perl.init (this);
431 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 634 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
432 } 635 }
433#endif 636#endif
637
638 // must be called after initialising the perl interpreter as it
639 // may invoke the `on_register_command' hook
640 extract_keysym_resources ();
434 641
435 /* 642 /*
436 * set any defaults not already set 643 * set any defaults not already set
437 */ 644 */
438 if (cmd_argv && cmd_argv[0]) 645 if (cmd_argv && cmd_argv[0])
439 { 646 {
440 if (!rs[Rs_title]) 647 if (!rs[Rs_title])
441 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 648 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
649
442 if (!rs[Rs_iconName]) 650 if (!rs[Rs_iconName])
443 rs[Rs_iconName] = rs[Rs_title]; 651 rs[Rs_iconName] = rs[Rs_title];
444 } 652 }
445 else 653 else
446 { 654 {
447 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
448 rs[Rs_title] = rs[Rs_name]; 656 rs[Rs_title] = rs[Rs_name];
657
449 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_name]; 659 rs[Rs_iconName] = rs[Rs_name];
451 } 660 }
452 661
453 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 662 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
460 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 669 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
461 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 670 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
462 671
463 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 672 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
464 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 673 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
674
675 if (rs[Rs_letterSpace])
676 letterSpace = atoi (rs[Rs_letterSpace]);
465#endif 677#endif
466 678
467#ifdef POINTER_BLANK 679#ifdef POINTER_BLANK
468 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
469 pointerBlankDelay = i; 681 pointerBlankDelay = i;
… …
472#endif 684#endif
473 685
474 /* no point having a scrollbar without having any scrollback! */ 686 /* no point having a scrollbar without having any scrollback! */
475 if (!saveLines) 687 if (!saveLines)
476 set_option (Opt_scrollBar, 0); 688 set_option (Opt_scrollBar, 0);
477
478#ifdef PRINTPIPE
479 if (!rs[Rs_print_pipe])
480 rs[Rs_print_pipe] = PRINTPIPE;
481#endif
482 689
483 if (!rs[Rs_cutchars]) 690 if (!rs[Rs_cutchars])
484 rs[Rs_cutchars] = CUTCHARS; 691 rs[Rs_cutchars] = CUTCHARS;
485 692
486#ifndef NO_BACKSPACE_KEY 693#ifndef NO_BACKSPACE_KEY
… …
499# else 706# else
500 rs[Rs_delete_key] = "\033[3~"; 707 rs[Rs_delete_key] = "\033[3~";
501# endif 708# endif
502#endif 709#endif
503 710
504#ifdef HAVE_SCROLLBARS 711 scrollBar.setup (this);
505 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
506#endif
507 712
508#ifdef XTERM_REVERSE_VIDEO 713#ifdef XTERM_REVERSE_VIDEO
509 /* this is how xterm implements reverseVideo */ 714 /* this is how xterm implements reverseVideo */
510 if (option (Opt_reverseVideo)) 715 if (option (Opt_reverseVideo))
511 { 716 {
… …
549 return cmd_argv; 754 return cmd_argv;
550} 755}
551 756
552/*----------------------------------------------------------------------*/ 757/*----------------------------------------------------------------------*/
553void 758void
759rxvt_term::init (int argc, const char *const *argv)
760{
761 SET_R (this);
762 set_locale ("");
763 set_environ (envv); // a few things in X do not call setlocale :(
764
765 init_vars ();
766
767 const char **cmd_argv = init_resources (argc, argv);
768
769#ifdef KEYSYM_RESOURCE
770 keyboard->register_done ();
771#endif
772
773 if (const char *path = rs[Rs_chdir])
774 if (*path) // ignored if empty
775 {
776 if (*path != '/')
777 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
778
779 if (chdir (path))
780 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
781 }
782
783 if (option (Opt_scrollBar))
784 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
785
786 pty = ptytty::create ();
787
788#ifdef HAVE_AFTERIMAGE
789 set_application_name ((char *)rs[Rs_name]);
790 set_output_threshold (OUTPUT_LEVEL_WARNING);
791#endif
792
793 // must be called before create_windows, because the latter may call set_icon
794#ifdef HAVE_PIXBUF
795 g_type_init ();
796#endif
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bg_init ();
813
814#ifdef ENABLE_TRANSPARENCY
815 if (option (Opt_transparent))
816 {
817 bg_set_transparent ();
818
819 if (rs [Rs_blurradius])
820 bg_set_blur (rs [Rs_blurradius]);
821
822 if (ISSET_PIXCOLOR (Color_tint))
823 bg_set_tint (pix_colors_focused [Color_tint]);
824
825 if (rs [Rs_shade])
826 bg_set_shade (rs [Rs_shade]);
827
828 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root);
831 }
832#endif
833
834#ifdef BG_IMAGE_FROM_FILE
835 if (rs[Rs_backgroundPixmap])
836 {
837 if (bg_set_file (rs[Rs_backgroundPixmap]))
838 if (!bg_window_position_sensitive ())
839 update_background ();
840 }
841#endif
842 }
843#endif
844
845#if ENABLE_PERL
846 rootwin_ev.start (display, display->root);
847#endif
848
849 set_colorfgbg ();
850
851 init_command (cmd_argv);
852
853 free (cmd_argv);
854
855 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ);
857
858 HOOK_INVOKE ((this, HOOK_START, DT_END));
859
860#if ENABLE_XEMBED
861 if (rs[Rs_embed])
862 {
863 long info[2] = { 0, XEMBED_MAPPED };
864
865 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
866 32, PropModeReplace, (unsigned char *)&info, 2);
867 }
868#endif
869
870#if HAVE_STARTUP_NOTIFICATION
871 SnDisplay *snDisplay;
872 SnLauncheeContext *snContext;
873
874 snDisplay = sn_display_new (dpy, NULL, NULL);
875 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
876
877 /* Tell the window manager that this window is part of the startup context */
878 if (snContext)
879 sn_launchee_context_setup_window (snContext, parent);
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent);
884
885#if HAVE_STARTUP_NOTIFICATION
886 if (snContext)
887 {
888 /* Mark the startup process as complete */
889 sn_launchee_context_complete (snContext);
890
891 sn_launchee_context_unref (snContext);
892 }
893
894 sn_display_unref (snDisplay);
895#endif
896
897 refresh_check ();
898}
899
900/*----------------------------------------------------------------------*/
901void
554rxvt_term::init_env () 902rxvt_term::init_env ()
555{ 903{
556 int i;
557 char *val; 904 char *val;
558 905
559#ifdef DISPLAY_IS_IP 906#ifdef DISPLAY_IS_IP
560 /* Fixup display_name for export over pty to any interested terminal 907 /* Fixup display_name for export over pty to any interested terminal
561 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 908 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
575 val = XDisplayString (dpy); 922 val = XDisplayString (dpy);
576 923
577 if (rs[Rs_display_name] == NULL) 924 if (rs[Rs_display_name] == NULL)
578 rs[Rs_display_name] = val; /* use broken `:0' value */ 925 rs[Rs_display_name] = val; /* use broken `:0' value */
579 926
580 i = strlen (val);
581 env_display = (char *)rxvt_malloc (i + 9); 927 env_display = (char *)rxvt_malloc (strlen (val) + 9);
582 928
583 sprintf (env_display, "DISPLAY=%s", val); 929 sprintf (env_display, "DISPLAY=%s", val);
584 930
585 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 931 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
586 932
587 /* add entries to the environment: 933 /* add entries to the environment:
588 * @ DISPLAY: in case we started with -display 934 * @ DISPLAY: in case we started with -display
589 * @ WINDOWID: X window id number of the window 935 * @ WINDOWID: X window id number of the window
590 * @ COLORTERM: terminal sub-name and also indicates its color 936 * @ COLORTERM: terminal sub-name and also indicates its color
… …
733 run_command (argv); 1079 run_command (argv);
734} 1080}
735 1081
736/*----------------------------------------------------------------------*/ 1082/*----------------------------------------------------------------------*/
737void 1083void
738rxvt_term::Get_Colours () 1084rxvt_term::get_colours ()
739{ 1085{
740 int i; 1086 int i;
741 1087
742#ifdef OFF_FOCUS_FADING 1088#ifdef OFF_FOCUS_FADING
743 pix_colors = pix_colors_focused; 1089 pix_colors = pix_colors_focused;
… …
803 * get scrollBar shadow colors 1149 * get scrollBar shadow colors
804 * 1150 *
805 * The calculations of topShadow/bottomShadow values are adapted 1151 * The calculations of topShadow/bottomShadow values are adapted
806 * from the fvwm window manager. 1152 * from the fvwm window manager.
807 */ 1153 */
808#ifdef KEEP_SCROLLCOLOR 1154#ifdef RXVT_SCROLLBAR
809 if (depth <= 2) 1155 if (depth <= 2)
810 { 1156 {
811 /* Monochrome */ 1157 /* Monochrome */
812 alias_color (Color_scroll, Color_fg); 1158 alias_color (Color_scroll, Color_fg);
813 alias_color (Color_topShadow, Color_bg); 1159 alias_color (Color_topShadow, Color_bg);
… …
828 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1174 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
829 cscroll.a) 1175 cscroll.a)
830 )) 1176 ))
831 alias_color (Color_topShadow, Color_White); 1177 alias_color (Color_topShadow, Color_White);
832 } 1178 }
833#endif /* KEEP_SCROLLCOLOR */ 1179#endif
834 1180
835#ifdef OFF_FOCUS_FADING 1181#ifdef OFF_FOCUS_FADING
836 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1182 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
837 update_fade_color (i); 1183 update_fade_color (i);
838#endif 1184#endif
… …
943 1289
944 if (i) 1290 if (i)
945 ModMetaMask = modmasks[i - 1]; 1291 ModMetaMask = modmasks[i - 1];
946} 1292}
947 1293
1294void
1295rxvt_term::set_icon (const char *file)
1296{
1297#ifdef HAVE_AFTERIMAGE
1298 init_asv ();
1299
1300 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1301 if (!im)
1302 {
1303 rxvt_warn ("Loading image icon failed, continuing without.\n");
1304 return;
1305 }
1306
1307 unsigned int w = im->width;
1308 unsigned int h = im->height;
1309
1310 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1311 {
1312 rxvt_warn ("Icon image too big, continuing without.\n");
1313 destroy_asimage (&im);
1314 return;
1315 }
1316
1317 ASImage *result = scale_asimage (asv, im,
1318 w, h, ASA_ARGB32,
1319 100, ASIMAGE_QUALITY_DEFAULT);
1320 destroy_asimage (&im);
1321
1322 if (!result)
1323 {
1324 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1325 return;
1326 }
1327
1328 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1329 if (buffer)
1330 {
1331 ARGB32 *asbuf = result->alt.argb32;
1332 buffer [0] = w;
1333 buffer [1] = h;
1334
1335 for (unsigned int i = 0; i < w * h; ++i)
1336 buffer [i + 2] = asbuf [i];
1337
1338 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1339 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1340 free (buffer);
1341 }
1342 else
1343 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1344
1345 destroy_asimage (&result);
1346#endif
1347
1348#ifdef HAVE_PIXBUF
1349 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1350 if (!pixbuf)
1351 {
1352 rxvt_warn ("Loading image icon failed, continuing without.\n");
1353 return;
1354 }
1355
1356 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1357 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1358
1359 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1360 {
1361 rxvt_warn ("Icon image too big, continuing without.\n");
1362 g_object_unref (pixbuf);
1363 return;
1364 }
1365
1366 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1367 {
1368 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1369 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1370 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1371
1372 buffer [0] = w;
1373 buffer [1] = h;
1374 for (int i = 0; i < h; i++)
1375 {
1376 for (int j = 0; j < w; j++)
1377 {
1378 unsigned char *pixel = row + j * channels;
1379 long value;
1380
1381 if (channels == 4)
1382 value = pixel[3];
1383 else
1384 value = (unsigned char)0x00ff;
1385
1386 value = (value << 8) + pixel[0];
1387 value = (value << 8) + pixel[1];
1388 value = (value << 8) + pixel[2];
1389 buffer[(i * w + j) + 2] = value;
1390 }
1391
1392 row += rowstride;
1393 }
1394
1395 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1396 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1397 free (buffer);
1398 }
1399 else
1400 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1401
1402 g_object_unref (pixbuf);
1403#endif
1404}
1405
948/*----------------------------------------------------------------------*/ 1406/*----------------------------------------------------------------------*/
949/* rxvt_Create_Windows () - Open and map the window */ 1407/* Open and map the window */
950void 1408void
951rxvt_term::create_windows (int argc, const char *const *argv) 1409rxvt_term::create_windows (int argc, const char *const *argv)
952{ 1410{
953 XClassHint classHint; 1411 XClassHint classHint;
954 XWMHints wmHint; 1412 XWMHints wmHint;
… …
960 Window top, parent; 1418 Window top, parent;
961 1419
962 dLocal (Display *, dpy); 1420 dLocal (Display *, dpy);
963 1421
964 /* grab colors before netscape does */ 1422 /* grab colors before netscape does */
965 Get_Colours (); 1423 get_colours ();
966 1424
967 if (!set_fonts ()) 1425 if (!set_fonts ())
968 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1426 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
969 1427
970 parent = display->root; 1428 parent = display->root;
… …
1000 } 1458 }
1001#endif 1459#endif
1002 1460
1003 window_calc (0, 0); 1461 window_calc (0, 0);
1004 1462
1005 /* sub-window placement & size in rxvt_resize_subwindows () */ 1463 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1006 attributes.background_pixel = pix_colors_focused [Color_border]; 1464 attributes.background_pixel = pix_colors_focused [Color_border];
1007 attributes.border_pixel = pix_colors_focused [Color_border]; 1465 attributes.border_pixel = pix_colors_focused [Color_border];
1008 attributes.colormap = cmap; 1466 attributes.colormap = cmap;
1009 1467
1010 top = XCreateWindow (dpy, parent, 1468 top = XCreateWindow (dpy, parent,
… …
1013 ext_bwidth, 1471 ext_bwidth,
1014 depth, InputOutput, visual, 1472 depth, InputOutput, visual,
1015 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1016 &attributes); 1474 &attributes);
1017 1475
1018 this->parent[0] = top; 1476 this->parent = top;
1019 1477
1020 old_width = szHint.width; 1478 old_width = szHint.width;
1021 old_height = szHint.height; 1479 old_height = szHint.height;
1022 1480
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1481 set_title (rs [Rs_title]);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1482 set_icon_name (rs [Rs_iconName]);
1025 1483
1026 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
1028 1486
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1487 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1031 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1490 wmHint.window_group = top;
1033 1491
1034 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1493 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH
1495 /*
1496 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon
1498 */
1499
1500 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif
1036 1505
1037#if ENABLE_FRILLS 1506#if ENABLE_FRILLS
1038 if (mwmhints.flags) 1507 if (mwmhints.flags)
1039 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1040 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1509 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1045#if ENABLE_EWMH 1514#if ENABLE_EWMH
1046 xa[XA_NET_WM_PING], 1515 xa[XA_NET_WM_PING],
1047#endif 1516#endif
1048 }; 1517 };
1049 1518
1050 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1519 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1051 1520
1052#if ENABLE_FRILLS 1521#if ENABLE_FRILLS
1053 if (rs[Rs_transient_for]) 1522 if (rs[Rs_transient_for])
1054 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1523 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1055#endif 1524#endif
… …
1116 pix_colors = pix_colors_unfocused; 1585 pix_colors = pix_colors_unfocused;
1117#endif 1586#endif
1118 1587
1119 pointer_unblank (); 1588 pointer_unblank ();
1120 scr_recolour (); 1589 scr_recolour ();
1121}
1122
1123/* ------------------------------------------------------------------------- *
1124 * GET TTY CURRENT STATE *
1125 * ------------------------------------------------------------------------- */
1126void
1127rxvt_get_ttymode (struct termios *tio, int erase)
1128{
1129 /*
1130 * standard System V termios interface
1131 */
1132 if (tcgetattr (STDIN_FILENO, tio) < 0)
1133 {
1134 // return error - use system defaults,
1135 // where possible, and zero elsewhere
1136 memset (tio, 0, sizeof (struct termios));
1137
1138 tio->c_cc[VINTR] = CINTR;
1139 tio->c_cc[VQUIT] = CQUIT;
1140 tio->c_cc[VERASE] = CERASE;
1141#ifdef VERASE2
1142 tio->c_cc[VERASE2] = CERASE2;
1143#endif
1144 tio->c_cc[VKILL] = CKILL;
1145 tio->c_cc[VSTART] = CSTART;
1146 tio->c_cc[VSTOP] = CSTOP;
1147 tio->c_cc[VSUSP] = CSUSP;
1148# ifdef VDSUSP
1149 tio->c_cc[VDSUSP] = CDSUSP;
1150# endif
1151# ifdef VREPRINT
1152 tio->c_cc[VREPRINT] = CRPRNT;
1153# endif
1154# ifdef VDISCRD
1155 tio->c_cc[VDISCRD] = CFLUSH;
1156# endif
1157# ifdef VWERSE
1158 tio->c_cc[VWERSE] = CWERASE;
1159# endif
1160# ifdef VLNEXT
1161 tio->c_cc[VLNEXT] = CLNEXT;
1162# endif
1163 }
1164
1165 tio->c_cc[VEOF] = CEOF;
1166 tio->c_cc[VEOL] = VDISABLE;
1167# ifdef VEOL2
1168 tio->c_cc[VEOL2] = VDISABLE;
1169# endif
1170# ifdef VSWTC
1171 tio->c_cc[VSWTC] = VDISABLE;
1172# endif
1173# ifdef VSWTCH
1174 tio->c_cc[VSWTCH] = VDISABLE;
1175# endif
1176# if VMIN != VEOF
1177 tio->c_cc[VMIN] = 1;
1178# endif
1179# if VTIME != VEOL
1180 tio->c_cc[VTIME] = 0;
1181# endif
1182
1183 if (erase != -1)
1184 tio->c_cc[VERASE] = (char)erase;
1185
1186 /* input modes */
1187 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1188# ifdef IMAXBEL
1189 | IMAXBEL
1190# endif
1191 | IXON);
1192
1193 /* output modes */
1194 tio->c_oflag = (OPOST | ONLCR);
1195
1196 /* control modes */
1197 tio->c_cflag = (CS8 | CREAD);
1198
1199 /* line discipline modes */
1200 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1201# if defined (ECHOCTL) && defined (ECHOKE)
1202 | ECHOCTL | ECHOKE
1203# endif
1204 | ECHOE | ECHOK);
1205
1206 /*
1207 * Debugging
1208 */
1209#ifdef DEBUG_TTYMODE
1210 /* c_iflag bits */
1211 fprintf (stderr, "Input flags\n");
1212
1213 /* cpp token stringize doesn't work on all machines <sigh> */
1214# define FOO(flag,name) \
1215 if ((tio->c_iflag) & flag) \
1216 fprintf (stderr, "%s ", name)
1217
1218 /* c_iflag bits */
1219 FOO (IGNBRK, "IGNBRK");
1220 FOO (BRKINT, "BRKINT");
1221 FOO (IGNPAR, "IGNPAR");
1222 FOO (PARMRK, "PARMRK");
1223 FOO (INPCK, "INPCK");
1224 FOO (ISTRIP, "ISTRIP");
1225 FOO (INLCR, "INLCR");
1226 FOO (IGNCR, "IGNCR");
1227 FOO (ICRNL, "ICRNL");
1228 FOO (IXON, "IXON");
1229 FOO (IXOFF, "IXOFF");
1230# ifdef IUCLC
1231 FOO (IUCLC, "IUCLC");
1232# endif
1233# ifdef IXANY
1234 FOO (IXANY, "IXANY");
1235# endif
1236# ifdef IMAXBEL
1237 FOO (IMAXBEL, "IMAXBEL");
1238# endif
1239
1240 fprintf (stderr, "\n");
1241
1242# undef FOO
1243# define FOO(entry, name) \
1244 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1245
1246 FOO (VINTR, "VINTR");
1247 FOO (VQUIT, "VQUIT");
1248 FOO (VERASE, "VERASE");
1249 FOO (VKILL, "VKILL");
1250 FOO (VEOF, "VEOF");
1251 FOO (VEOL, "VEOL");
1252# ifdef VEOL2
1253 FOO (VEOL2, "VEOL2");
1254# endif
1255# ifdef VSWTC
1256 FOO (VSWTC, "VSWTC");
1257# endif
1258# ifdef VSWTCH
1259 FOO (VSWTCH, "VSWTCH");
1260# endif
1261 FOO (VSTART, "VSTART");
1262 FOO (VSTOP, "VSTOP");
1263 FOO (VSUSP, "VSUSP");
1264# ifdef VDSUSP
1265 FOO (VDSUSP, "VDSUSP");
1266# endif
1267# ifdef VREPRINT
1268 FOO (VREPRINT, "VREPRINT");
1269# endif
1270# ifdef VDISCRD
1271 FOO (VDISCRD, "VDISCRD");
1272# endif
1273# ifdef VWERSE
1274 FOO (VWERSE, "VWERSE");
1275# endif
1276# ifdef VLNEXT
1277 FOO (VLNEXT, "VLNEXT");
1278# endif
1279
1280 fprintf (stderr, "\n");
1281# undef FOO
1282#endif /* DEBUG_TTYMODE */
1283} 1590}
1284 1591
1285/*----------------------------------------------------------------------*/ 1592/*----------------------------------------------------------------------*/
1286/* 1593/*
1287 * Run the command in a subprocess and return a file descriptor for the 1594 * Run the command in a subprocess and return a file descriptor for the
… …
1308 else 1615 else
1309#endif 1616#endif
1310 if (!pty->get ()) 1617 if (!pty->get ())
1311 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1312 1619
1313 int er; 1620 struct termios tio = def_tio;
1314 1621
1315#ifndef NO_BACKSPACE_KEY 1622#ifndef NO_BACKSPACE_KEY
1316 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1317 er = rs[Rs_backspace_key][0]; 1624 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1318 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1625 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1319 er = '\177'; /* the initial state anyway */ 1626 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1320 else
1321#endif 1627#endif
1322 er = -1;
1323 1628
1324 rxvt_get_ttymode (&tio, er);
1325 /* init terminal attributes */ 1629 /* init terminal attributes */
1326 cfsetospeed (&tio, BAUDRATE); 1630 cfsetospeed (&tio, BAUDRATE);
1327 cfsetispeed (&tio, BAUDRATE); 1631 cfsetispeed (&tio, BAUDRATE);
1328 tcsetattr (pty->tty, TCSANOW, &tio); 1632 tcsetattr (pty->tty, TCSANOW, &tio);
1329 pty->set_utf8_mode (enc_utf8); 1633 pty->set_utf8_mode (enc_utf8);
… …
1416 signal (SIGQUIT, SIG_DFL); 1720 signal (SIGQUIT, SIG_DFL);
1417 signal (SIGCHLD, SIG_DFL); 1721 signal (SIGCHLD, SIG_DFL);
1418 signal (SIGHUP, SIG_DFL); 1722 signal (SIGHUP, SIG_DFL);
1419 signal (SIGPIPE, SIG_DFL); 1723 signal (SIGPIPE, SIG_DFL);
1420 /* 1724 /*
1421 * mimick login's behavior by disabling the job control signals 1725 * mimic login's behavior by disabling the job control signals
1422 * a shell that wants them can turn them back on 1726 * a shell that wants them can turn them back on
1423 */ 1727 */
1424#ifdef SIGTSTP 1728#ifdef SIGTSTP
1425 signal (SIGTSTP, SIG_IGN); 1729 signal (SIGTSTP, SIG_IGN);
1426 signal (SIGTTIN, SIG_IGN); 1730 signal (SIGTTIN, SIG_IGN);
1427 signal (SIGTTOU, SIG_IGN); 1731 signal (SIGTTOU, SIG_IGN);
1428#endif /* SIGTSTP */ 1732#endif /* SIGTSTP */
1429 1733
1430 // unblock signals (signals are blocked by iom.C
1431 sigset_t ss;
1432 sigemptyset (&ss);
1433 sigprocmask (SIG_SETMASK, &ss, 0);
1434
1435 /* command interpreter path */ 1734 /* command interpreter path */
1436 if (argv) 1735 if (argv)
1437 { 1736 {
1438# ifdef DEBUG_CMD 1737# ifdef DEBUG_CMD
1439 int i; 1738 int i;
… …
1450 const char *argv0, *shell; 1749 const char *argv0, *shell;
1451 1750
1452 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1751 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1453 shell = "/bin/sh"; 1752 shell = "/bin/sh";
1454 1753
1455 argv0 = (const char *)rxvt_basename (shell); 1754 argv0 = rxvt_basename (shell);
1456 1755
1457 if (option (Opt_loginShell)) 1756 if (option (Opt_loginShell))
1458 { 1757 {
1459 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1758 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1460 1759

Diff Legend

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