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.223 by ayin, Mon Nov 26 10:33:36 2007 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) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
18 * 16 *
19 * 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
20 * 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
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
… …
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",
280#endif 531#endif
281 }; 532 };
282 533
283bool 534void
284rxvt_term::init_vars () 535rxvt_term::init_vars ()
285{ 536{
286 pix_colors = // 537 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
292 538
293 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
295 want_refresh = 1; 541 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 543 ncol = 80;
298 nrow = 24; 544 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 549 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 550
305 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
306 552
307 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 554
310 set_option (Opt_scrollBar); 555 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 556 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 557 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
318 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
319 565 set_option (Opt_buffered);
320 return true;
321}
322
323void
324rxvt_term::init_secondary ()
325{
326 int i;
327
328 /*
329 * Close all unused file descriptors
330 * We don't want them, we don't need them.
331 */
332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO);
336 }
337 else if (i != STDIN_FILENO)
338 {
339 dup2 (i, STDIN_FILENO);
340 close (i);
341 }
342
343 dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345#if 0 // schmorp sayz closing filies is murder
346 for (i = STDERR_FILENO + 1; i < num_fds; i++)
347 {
348#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349 if (i == 4 || i == 7)
350 continue;
351#endif
352 close (i);
353 }
354#endif
355} 566}
356 567
357/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
358const char ** 569const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
360{ 571{
361 int i, r_argc; 572 int i, r_argc;
362 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
363 574
364 /* 575 /*
365 * 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
366 */ 577 */
367 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
… …
371 if (r_argc == argc) 582 if (r_argc == argc)
372 cmd_argv = NULL; 583 cmd_argv = NULL;
373 else if (!argv[r_argc + 1]) 584 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n"); 585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else 586 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 587 cmd_argv = (const char **)argv + r_argc + 1;
381
382 cmd_argv[i] = NULL;
383 }
384
385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
386
387 for (i = 0; i < r_argc; i++)
388 r_argv[i] = (const char *)argv[i];
389
390 r_argv[i] = NULL;
391 588
392 rs[Rs_name] = rxvt_basename (argv[0]); 589 rs[Rs_name] = rxvt_basename (argv[0]);
393 590
394 /* 591 /*
395 * Open display, get options/resources and create the window 592 * Open display, get options/resources and create the window
396 */ 593 */
397 594
398 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
399 rs[Rs_display_name] = ":0"; 596 rs[Rs_display_name] = ":0";
400 597
401 get_options (r_argc, r_argv); 598 get_options (r_argc, argv);
402 599
403 if (!(display = displays.get (rs[Rs_display_name]))) 600 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
406 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]);
407 }
408 602
409 // using a local pointer decreases code size a lot 603 // using a local pointer decreases code size a lot
410 xa = display->xa; 604 xa = display->xa;
411 605
412 set (display); 606 set (display);
… …
415#if XFT 609#if XFT
416 if (rs[Rs_depth]) 610 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 611 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 612#endif
419 613
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv);
424
425 for (int i = NUM_RESOURCES; i--; ) 614 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 615 if (rs [i] == resval_undef)
427 rs [i] = 0; 616 rs [i] = 0;
428 617
429#if ENABLE_PERL 618#if ENABLE_PERL
… …
436 { 625 {
437 rxvt_perl.init (this); 626 rxvt_perl.init (this);
438 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 627 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
439 } 628 }
440#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 ();
441 634
442 /* 635 /*
443 * set any defaults not already set 636 * set any defaults not already set
444 */ 637 */
445 if (cmd_argv && cmd_argv[0]) 638 if (cmd_argv && cmd_argv[0])
446 { 639 {
447 if (!rs[Rs_title]) 640 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 641 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
642
449 if (!rs[Rs_iconName]) 643 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 644 rs[Rs_iconName] = rs[Rs_title];
451 } 645 }
452 else 646 else
453 { 647 {
454 if (!rs[Rs_title]) 648 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 649 rs[Rs_title] = rs[Rs_name];
650
456 if (!rs[Rs_iconName]) 651 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 652 rs[Rs_iconName] = rs[Rs_name];
458 } 653 }
459 654
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 655 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
467 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)
468 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 663 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
469 664
470 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 665 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
471 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]);
472#endif 670#endif
473 671
474#ifdef POINTER_BLANK 672#ifdef POINTER_BLANK
475 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
476 pointerBlankDelay = i; 674 pointerBlankDelay = i;
… …
479#endif 677#endif
480 678
481 /* no point having a scrollbar without having any scrollback! */ 679 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 680 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 681 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 682
490 if (!rs[Rs_cutchars]) 683 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 684 rs[Rs_cutchars] = CUTCHARS;
492 685
493#ifndef NO_BACKSPACE_KEY 686#ifndef NO_BACKSPACE_KEY
… …
506# else 699# else
507 rs[Rs_delete_key] = "\033[3~"; 700 rs[Rs_delete_key] = "\033[3~";
508# endif 701# endif
509#endif 702#endif
510 703
511#ifdef HAVE_SCROLLBARS 704 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 705
515#ifdef XTERM_REVERSE_VIDEO 706#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 707 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 708 if (option (Opt_reverseVideo))
518 { 709 {
… …
556 return cmd_argv; 747 return cmd_argv;
557} 748}
558 749
559/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
560void 751void
752rxvt_term::init (int argc, const char *const *argv)
753{
754 SET_R (this);
755 set_locale ("");
756 set_environ (envv); // a few things in X do not call setlocale :(
757
758 init_vars ();
759
760 const char **cmd_argv = init_resources (argc, argv);
761
762#ifdef KEYSYM_RESOURCE
763 keyboard->register_done ();
764#endif
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
776 if (option (Opt_scrollBar))
777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
778
779 pty = ptytty::create ();
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
791 create_windows (argc, argv);
792
793 init_xlocale ();
794
795 scr_poweron (); // initialize screen
796
797#if 0
798 XSynchronize (dpy, True);
799#endif
800
801 if (option (Opt_scrollBar))
802 scrollBar.resize (); /* create and map scrollbar */
803#ifdef HAVE_BG_PIXMAP
804 {
805 bg_init ();
806
807#ifdef ENABLE_TRANSPARENCY
808 if (option (Opt_transparent))
809 {
810 bg_set_transparent ();
811
812 if (rs [Rs_blurradius])
813 bg_set_blur (rs [Rs_blurradius]);
814
815 if (ISSET_PIXCOLOR (Color_tint))
816 bg_set_tint (pix_colors_focused [Color_tint]);
817
818 if (rs [Rs_shade])
819 bg_set_shade (rs [Rs_shade]);
820
821 bg_set_root_pixmap ();
822 XSelectInput (dpy, display->root, PropertyChangeMask);
823 rootwin_ev.start (display, display->root);
824 }
825#endif
826
827#ifdef BG_IMAGE_FROM_FILE
828 if (rs[Rs_backgroundPixmap])
829 {
830 if (bg_set_file (rs[Rs_backgroundPixmap]))
831 if (!bg_window_position_sensitive ())
832 update_background ();
833 }
834#endif
835 }
836#endif
837
838#if ENABLE_PERL
839 rootwin_ev.start (display, display->root);
840#endif
841
842 set_colorfgbg ();
843
844 init_command (cmd_argv);
845
846 if (pty->pty >= 0)
847 pty_ev.start (pty->pty, ev::READ);
848
849 HOOK_INVOKE ((this, HOOK_START, DT_END));
850
851#if ENABLE_XEMBED
852 if (rs[Rs_embed])
853 {
854 long info[2] = { 0, XEMBED_MAPPED };
855
856 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
857 32, PropModeReplace, (unsigned char *)&info, 2);
858 }
859#endif
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
873 XMapWindow (dpy, vt);
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
887
888 refresh_check ();
889}
890
891/*----------------------------------------------------------------------*/
892void
561rxvt_term::init_env () 893rxvt_term::init_env ()
562{ 894{
563 int i;
564 char *val; 895 char *val;
565 896
566#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
567 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
568 * 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
… …
582 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
583 914
584 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
586 917
587 i = strlen (val);
588 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
589 919
590 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
591 921
592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
593 923
594 /* add entries to the environment: 924 /* add entries to the environment:
595 * @ DISPLAY: in case we started with -display 925 * @ DISPLAY: in case we started with -display
596 * @ WINDOWID: X window id number of the window 926 * @ WINDOWID: X window id number of the window
597 * @ COLORTERM: terminal sub-name and also indicates its color 927 * @ COLORTERM: terminal sub-name and also indicates its color
… …
740 run_command (argv); 1070 run_command (argv);
741} 1071}
742 1072
743/*----------------------------------------------------------------------*/ 1073/*----------------------------------------------------------------------*/
744void 1074void
745rxvt_term::Get_Colours () 1075rxvt_term::get_colours ()
746{ 1076{
747 int i; 1077 int i;
748 1078
749#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 1080 pix_colors = pix_colors_focused;
… …
810 * get scrollBar shadow colors 1140 * get scrollBar shadow colors
811 * 1141 *
812 * The calculations of topShadow/bottomShadow values are adapted 1142 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 1143 * from the fvwm window manager.
814 */ 1144 */
815#ifdef KEEP_SCROLLCOLOR 1145#ifdef RXVT_SCROLLBAR
816 if (depth <= 2) 1146 if (depth <= 2)
817 { 1147 {
818 /* Monochrome */ 1148 /* Monochrome */
819 alias_color (Color_scroll, Color_fg); 1149 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg); 1150 alias_color (Color_topShadow, Color_bg);
… …
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1165 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 1166 cscroll.a)
837 )) 1167 ))
838 alias_color (Color_topShadow, Color_White); 1168 alias_color (Color_topShadow, Color_White);
839 } 1169 }
840#endif /* KEEP_SCROLLCOLOR */ 1170#endif
841 1171
842#ifdef OFF_FOCUS_FADING 1172#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1173 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 1174 update_fade_color (i);
845#endif 1175#endif
… …
950 1280
951 if (i) 1281 if (i)
952 ModMetaMask = modmasks[i - 1]; 1282 ModMetaMask = modmasks[i - 1];
953} 1283}
954 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
955/*----------------------------------------------------------------------*/ 1397/*----------------------------------------------------------------------*/
956/* rxvt_Create_Windows () - Open and map the window */ 1398/* Open and map the window */
957void 1399void
958rxvt_term::create_windows (int argc, const char *const *argv) 1400rxvt_term::create_windows (int argc, const char *const *argv)
959{ 1401{
960 XClassHint classHint; 1402 XClassHint classHint;
961 XWMHints wmHint; 1403 XWMHints wmHint;
… …
967 Window top, parent; 1409 Window top, parent;
968 1410
969 dLocal (Display *, dpy); 1411 dLocal (Display *, dpy);
970 1412
971 /* grab colors before netscape does */ 1413 /* grab colors before netscape does */
972 Get_Colours (); 1414 get_colours ();
973 1415
974 if (!set_fonts ()) 1416 if (!set_fonts ())
975 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");
976 1418
977 parent = display->root; 1419 parent = display->root;
… …
1007 } 1449 }
1008#endif 1450#endif
1009 1451
1010 window_calc (0, 0); 1452 window_calc (0, 0);
1011 1453
1012 /* sub-window placement & size in rxvt_resize_subwindows () */ 1454 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1013 attributes.background_pixel = pix_colors_focused [Color_border]; 1455 attributes.background_pixel = pix_colors_focused [Color_border];
1014 attributes.border_pixel = pix_colors_focused [Color_border]; 1456 attributes.border_pixel = pix_colors_focused [Color_border];
1015 attributes.colormap = cmap; 1457 attributes.colormap = cmap;
1016 1458
1017 top = XCreateWindow (dpy, parent, 1459 top = XCreateWindow (dpy, parent,
… …
1020 ext_bwidth, 1462 ext_bwidth,
1021 depth, InputOutput, visual, 1463 depth, InputOutput, visual,
1022 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1023 &attributes); 1465 &attributes);
1024 1466
1025 this->parent[0] = top; 1467 this->parent = top;
1026 1468
1027 old_width = szHint.width; 1469 old_width = szHint.width;
1028 old_height = szHint.height; 1470 old_height = szHint.height;
1029 1471
1030 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1472 set_title (rs [Rs_title]);
1031 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1473 set_icon_name (rs [Rs_iconName]);
1032 1474
1033 classHint.res_name = (char *)rs[Rs_name]; 1475 classHint.res_name = (char *)rs[Rs_name];
1034 classHint.res_class = (char *)RESCLASS; 1476 classHint.res_class = (char *)RESCLASS;
1035 1477
1036 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1478 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1038 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1039 wmHint.window_group = top; 1481 wmHint.window_group = top;
1040 1482
1041 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1042 &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
1043 1496
1044#if ENABLE_FRILLS 1497#if ENABLE_FRILLS
1045 if (mwmhints.flags) 1498 if (mwmhints.flags)
1046 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,
1047 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1500 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1052#if ENABLE_EWMH 1505#if ENABLE_EWMH
1053 xa[XA_NET_WM_PING], 1506 xa[XA_NET_WM_PING],
1054#endif 1507#endif
1055 }; 1508 };
1056 1509
1057 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1510 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1058 1511
1059#if ENABLE_FRILLS 1512#if ENABLE_FRILLS
1060 if (rs[Rs_transient_for]) 1513 if (rs[Rs_transient_for])
1061 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1062#endif 1515#endif
… …
1081 1534
1082 termwin_ev.start (display, top); 1535 termwin_ev.start (display, top);
1083 1536
1084 /* vt cursor: Black-on-White is standard, but this is more popular */ 1537 /* vt cursor: Black-on-White is standard, but this is more popular */
1085 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1086
1087#ifdef HAVE_SCROLLBARS
1088 /* cursor scrollBar: Black-on-White */
1089 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1090#endif
1091 1539
1092 /* the vt window */ 1540 /* the vt window */
1093 vt = XCreateSimpleWindow (dpy, top, 1541 vt = XCreateSimpleWindow (dpy, top,
1094 window_vt_x, window_vt_y, 1542 window_vt_x, window_vt_y,
1095 width, height, 1543 width, height,
… …
1120 GCForeground | GCBackground | GCGraphicsExposures, 1568 GCForeground | GCBackground | GCGraphicsExposures,
1121 &gcvalue); 1569 &gcvalue);
1122 1570
1123 drawable = new rxvt_drawable (this, vt); 1571 drawable = new rxvt_drawable (this, vt);
1124 1572
1125#ifdef RXVT_SCROLLBAR
1126 gcvalue.foreground = pix_colors[Color_topShadow];
1127 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[Color_bottomShadow];
1129 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1131 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1132#endif
1133
1134#ifdef OFF_FOCUS_FADING 1573#ifdef OFF_FOCUS_FADING
1135 // initially we are in unfocused state 1574 // initially we are in unfocused state
1136 if (rs[Rs_fade]) 1575 if (rs[Rs_fade])
1137 pix_colors = pix_colors_unfocused; 1576 pix_colors = pix_colors_unfocused;
1138#endif 1577#endif
1139 1578
1140 pointer_unblank (); 1579 pointer_unblank ();
1141 scr_recolour (); 1580 scr_recolour ();
1142}
1143
1144/* ------------------------------------------------------------------------- *
1145 * GET TTY CURRENT STATE *
1146 * ------------------------------------------------------------------------- */
1147void
1148rxvt_get_ttymode (ttymode_t *tio, int erase)
1149{
1150 /*
1151 * standard System V termios interface
1152 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1154 {
1155 // return error - use system defaults,
1156 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t));
1158
1159 tio->c_cc[VINTR] = CINTR;
1160 tio->c_cc[VQUIT] = CQUIT;
1161 tio->c_cc[VERASE] = CERASE;
1162#ifdef VERASE2
1163 tio->c_cc[VERASE2] = CERASE2;
1164#endif
1165 tio->c_cc[VKILL] = CKILL;
1166 tio->c_cc[VSTART] = CSTART;
1167 tio->c_cc[VSTOP] = CSTOP;
1168 tio->c_cc[VSUSP] = CSUSP;
1169# ifdef VDSUSP
1170 tio->c_cc[VDSUSP] = CDSUSP;
1171# endif
1172# ifdef VREPRINT
1173 tio->c_cc[VREPRINT] = CRPRNT;
1174# endif
1175# ifdef VDISCRD
1176 tio->c_cc[VDISCRD] = CFLUSH;
1177# endif
1178# ifdef VWERSE
1179 tio->c_cc[VWERSE] = CWERASE;
1180# endif
1181# ifdef VLNEXT
1182 tio->c_cc[VLNEXT] = CLNEXT;
1183# endif
1184 }
1185
1186 tio->c_cc[VEOF] = CEOF;
1187 tio->c_cc[VEOL] = VDISABLE;
1188# ifdef VEOL2
1189 tio->c_cc[VEOL2] = VDISABLE;
1190# endif
1191# ifdef VSWTC
1192 tio->c_cc[VSWTC] = VDISABLE;
1193# endif
1194# ifdef VSWTCH
1195 tio->c_cc[VSWTCH] = VDISABLE;
1196# endif
1197# if VMIN != VEOF
1198 tio->c_cc[VMIN] = 1;
1199# endif
1200# if VTIME != VEOL
1201 tio->c_cc[VTIME] = 0;
1202# endif
1203
1204 if (erase != -1)
1205 tio->c_cc[VERASE] = (char)erase;
1206
1207 /* input modes */
1208 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1209# ifdef IMAXBEL
1210 | IMAXBEL
1211# endif
1212 | IXON);
1213
1214 /* output modes */
1215 tio->c_oflag = (OPOST | ONLCR);
1216
1217 /* control modes */
1218 tio->c_cflag = (CS8 | CREAD);
1219
1220 /* line discipline modes */
1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1222# if defined (ECHOCTL) && defined (ECHOKE)
1223 | ECHOCTL | ECHOKE
1224# endif
1225 | ECHOE | ECHOK);
1226
1227 /*
1228 * Debugging
1229 */
1230#ifdef DEBUG_TTYMODE
1231#ifdef HAVE_TERMIOS_H
1232 /* c_iflag bits */
1233 fprintf (stderr, "Input flags\n");
1234
1235 /* cpp token stringize doesn't work on all machines <sigh> */
1236# define FOO(flag,name) \
1237 if ((tio->c_iflag) & flag) \
1238 fprintf (stderr, "%s ", name)
1239
1240 /* c_iflag bits */
1241 FOO (IGNBRK, "IGNBRK");
1242 FOO (BRKINT, "BRKINT");
1243 FOO (IGNPAR, "IGNPAR");
1244 FOO (PARMRK, "PARMRK");
1245 FOO (INPCK, "INPCK");
1246 FOO (ISTRIP, "ISTRIP");
1247 FOO (INLCR, "INLCR");
1248 FOO (IGNCR, "IGNCR");
1249 FOO (ICRNL, "ICRNL");
1250 FOO (IXON, "IXON");
1251 FOO (IXOFF, "IXOFF");
1252# ifdef IUCLC
1253 FOO (IUCLC, "IUCLC");
1254# endif
1255# ifdef IXANY
1256 FOO (IXANY, "IXANY");
1257# endif
1258# ifdef IMAXBEL
1259 FOO (IMAXBEL, "IMAXBEL");
1260# endif
1261
1262 fprintf (stderr, "\n");
1263
1264# undef FOO
1265# define FOO(entry, name) \
1266 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1267
1268 FOO (VINTR, "VINTR");
1269 FOO (VQUIT, "VQUIT");
1270 FOO (VERASE, "VERASE");
1271 FOO (VKILL, "VKILL");
1272 FOO (VEOF, "VEOF");
1273 FOO (VEOL, "VEOL");
1274# ifdef VEOL2
1275 FOO (VEOL2, "VEOL2");
1276# endif
1277# ifdef VSWTC
1278 FOO (VSWTC, "VSWTC");
1279# endif
1280# ifdef VSWTCH
1281 FOO (VSWTCH, "VSWTCH");
1282# endif
1283 FOO (VSTART, "VSTART");
1284 FOO (VSTOP, "VSTOP");
1285 FOO (VSUSP, "VSUSP");
1286# ifdef VDSUSP
1287 FOO (VDSUSP, "VDSUSP");
1288# endif
1289# ifdef VREPRINT
1290 FOO (VREPRINT, "VREPRINT");
1291# endif
1292# ifdef VDISCRD
1293 FOO (VDISCRD, "VDISCRD");
1294# endif
1295# ifdef VWERSE
1296 FOO (VWERSE, "VWERSE");
1297# endif
1298# ifdef VLNEXT
1299 FOO (VLNEXT, "VLNEXT");
1300# endif
1301
1302 fprintf (stderr, "\n");
1303# undef FOO
1304# endif /* HAVE_TERMIOS_H */
1305#endif /* DEBUG_TTYMODE */
1306} 1581}
1307 1582
1308/*----------------------------------------------------------------------*/ 1583/*----------------------------------------------------------------------*/
1309/* 1584/*
1310 * 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
… …
1331 else 1606 else
1332#endif 1607#endif
1333 if (!pty->get ()) 1608 if (!pty->get ())
1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1335 1610
1336 int er; 1611 struct termios tio = def_tio;
1337 1612
1338#ifndef NO_BACKSPACE_KEY 1613#ifndef NO_BACKSPACE_KEY
1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1340 er = rs[Rs_backspace_key][0]; 1615 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1616 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1342 er = '\177'; /* the initial state anyway */ 1617 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1343 else
1344#endif 1618#endif
1345 er = -1;
1346 1619
1347 rxvt_get_ttymode (&tio, er); 1620 /* init terminal attributes */
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1621 cfsetospeed (&tio, BAUDRATE);
1622 cfsetispeed (&tio, BAUDRATE);
1623 tcsetattr (pty->tty, TCSANOW, &tio);
1349 pty->set_utf8_mode (enc_utf8); 1624 pty->set_utf8_mode (enc_utf8);
1350 1625
1351 /* set initial window size */ 1626 /* set initial window size */
1352 tt_winch (); 1627 tt_winch ();
1353 1628
… …
1413rxvt_term::run_child (const char *const *argv) 1688rxvt_term::run_child (const char *const *argv)
1414{ 1689{
1415 char *login; 1690 char *login;
1416 1691
1417 if (option (Opt_console)) 1692 if (option (Opt_console))
1693 {
1418 { /* be virtual console, fail silently */ 1694 /* be virtual console, fail silently */
1419#ifdef TIOCCONS 1695#ifdef TIOCCONS
1420 unsigned int on = 1; 1696 unsigned int on = 1;
1421 1697
1422 ioctl (STDIN_FILENO, TIOCCONS, &on); 1698 ioctl (STDIN_FILENO, TIOCCONS, &on);
1423#elif defined (SRIOCSREDIR) 1699#elif defined (SRIOCSREDIR)
… …
1435 signal (SIGQUIT, SIG_DFL); 1711 signal (SIGQUIT, SIG_DFL);
1436 signal (SIGCHLD, SIG_DFL); 1712 signal (SIGCHLD, SIG_DFL);
1437 signal (SIGHUP, SIG_DFL); 1713 signal (SIGHUP, SIG_DFL);
1438 signal (SIGPIPE, SIG_DFL); 1714 signal (SIGPIPE, SIG_DFL);
1439 /* 1715 /*
1440 * mimick login's behavior by disabling the job control signals 1716 * mimic login's behavior by disabling the job control signals
1441 * a shell that wants them can turn them back on 1717 * a shell that wants them can turn them back on
1442 */ 1718 */
1443#ifdef SIGTSTP 1719#ifdef SIGTSTP
1444 signal (SIGTSTP, SIG_IGN); 1720 signal (SIGTSTP, SIG_IGN);
1445 signal (SIGTTIN, SIG_IGN); 1721 signal (SIGTTIN, SIG_IGN);
1446 signal (SIGTTOU, SIG_IGN); 1722 signal (SIGTTOU, SIG_IGN);
1447#endif /* SIGTSTP */ 1723#endif /* SIGTSTP */
1448 1724
1449 // unblock signals (signals are blocked by iom.C
1450 sigset_t ss;
1451 sigemptyset (&ss);
1452 sigprocmask (SIG_SETMASK, &ss, 0);
1453
1454 /* command interpreter path */ 1725 /* command interpreter path */
1455 if (argv) 1726 if (argv)
1456 { 1727 {
1457# ifdef DEBUG_CMD 1728# ifdef DEBUG_CMD
1458 int i; 1729 int i;
… …
1469 const char *argv0, *shell; 1740 const char *argv0, *shell;
1470 1741
1471 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1742 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1472 shell = "/bin/sh"; 1743 shell = "/bin/sh";
1473 1744
1474 argv0 = (const char *)rxvt_basename (shell); 1745 argv0 = rxvt_basename (shell);
1475 1746
1476 if (option (Opt_loginShell)) 1747 if (option (Opt_loginShell))
1477 { 1748 {
1478 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1749 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1479 1750

Diff Legend

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