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.249 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.326 by root, Sun Jun 3 10:42:34 2012 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.
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
… …
73#include <netinet/in.h> 76#include <netinet/in.h>
74#include <arpa/inet.h> 77#include <arpa/inet.h>
75#include <net/if.h> 78#include <net/if.h>
76#include <net/if_arp.h> 79#include <net/if_arp.h>
77 80
78static char * 81static char * ecb_cold
79rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
80{ 83{
81 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 85 struct ifconf ifc;
83 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
143 146
144 return rval; 147 return rval;
145} 148}
146#endif 149#endif
147 150
148const char *const def_colorName[] = 151static const char *const def_colorName[] =
149 { 152 {
150 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
152 /* low-intensity colors */ 155 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 181
182#if !USE_256_COLORS
179 // 88 xterm colours 183 // 88 xterm colours
180 "rgb:00/00/00", 184 "rgb:00/00/00",
181 "rgb:00/00/8b", 185 "rgb:00/00/8b",
182 "rgb:00/00/cd", 186 "rgb:00/00/cd",
183 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 255 "rgb:e7/e7/e7",
256#else
257 // 256 xterm colours
258 "rgb:00/00/00",
259 "rgb:00/00/5f",
260 "rgb:00/00/87",
261 "rgb:00/00/af",
262 "rgb:00/00/d7",
263 "rgb:00/00/ff",
264 "rgb:00/5f/00",
265 "rgb:00/5f/5f",
266 "rgb:00/5f/87",
267 "rgb:00/5f/af",
268 "rgb:00/5f/d7",
269 "rgb:00/5f/ff",
270 "rgb:00/87/00",
271 "rgb:00/87/5f",
272 "rgb:00/87/87",
273 "rgb:00/87/af",
274 "rgb:00/87/d7",
275 "rgb:00/87/ff",
276 "rgb:00/af/00",
277 "rgb:00/af/5f",
278 "rgb:00/af/87",
279 "rgb:00/af/af",
280 "rgb:00/af/d7",
281 "rgb:00/af/ff",
282 "rgb:00/d7/00",
283 "rgb:00/d7/5f",
284 "rgb:00/d7/87",
285 "rgb:00/d7/af",
286 "rgb:00/d7/d7",
287 "rgb:00/d7/ff",
288 "rgb:00/ff/00",
289 "rgb:00/ff/5f",
290 "rgb:00/ff/87",
291 "rgb:00/ff/af",
292 "rgb:00/ff/d7",
293 "rgb:00/ff/ff",
294 "rgb:5f/00/00",
295 "rgb:5f/00/5f",
296 "rgb:5f/00/87",
297 "rgb:5f/00/af",
298 "rgb:5f/00/d7",
299 "rgb:5f/00/ff",
300 "rgb:5f/5f/00",
301 "rgb:5f/5f/5f",
302 "rgb:5f/5f/87",
303 "rgb:5f/5f/af",
304 "rgb:5f/5f/d7",
305 "rgb:5f/5f/ff",
306 "rgb:5f/87/00",
307 "rgb:5f/87/5f",
308 "rgb:5f/87/87",
309 "rgb:5f/87/af",
310 "rgb:5f/87/d7",
311 "rgb:5f/87/ff",
312 "rgb:5f/af/00",
313 "rgb:5f/af/5f",
314 "rgb:5f/af/87",
315 "rgb:5f/af/af",
316 "rgb:5f/af/d7",
317 "rgb:5f/af/ff",
318 "rgb:5f/d7/00",
319 "rgb:5f/d7/5f",
320 "rgb:5f/d7/87",
321 "rgb:5f/d7/af",
322 "rgb:5f/d7/d7",
323 "rgb:5f/d7/ff",
324 "rgb:5f/ff/00",
325 "rgb:5f/ff/5f",
326 "rgb:5f/ff/87",
327 "rgb:5f/ff/af",
328 "rgb:5f/ff/d7",
329 "rgb:5f/ff/ff",
330 "rgb:87/00/00",
331 "rgb:87/00/5f",
332 "rgb:87/00/87",
333 "rgb:87/00/af",
334 "rgb:87/00/d7",
335 "rgb:87/00/ff",
336 "rgb:87/5f/00",
337 "rgb:87/5f/5f",
338 "rgb:87/5f/87",
339 "rgb:87/5f/af",
340 "rgb:87/5f/d7",
341 "rgb:87/5f/ff",
342 "rgb:87/87/00",
343 "rgb:87/87/5f",
344 "rgb:87/87/87",
345 "rgb:87/87/af",
346 "rgb:87/87/d7",
347 "rgb:87/87/ff",
348 "rgb:87/af/00",
349 "rgb:87/af/5f",
350 "rgb:87/af/87",
351 "rgb:87/af/af",
352 "rgb:87/af/d7",
353 "rgb:87/af/ff",
354 "rgb:87/d7/00",
355 "rgb:87/d7/5f",
356 "rgb:87/d7/87",
357 "rgb:87/d7/af",
358 "rgb:87/d7/d7",
359 "rgb:87/d7/ff",
360 "rgb:87/ff/00",
361 "rgb:87/ff/5f",
362 "rgb:87/ff/87",
363 "rgb:87/ff/af",
364 "rgb:87/ff/d7",
365 "rgb:87/ff/ff",
366 "rgb:af/00/00",
367 "rgb:af/00/5f",
368 "rgb:af/00/87",
369 "rgb:af/00/af",
370 "rgb:af/00/d7",
371 "rgb:af/00/ff",
372 "rgb:af/5f/00",
373 "rgb:af/5f/5f",
374 "rgb:af/5f/87",
375 "rgb:af/5f/af",
376 "rgb:af/5f/d7",
377 "rgb:af/5f/ff",
378 "rgb:af/87/00",
379 "rgb:af/87/5f",
380 "rgb:af/87/87",
381 "rgb:af/87/af",
382 "rgb:af/87/d7",
383 "rgb:af/87/ff",
384 "rgb:af/af/00",
385 "rgb:af/af/5f",
386 "rgb:af/af/87",
387 "rgb:af/af/af",
388 "rgb:af/af/d7",
389 "rgb:af/af/ff",
390 "rgb:af/d7/00",
391 "rgb:af/d7/5f",
392 "rgb:af/d7/87",
393 "rgb:af/d7/af",
394 "rgb:af/d7/d7",
395 "rgb:af/d7/ff",
396 "rgb:af/ff/00",
397 "rgb:af/ff/5f",
398 "rgb:af/ff/87",
399 "rgb:af/ff/af",
400 "rgb:af/ff/d7",
401 "rgb:af/ff/ff",
402 "rgb:d7/00/00",
403 "rgb:d7/00/5f",
404 "rgb:d7/00/87",
405 "rgb:d7/00/af",
406 "rgb:d7/00/d7",
407 "rgb:d7/00/ff",
408 "rgb:d7/5f/00",
409 "rgb:d7/5f/5f",
410 "rgb:d7/5f/87",
411 "rgb:d7/5f/af",
412 "rgb:d7/5f/d7",
413 "rgb:d7/5f/ff",
414 "rgb:d7/87/00",
415 "rgb:d7/87/5f",
416 "rgb:d7/87/87",
417 "rgb:d7/87/af",
418 "rgb:d7/87/d7",
419 "rgb:d7/87/ff",
420 "rgb:d7/af/00",
421 "rgb:d7/af/5f",
422 "rgb:d7/af/87",
423 "rgb:d7/af/af",
424 "rgb:d7/af/d7",
425 "rgb:d7/af/ff",
426 "rgb:d7/d7/00",
427 "rgb:d7/d7/5f",
428 "rgb:d7/d7/87",
429 "rgb:d7/d7/af",
430 "rgb:d7/d7/d7",
431 "rgb:d7/d7/ff",
432 "rgb:d7/ff/00",
433 "rgb:d7/ff/5f",
434 "rgb:d7/ff/87",
435 "rgb:d7/ff/af",
436 "rgb:d7/ff/d7",
437 "rgb:d7/ff/ff",
438 "rgb:ff/00/00",
439 "rgb:ff/00/5f",
440 "rgb:ff/00/87",
441 "rgb:ff/00/af",
442 "rgb:ff/00/d7",
443 "rgb:ff/00/ff",
444 "rgb:ff/5f/00",
445 "rgb:ff/5f/5f",
446 "rgb:ff/5f/87",
447 "rgb:ff/5f/af",
448 "rgb:ff/5f/d7",
449 "rgb:ff/5f/ff",
450 "rgb:ff/87/00",
451 "rgb:ff/87/5f",
452 "rgb:ff/87/87",
453 "rgb:ff/87/af",
454 "rgb:ff/87/d7",
455 "rgb:ff/87/ff",
456 "rgb:ff/af/00",
457 "rgb:ff/af/5f",
458 "rgb:ff/af/87",
459 "rgb:ff/af/af",
460 "rgb:ff/af/d7",
461 "rgb:ff/af/ff",
462 "rgb:ff/d7/00",
463 "rgb:ff/d7/5f",
464 "rgb:ff/d7/87",
465 "rgb:ff/d7/af",
466 "rgb:ff/d7/d7",
467 "rgb:ff/d7/ff",
468 "rgb:ff/ff/00",
469 "rgb:ff/ff/5f",
470 "rgb:ff/ff/87",
471 "rgb:ff/ff/af",
472 "rgb:ff/ff/d7",
473 "rgb:ff/ff/ff",
474 "rgb:08/08/08",
475 "rgb:12/12/12",
476 "rgb:1c/1c/1c",
477 "rgb:26/26/26",
478 "rgb:30/30/30",
479 "rgb:3a/3a/3a",
480 "rgb:44/44/44",
481 "rgb:4e/4e/4e",
482 "rgb:58/58/58",
483 "rgb:62/62/62",
484 "rgb:6c/6c/6c",
485 "rgb:76/76/76",
486 "rgb:80/80/80",
487 "rgb:8a/8a/8a",
488 "rgb:94/94/94",
489 "rgb:9e/9e/9e",
490 "rgb:a8/a8/a8",
491 "rgb:b2/b2/b2",
492 "rgb:bc/bc/bc",
493 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0",
495 "rgb:da/da/da",
496 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee",
498#endif
252 499
253#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 513#if ENABLE_FRILLS
267 NULL, // Color_underline 514 NULL, // Color_underline
268#endif 515#endif
269#ifdef OPTION_HC 516#ifdef OPTION_HC
270 NULL, 517 NULL,
518 NULL,
271#endif 519#endif
272 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
275#endif 523#endif
… …
293 ncol = 80; 541 ncol = 80;
294 nrow = 24; 542 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 547 saveLines = SAVELINES;
299 548
300 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
301 550
302 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 563 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} 564}
333 565
334/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
335const char ** 567const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
337{ 569{
338 int i, r_argc; 570 int i;
339 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
340
341 /*
342 * Look for -e option. Find => split and make cmd_argv[] of command args
343 */
344 for (r_argc = 0; r_argc < argc; r_argc++)
345 if (!strcmp (argv[r_argc], "-e"))
346 break;
347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 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];
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 572
369 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
370 574
371 /* 575 /*
372 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
373 */ 577 */
374 578
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
377 581
378 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
379 583
380 if (!(display = displays.get (rs[Rs_display_name]))) 584 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]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 586
386 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
387 xa = display->xa; 588 xa = display->xa;
388 589
389 set (display); 590 set (display);
… …
392#if XFT 593#if XFT
393 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 596#endif
396 597
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--; ) 598 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
406 rs [i] = 0; 600 rs [i] = 0;
407 601
408#if ENABLE_PERL 602#if ENABLE_PERL
… …
415 { 609 {
416 rxvt_perl.init (this); 610 rxvt_perl.init (this);
417 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
418 } 612 }
419#endif 613#endif
614
615 // must be called after initialising the perl interpreter as it
616 // may invoke the `on_register_command' hook
617 extract_keysym_resources ();
420 618
421 /* 619 /*
422 * set any defaults not already set 620 * set any defaults not already set
423 */ 621 */
424 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
425 { 623 {
426 if (!rs[Rs_title]) 624 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 625 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
626
428 if (!rs[Rs_iconName]) 627 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 628 rs[Rs_iconName] = rs[Rs_title];
430 } 629 }
431 else 630 else
432 { 631 {
433 if (!rs[Rs_title]) 632 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 633 rs[Rs_title] = rs[Rs_name];
634
435 if (!rs[Rs_iconName]) 635 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 636 rs[Rs_iconName] = rs[Rs_name];
437 } 637 }
438 638
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 639 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 646 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 648
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 650 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
651
652 if (rs[Rs_letterSpace])
653 letterSpace = atoi (rs[Rs_letterSpace]);
451#endif 654#endif
452 655
453#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 658 pointerBlankDelay = i;
… …
458#endif 661#endif
459 662
460 /* no point having a scrollbar without having any scrollback! */ 663 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 664 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 665 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 666
469 if (!rs[Rs_cutchars]) 667 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 668 rs[Rs_cutchars] = CUTCHARS;
471 669
472#ifndef NO_BACKSPACE_KEY 670#ifndef NO_BACKSPACE_KEY
… …
533 return cmd_argv; 731 return cmd_argv;
534} 732}
535 733
536/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
537void 735void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
539{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
540 this->envv = envv; 742 this->envv = envv;
541 743
744 init2 (argv->size () - 1, argv->begin ());
745}
746
747void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
749{
750#if ENABLE_PERL
751 // perl might want to access the stringvecs later, so we need to copy them
752 stringvec *args = new stringvec;
753 for (int i = 0; i < argc; i++)
754 args->push_back (strdup (argv [i]));
755
756 stringvec *envs = new stringvec;
757 for (const char *const *var = envv; *var; var++)
758 envs->push_back (strdup (*var));
759
760 init (args, envs);
761#else
762 init2 (argc, argv);
763#endif
764}
765
766void
767rxvt_term::init2 (int argc, const char *const *argv)
768{
542 SET_R (this); 769 SET_R (this);
543 set_locale (""); 770 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :( 771 set_environ (envv); // a few things in X do not call setlocale :(
545 772
546 init_vars (); 773 init_vars ();
547
548 init_secondary ();
549 774
550 const char **cmd_argv = init_resources (argc, argv); 775 const char **cmd_argv = init_resources (argc, argv);
551 776
552#ifdef KEYSYM_RESOURCE 777#ifdef KEYSYM_RESOURCE
553 keyboard->register_done (); 778 keyboard->register_done ();
554#endif 779#endif
555 780
781 if (const char *path = rs[Rs_chdir])
782 if (*path) // ignored if empty
783 {
784 if (*path != '/')
785 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
786
787 if (chdir (path))
788 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
789 }
790
556 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
558 793
559 pty = ptytty::create (); 794 pty = ptytty::create ();
560 795
561 create_windows (argc, argv); 796 create_windows (argc, argv);
562 797
563 init_xlocale (); 798 init_xlocale ();
564 799
565 scr_reset (); // initialize screen 800 scr_poweron (); // initialize screen
566 801
567#if 0 802#if 0
568 XSynchronize (dpy, True); 803 XSynchronize (dpy, True);
569#endif 804#endif
570 805
571 if (option (Opt_scrollBar)) 806 if (option (Opt_scrollBar))
572 scrollBar.resize (); /* create and map scrollbar */ 807 scrollBar.resize (); /* create and map scrollbar */
573#ifdef HAVE_BG_PIXMAP 808#ifdef HAVE_BG_PIXMAP
574 { 809 {
575 bgPixmap.set_target (this); 810 bg_init ();
576 bgPixmap.invalidate ();
577 811
578#ifdef ENABLE_TRANSPARENCY 812#ifdef ENABLE_TRANSPARENCY
579 if (option (Opt_transparent)) 813 if (option (Opt_transparent))
580 { 814 {
581 bgPixmap.set_transparent (); 815 bg_set_transparent ();
582 816
583#ifdef HAVE_AFTERIMAGE
584 if (rs [Rs_blurradius]) 817 if (rs [Rs_blurradius])
585 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 818 root_effects.set_blur (rs [Rs_blurradius]);
586#endif 819
587 if (ISSET_PIXCOLOR (Color_tint)) 820 if (ISSET_PIXCOLOR (Color_tint))
588 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 821 root_effects.set_tint (pix_colors_focused [Color_tint]);
589 822
590 if (rs [Rs_shade]) 823 if (rs [Rs_shade])
591 bgPixmap.set_shade (rs [Rs_shade]); 824 root_effects.set_shade (rs [Rs_shade]);
592 825
593 bgPixmap.set_root_pixmap (); 826 bg_set_root_pixmap ();
594 XSelectInput (dpy, display->root, PropertyChangeMask); 827 XSelectInput (dpy, display->root, PropertyChangeMask);
595 rootwin_ev.start (display, display->root); 828 rootwin_ev.start (display, display->root);
596 } 829 }
597#endif 830#endif
598
599#ifdef BG_IMAGE_FROM_FILE
600 if (rs[Rs_backgroundPixmap])
601 {
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]))
613 if (!bgPixmap.window_position_sensitive ())
614 update_background ();
615 }
616#endif
617 } 831 }
618#endif 832#endif
619 833
620#if ENABLE_PERL 834#if ENABLE_PERL
621 rootwin_ev.start (display, display->root); 835 rootwin_ev.start (display, display->root);
622#endif 836#endif
623 837
624 set_colorfgbg (); 838 init_done = 1;
625 839
626 init_command (cmd_argv); 840 init_command (cmd_argv);
627
628 free (cmd_argv);
629 841
630 if (pty->pty >= 0) 842 if (pty->pty >= 0)
631 pty_ev.start (pty->pty, ev::READ); 843 pty_ev.start (pty->pty, ev::READ);
632 844
633 HOOK_INVOKE ((this, HOOK_START, DT_END)); 845 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
635#if ENABLE_XEMBED 847#if ENABLE_XEMBED
636 if (rs[Rs_embed]) 848 if (rs[Rs_embed])
637 { 849 {
638 long info[2] = { 0, XEMBED_MAPPED }; 850 long info[2] = { 0, XEMBED_MAPPED };
639 851
640 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 852 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
641 32, PropModeReplace, (unsigned char *)&info, 2); 853 32, PropModeReplace, (unsigned char *)&info, 2);
642 } 854 }
643#endif 855#endif
644 856
857#if HAVE_STARTUP_NOTIFICATION
858 SnDisplay *snDisplay;
859 SnLauncheeContext *snContext;
860
861 snDisplay = sn_display_new (dpy, NULL, NULL);
862 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
863
864 /* Tell the window manager that this window is part of the startup context */
865 if (snContext)
866 sn_launchee_context_setup_window (snContext, parent);
867#endif
868
645 XMapWindow (dpy, vt); 869 XMapWindow (dpy, vt);
646 XMapWindow (dpy, parent[0]); 870 XMapWindow (dpy, parent);
871
872#if HAVE_STARTUP_NOTIFICATION
873 if (snContext)
874 {
875 /* Mark the startup process as complete */
876 sn_launchee_context_complete (snContext);
877
878 sn_launchee_context_unref (snContext);
879 }
880
881 sn_display_unref (snDisplay);
882#endif
647 883
648 refresh_check (); 884 refresh_check ();
649} 885}
650 886
651/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
652void 888void
653rxvt_term::init_env () 889rxvt_term::init_env ()
654{ 890{
655 int i;
656 char *val; 891 char *val;
892 char *env_display;
893 char *env_windowid;
894 char *env_colorfgbg;
895 char *env_term;
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
661 * (for the first non-loopback interface) that we get from 900 * (for the first non-loopback interface) that we get from
… …
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
922 env_windowid = (char *)rxvt_malloc (21);
684 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 923 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
685 924
686 /* add entries to the environment: 925 /* add entries to the environment:
687 * @ DISPLAY: in case we started with -display 926 * @ DISPLAY: in case we started with -display
688 * @ WINDOWID: X window id number of the window 927 * @ WINDOWID: X window id number of the window
689 * @ COLORTERM: terminal sub-name and also indicates its color 928 * @ COLORTERM: terminal sub-name and also indicates its color
… …
692 * @ COLORFGBG: fg;bg color codes 931 * @ COLORFGBG: fg;bg color codes
693 */ 932 */
694 putenv (env_display); 933 putenv (env_display);
695 putenv (env_windowid); 934 putenv (env_windowid);
696 935
697 if (env_colorfgbg) 936 env_colorfgbg = get_colorfgbg ();
698 putenv (env_colorfgbg); 937 putenv (env_colorfgbg);
699 938
700#ifdef RXVT_TERMINFO 939#ifdef RXVT_TERMINFO
701 putenv ("TERMINFO=" RXVT_TERMINFO); 940 putenv ("TERMINFO=" RXVT_TERMINFO);
702#endif 941#endif
703 942
… …
722 unsetenv ("TERMCAP"); /* terminfo should be okay */ 961 unsetenv ("TERMCAP"); /* terminfo should be okay */
723#endif /* HAVE_UNSETENV */ 962#endif /* HAVE_UNSETENV */
724} 963}
725 964
726/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
727/*
728 * This is more or less stolen straight from XFree86 xterm.
729 * This should support all European type languages.
730 */
731void 966void
732rxvt_term::set_locale (const char *locale) 967rxvt_term::set_locale (const char *locale)
733{ 968{
734 set_environ (envv); 969 set_environ (envv);
735 970
736#if HAVE_XSETLOCALE || HAVE_SETLOCALE
737 free (this->locale); 971 free (this->locale);
738 this->locale = setlocale (LC_CTYPE, locale); 972 this->locale = setlocale (LC_CTYPE, locale);
739 973
740 if (!this->locale) 974 if (!this->locale)
741 { 975 {
… …
752 986
753 987
754 this->locale = strdup (this->locale); 988 this->locale = strdup (this->locale);
755 SET_LOCALE (this->locale); 989 SET_LOCALE (this->locale);
756 mbstate.reset (); 990 mbstate.reset ();
757#endif
758 991
759#if HAVE_NL_LANGINFO 992#if HAVE_NL_LANGINFO
760 char *codeset = strdup (nl_langinfo (CODESET)); 993 char *codeset = nl_langinfo (CODESET);
761 // /^UTF.?8/i 994 // /^UTF.?8/i
762 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 995 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
763 && (codeset[1] == 'T' || codeset[1] == 't') 996 && (codeset[1] == 'T' || codeset[1] == 't')
764 && (codeset[2] == 'F' || codeset[2] == 'f') 997 && (codeset[2] == 'F' || codeset[2] == 'f')
765 && (codeset[3] == '8' || codeset[4] == '8'); 998 && (codeset[3] == '8' || codeset[4] == '8');
766 free (codeset);
767#else 999#else
768 enc_utf8 = 0; 1000 enc_utf8 = 0;
769#endif 1001#endif
770} 1002}
771 1003
… …
774{ 1006{
775 set_environ (envv); 1007 set_environ (envv);
776 1008
777#ifdef USE_XIM 1009#ifdef USE_XIM
778 if (!locale) 1010 if (!locale)
779 rxvt_warn ("setting locale failed, working without locale support.\n"); 1011 rxvt_warn ("setting locale failed, continuing without locale support.\n");
780 else 1012 else
781 { 1013 {
782 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
783 1015
784 if (!XSupportsLocale ()) 1016 if (!XSupportsLocale ())
785 { 1017 {
786 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1018 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
787 return; 1019 return;
788 } 1020 }
789 1021
790 im_ev.start (display); 1022 im_ev.start (display);
791 1023
… …
832 run_command (argv); 1064 run_command (argv);
833} 1065}
834 1066
835/*----------------------------------------------------------------------*/ 1067/*----------------------------------------------------------------------*/
836void 1068void
837rxvt_term::Get_Colours () 1069rxvt_term::get_colours ()
838{ 1070{
839 int i; 1071 int i;
840 1072
841#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
842 pix_colors = pix_colors_focused; 1074 pix_colors = pix_colors_focused;
… …
940/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
941/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
942void 1174void
943rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
944{ 1176{
945 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
946 { 1178 {
947 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
948 1180
949 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
950 /* bright colors */ 1182 /* bright colors */
… …
1042 1274
1043 if (i) 1275 if (i)
1044 ModMetaMask = modmasks[i - 1]; 1276 ModMetaMask = modmasks[i - 1];
1045} 1277}
1046 1278
1279void
1280rxvt_term::set_icon (const char *file)
1281{
1282#ifdef HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf)
1285 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return;
1288 }
1289
1290 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1291 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1292
1293 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1294 {
1295 rxvt_warn ("Icon image too big, continuing without.\n");
1296 g_object_unref (pixbuf);
1297 return;
1298 }
1299
1300 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1301 {
1302 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1303 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1304 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1305
1306 buffer [0] = w;
1307 buffer [1] = h;
1308 for (int i = 0; i < h; i++)
1309 {
1310 for (int j = 0; j < w; j++)
1311 {
1312 unsigned char *pixel = row + j * channels;
1313 long value;
1314
1315 if (channels == 4)
1316 value = pixel[3];
1317 else
1318 value = (unsigned char)0x00ff;
1319
1320 value = (value << 8) + pixel[0];
1321 value = (value << 8) + pixel[1];
1322 value = (value << 8) + pixel[2];
1323 buffer[(i * w + j) + 2] = value;
1324 }
1325
1326 row += rowstride;
1327 }
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 g_object_unref (pixbuf);
1337#endif
1338}
1339
1047/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
1048/* rxvt_Create_Windows () - Open and map the window */ 1341/* Open and map the window */
1049void 1342void
1050rxvt_term::create_windows (int argc, const char *const *argv) 1343rxvt_term::create_windows (int argc, const char *const *argv)
1051{ 1344{
1052 XClassHint classHint; 1345 XClassHint classHint;
1053 XWMHints wmHint; 1346 XWMHints wmHint;
… …
1059 Window top, parent; 1352 Window top, parent;
1060 1353
1061 dLocal (Display *, dpy); 1354 dLocal (Display *, dpy);
1062 1355
1063 /* grab colors before netscape does */ 1356 /* grab colors before netscape does */
1064 Get_Colours (); 1357 get_colours ();
1065 1358
1066 if (!set_fonts ()) 1359 if (!set_fonts ())
1067 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1068 1361
1069 parent = display->root; 1362 parent = display->root;
… …
1099 } 1392 }
1100#endif 1393#endif
1101 1394
1102 window_calc (0, 0); 1395 window_calc (0, 0);
1103 1396
1104 /* sub-window placement & size in rxvt_resize_subwindows () */ 1397 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1105 attributes.background_pixel = pix_colors_focused [Color_border]; 1398 attributes.background_pixel = pix_colors_focused [Color_border];
1106 attributes.border_pixel = pix_colors_focused [Color_border]; 1399 attributes.border_pixel = pix_colors_focused [Color_border];
1107 attributes.colormap = cmap; 1400 attributes.colormap = cmap;
1108 1401
1109 top = XCreateWindow (dpy, parent, 1402 top = XCreateWindow (dpy, parent,
… …
1112 ext_bwidth, 1405 ext_bwidth,
1113 depth, InputOutput, visual, 1406 depth, InputOutput, visual,
1114 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1115 &attributes); 1408 &attributes);
1116 1409
1117 this->parent[0] = top; 1410 this->parent = top;
1118 1411
1119 old_width = szHint.width; 1412 set_title (rs [Rs_title]);
1120 old_height = szHint.height; 1413 set_icon_name (rs [Rs_iconName]);
1121
1122 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1123 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1124 1414
1125 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
1126 classHint.res_class = (char *)RESCLASS; 1416 classHint.res_class = (char *)RESCLASS;
1127 1417
1128 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1418 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1130 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1131 wmHint.window_group = top; 1421 wmHint.window_group = top;
1132 1422
1133 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1134 &szHint, &wmHint, &classHint); 1424 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH
1426 /*
1427 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon
1429 */
1430
1431 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif
1135 1436
1136#if ENABLE_FRILLS 1437#if ENABLE_FRILLS
1137 if (mwmhints.flags) 1438 if (mwmhints.flags)
1138 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1139 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1440 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1144#if ENABLE_EWMH 1445#if ENABLE_EWMH
1145 xa[XA_NET_WM_PING], 1446 xa[XA_NET_WM_PING],
1146#endif 1447#endif
1147 }; 1448 };
1148 1449
1149 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1450 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1150 1451
1151#if ENABLE_FRILLS 1452#if ENABLE_FRILLS
1152 if (rs[Rs_transient_for]) 1453 if (rs[Rs_transient_for])
1153 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1454 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1154#endif 1455#endif
… …
1177 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1178 1479
1179 /* the vt window */ 1480 /* the vt window */
1180 vt = XCreateSimpleWindow (dpy, top, 1481 vt = XCreateSimpleWindow (dpy, top,
1181 window_vt_x, window_vt_y, 1482 window_vt_x, window_vt_y,
1182 width, height, 1483 vt_width, vt_height,
1183 0, 1484 0,
1184 pix_colors_focused[Color_fg], 1485 pix_colors_focused[Color_fg],
1185 pix_colors_focused[Color_bg]); 1486 pix_colors_focused[Color_bg]);
1186 1487
1187 attributes.bit_gravity = NorthWestGravity; 1488 attributes.bit_gravity = NorthWestGravity;
… …
1215 pix_colors = pix_colors_unfocused; 1516 pix_colors = pix_colors_unfocused;
1216#endif 1517#endif
1217 1518
1218 pointer_unblank (); 1519 pointer_unblank ();
1219 scr_recolour (); 1520 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} 1521}
1383 1522
1384/*----------------------------------------------------------------------*/ 1523/*----------------------------------------------------------------------*/
1385/* 1524/*
1386 * Run the command in a subprocess and return a file descriptor for the 1525 * Run the command in a subprocess and return a file descriptor for the
… …
1398 if (pty->pty >= 0) 1537 if (pty->pty >= 0)
1399 { 1538 {
1400 if (getfd_hook) 1539 if (getfd_hook)
1401 pty->pty = (*getfd_hook) (pty->pty); 1540 pty->pty = (*getfd_hook) (pty->pty);
1402 1541
1403 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1542 if (pty->pty < 0)
1404 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1543 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1405 } 1544 }
1406 } 1545 }
1407 else 1546 else
1408#endif 1547#endif
1409 if (!pty->get ()) 1548 if (!pty->get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411 1550
1412 int er; 1551 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552
1553 struct termios tio = def_tio;
1413 1554
1414#ifndef NO_BACKSPACE_KEY 1555#ifndef NO_BACKSPACE_KEY
1415 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1416 er = rs[Rs_backspace_key][0]; 1557 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1417 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1558 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1418 er = '\177'; /* the initial state anyway */ 1559 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1419 else
1420#endif 1560#endif
1421 er = -1;
1422 1561
1423 rxvt_get_ttymode (&tio, er);
1424 /* init terminal attributes */ 1562 /* init terminal attributes */
1425 cfsetospeed (&tio, BAUDRATE); 1563 cfsetospeed (&tio, BAUDRATE);
1426 cfsetispeed (&tio, BAUDRATE); 1564 cfsetispeed (&tio, BAUDRATE);
1427 tcsetattr (pty->tty, TCSANOW, &tio); 1565 tcsetattr (pty->tty, TCSANOW, &tio);
1428 pty->set_utf8_mode (enc_utf8); 1566 pty->set_utf8_mode (enc_utf8);
… …
1468 1606
1469 _exit (EXIT_FAILURE); 1607 _exit (EXIT_FAILURE);
1470 1608
1471 default: 1609 default:
1472 if (!option (Opt_utmpInhibit)) 1610 if (!option (Opt_utmpInhibit))
1611 {
1612#ifdef LOG_ONLY_ON_LOGIN
1613 bool login_shell = option (Opt_loginShell);
1614#else
1615 bool login_shell = true;
1616#endif
1473 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1617 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1618 }
1474 1619
1475 pty->close_tty (); 1620 pty->close_tty ();
1476 1621
1477 child_ev.start (cmd_pid); 1622 child_ev.start (cmd_pid);
1478 1623
… …
1503#elif defined (SRIOCSREDIR) 1648#elif defined (SRIOCSREDIR)
1504 int fd; 1649 int fd;
1505 1650
1506 fd = open (CONSOLE, O_WRONLY, 0); 1651 fd = open (CONSOLE, O_WRONLY, 0);
1507 if (fd >= 0) 1652 if (fd >= 0)
1508 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1653 {
1654 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1509 close (fd); 1655 close (fd);
1656 }
1510#endif /* SRIOCSREDIR */ 1657#endif /* SRIOCSREDIR */
1511 } 1658 }
1512 1659
1513 /* reset signals and spin off the command interpreter */ 1660 /* reset signals and spin off the command interpreter */
1514 signal (SIGINT, SIG_DFL); 1661 signal (SIGINT, SIG_DFL);
1515 signal (SIGQUIT, SIG_DFL); 1662 signal (SIGQUIT, SIG_DFL);
1516 signal (SIGCHLD, SIG_DFL); 1663 signal (SIGCHLD, SIG_DFL);
1517 signal (SIGHUP, SIG_DFL); 1664 signal (SIGHUP, SIG_DFL);
1518 signal (SIGPIPE, SIG_DFL); 1665 signal (SIGPIPE, SIG_DFL);
1519 /* 1666 /*
1520 * mimick login's behavior by disabling the job control signals 1667 * mimic login's behavior by disabling the job control signals
1521 * a shell that wants them can turn them back on 1668 * a shell that wants them can turn them back on
1522 */ 1669 */
1523#ifdef SIGTSTP 1670#ifdef SIGTSTP
1524 signal (SIGTSTP, SIG_IGN); 1671 signal (SIGTSTP, SIG_IGN);
1525 signal (SIGTTIN, SIG_IGN); 1672 signal (SIGTTIN, SIG_IGN);
1526 signal (SIGTTOU, SIG_IGN); 1673 signal (SIGTTOU, SIG_IGN);
1527#endif /* SIGTSTP */ 1674#endif /* SIGTSTP */
1528 1675
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 */ 1676 /* command interpreter path */
1535 if (argv) 1677 if (argv)
1536 { 1678 {
1537# ifdef DEBUG_CMD 1679# ifdef DEBUG_CMD
1538 int i; 1680 int i;
… …
1549 const char *argv0, *shell; 1691 const char *argv0, *shell;
1550 1692
1551 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1693 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1552 shell = "/bin/sh"; 1694 shell = "/bin/sh";
1553 1695
1554 argv0 = (const char *)rxvt_basename (shell); 1696 argv0 = rxvt_basename (shell);
1555 1697
1556 if (option (Opt_loginShell)) 1698 if (option (Opt_loginShell))
1557 { 1699 {
1558 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1700 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1559 1701

Diff Legend

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