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.258 by root, Sun Apr 26 01:59:53 2009 UTC vs.
Revision 1.328 by root, Thu Jun 7 16:04:31 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);
390 extract_resources (); 591 extract_resources ();
391 592
392#if XFT 593#if ENABLE_FRILLS
393 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
395#endif 598#endif
396
397 free (r_argv);
398 599
399 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
400 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
401 rs [i] = 0; 602 rs [i] = 0;
402 603
403#ifdef HAVE_AFTERIMAGE
404 set_application_name ((char *)rs[Rs_name]);
405 set_output_threshold (OUTPUT_LEVEL_WARNING);
406#endif
407
408#if ENABLE_PERL 604#if ENABLE_PERL
409 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
410 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
411 607
412 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
415 { 611 {
416 rxvt_perl.init (this); 612 rxvt_perl.init (this);
417 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
418 } 614 }
419#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
420 620
421 /* 621 /*
422 * set any defaults not already set 622 * set any defaults not already set
423 */ 623 */
424 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
448 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 648 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 650
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 652 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
653
654 if (rs[Rs_letterSpace])
655 letterSpace = atoi (rs[Rs_letterSpace]);
453#endif 656#endif
454 657
455#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
530 return cmd_argv; 733 return cmd_argv;
531} 734}
532 735
533/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
534void 737void
535rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
536{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
537 this->envv = envv; 744 this->envv = envv;
538 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
539 SET_R (this); 771 SET_R (this);
540 set_locale (""); 772 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
542 774
543 init_vars (); 775 init_vars ();
544
545 init_secondary ();
546 776
547 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
548 778
549#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
550 keyboard->register_done (); 780 keyboard->register_done ();
… …
559 if (chdir (path)) 789 if (chdir (path))
560 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
561 } 791 }
562 792
563 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
564 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
565 795
566 pty = ptytty::create (); 796 pty = ptytty::create ();
567 797
568 create_windows (argc, argv); 798 create_windows (argc, argv);
569 799
… …
577 807
578 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
579 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
580#ifdef HAVE_BG_PIXMAP 810#ifdef HAVE_BG_PIXMAP
581 { 811 {
582 bgPixmap.set_target (this); 812 bg_init ();
583 bgPixmap.invalidate ();
584 813
585#ifdef ENABLE_TRANSPARENCY 814#if ENABLE_TRANSPARENCY
586 if (option (Opt_transparent)) 815 if (option (Opt_transparent))
587 { 816 {
588 bgPixmap.set_transparent (); 817 bg_set_transparent ();
589 818
590#ifdef HAVE_AFTERIMAGE
591 if (rs [Rs_blurradius]) 819 if (rs [Rs_blurradius])
592 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 820 root_effects.set_blur (rs [Rs_blurradius]);
593#endif 821
594 if (ISSET_PIXCOLOR (Color_tint)) 822 if (ISSET_PIXCOLOR (Color_tint))
595 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 823 root_effects.set_tint (pix_colors_focused [Color_tint]);
596 824
597 if (rs [Rs_shade]) 825 if (rs [Rs_shade])
598 bgPixmap.set_shade (rs [Rs_shade]); 826 root_effects.set_shade (rs [Rs_shade]);
599 827
600 bgPixmap.set_root_pixmap (); 828 bg_set_root_pixmap ();
601 XSelectInput (dpy, display->root, PropertyChangeMask); 829 XSelectInput (dpy, display->root, PropertyChangeMask);
602 rootwin_ev.start (display, display->root); 830 rootwin_ev.start (display, display->root);
603 } 831 }
604#endif 832#endif
605
606#ifdef BG_IMAGE_FROM_FILE
607 if (rs[Rs_backgroundPixmap])
608 {
609 const char *p = rs[Rs_backgroundPixmap];
610
611 if ((p = strchr (p, ';')) != 0)
612 {
613 p++;
614 bgPixmap.set_geometry (p);
615 }
616 else
617 bgPixmap.set_defaultGeometry ();
618
619 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
620 if (!bgPixmap.window_position_sensitive ())
621 update_background ();
622 }
623#endif
624 } 833 }
625#endif 834#endif
626 835
627#if ENABLE_PERL 836#if ENABLE_PERL
628 rootwin_ev.start (display, display->root); 837 rootwin_ev.start (display, display->root);
629#endif 838#endif
630 839
631 set_colorfgbg (); 840 init_done = 1;
632 841
633 init_command (cmd_argv); 842 init_command (cmd_argv);
634
635 free (cmd_argv);
636 843
637 if (pty->pty >= 0) 844 if (pty->pty >= 0)
638 pty_ev.start (pty->pty, ev::READ); 845 pty_ev.start (pty->pty, ev::READ);
639 846
640 HOOK_INVOKE ((this, HOOK_START, DT_END)); 847 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
642#if ENABLE_XEMBED 849#if ENABLE_XEMBED
643 if (rs[Rs_embed]) 850 if (rs[Rs_embed])
644 { 851 {
645 long info[2] = { 0, XEMBED_MAPPED }; 852 long info[2] = { 0, XEMBED_MAPPED };
646 853
647 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 854 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
648 32, PropModeReplace, (unsigned char *)&info, 2); 855 32, PropModeReplace, (unsigned char *)&info, 2);
649 } 856 }
650#endif 857#endif
651 858
859#if HAVE_STARTUP_NOTIFICATION
860 SnDisplay *snDisplay;
861 SnLauncheeContext *snContext;
862
863 snDisplay = sn_display_new (dpy, NULL, NULL);
864 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
865
866 /* Tell the window manager that this window is part of the startup context */
867 if (snContext)
868 sn_launchee_context_setup_window (snContext, parent);
869#endif
870
652 XMapWindow (dpy, vt); 871 XMapWindow (dpy, vt);
653 XMapWindow (dpy, parent[0]); 872 XMapWindow (dpy, parent);
873
874#if HAVE_STARTUP_NOTIFICATION
875 if (snContext)
876 {
877 /* Mark the startup process as complete */
878 sn_launchee_context_complete (snContext);
879
880 sn_launchee_context_unref (snContext);
881 }
882
883 sn_display_unref (snDisplay);
884#endif
654 885
655 refresh_check (); 886 refresh_check ();
656} 887}
657 888
658/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
659void 890void
660rxvt_term::init_env () 891rxvt_term::init_env ()
661{ 892{
662 int i;
663 char *val; 893 char *val;
894 char *env_display;
895 char *env_windowid;
896 char *env_colorfgbg;
897 char *env_term;
664 898
665#ifdef DISPLAY_IS_IP 899#ifdef DISPLAY_IS_IP
666 /* Fixup display_name for export over pty to any interested terminal 900 /* Fixup display_name for export over pty to any interested terminal
667 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 901 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
668 * (for the first non-loopback interface) that we get from 902 * (for the first non-loopback interface) that we get from
… …
681 val = XDisplayString (dpy); 915 val = XDisplayString (dpy);
682 916
683 if (rs[Rs_display_name] == NULL) 917 if (rs[Rs_display_name] == NULL)
684 rs[Rs_display_name] = val; /* use broken `:0' value */ 918 rs[Rs_display_name] = val; /* use broken `:0' value */
685 919
686 i = strlen (val);
687 env_display = (char *)rxvt_malloc (i + 9); 920 env_display = (char *)rxvt_malloc (strlen (val) + 9);
688 921
689 sprintf (env_display, "DISPLAY=%s", val); 922 sprintf (env_display, "DISPLAY=%s", val);
690 923
924 env_windowid = (char *)rxvt_malloc (21);
691 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
692 926
693 /* add entries to the environment: 927 /* add entries to the environment:
694 * @ DISPLAY: in case we started with -display 928 * @ DISPLAY: in case we started with -display
695 * @ WINDOWID: X window id number of the window 929 * @ WINDOWID: X window id number of the window
696 * @ COLORTERM: terminal sub-name and also indicates its color 930 * @ COLORTERM: terminal sub-name and also indicates its color
… …
699 * @ COLORFGBG: fg;bg color codes 933 * @ COLORFGBG: fg;bg color codes
700 */ 934 */
701 putenv (env_display); 935 putenv (env_display);
702 putenv (env_windowid); 936 putenv (env_windowid);
703 937
704 if (env_colorfgbg) 938 env_colorfgbg = get_colorfgbg ();
705 putenv (env_colorfgbg); 939 putenv (env_colorfgbg);
706 940
707#ifdef RXVT_TERMINFO 941#ifdef RXVT_TERMINFO
708 putenv ("TERMINFO=" RXVT_TERMINFO); 942 putenv ("TERMINFO=" RXVT_TERMINFO);
709#endif 943#endif
710 944
… …
729 unsetenv ("TERMCAP"); /* terminfo should be okay */ 963 unsetenv ("TERMCAP"); /* terminfo should be okay */
730#endif /* HAVE_UNSETENV */ 964#endif /* HAVE_UNSETENV */
731} 965}
732 966
733/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
734/*
735 * This is more or less stolen straight from XFree86 xterm.
736 * This should support all European type languages.
737 */
738void 968void
739rxvt_term::set_locale (const char *locale) 969rxvt_term::set_locale (const char *locale)
740{ 970{
741 set_environ (envv); 971 set_environ (envv);
742 972
743#if HAVE_XSETLOCALE || HAVE_SETLOCALE
744 free (this->locale); 973 free (this->locale);
745 this->locale = setlocale (LC_CTYPE, locale); 974 this->locale = setlocale (LC_CTYPE, locale);
746 975
747 if (!this->locale) 976 if (!this->locale)
748 { 977 {
… …
759 988
760 989
761 this->locale = strdup (this->locale); 990 this->locale = strdup (this->locale);
762 SET_LOCALE (this->locale); 991 SET_LOCALE (this->locale);
763 mbstate.reset (); 992 mbstate.reset ();
764#endif
765 993
766#if HAVE_NL_LANGINFO 994#if HAVE_NL_LANGINFO
767 char *codeset = strdup (nl_langinfo (CODESET)); 995 char *codeset = nl_langinfo (CODESET);
768 // /^UTF.?8/i 996 // /^UTF.?8/i
769 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
770 && (codeset[1] == 'T' || codeset[1] == 't') 998 && (codeset[1] == 'T' || codeset[1] == 't')
771 && (codeset[2] == 'F' || codeset[2] == 'f') 999 && (codeset[2] == 'F' || codeset[2] == 'f')
772 && (codeset[3] == '8' || codeset[4] == '8'); 1000 && (codeset[3] == '8' || codeset[4] == '8');
773 free (codeset);
774#else 1001#else
775 enc_utf8 = 0; 1002 enc_utf8 = 0;
776#endif 1003#endif
777} 1004}
778 1005
779void 1006void
780rxvt_term::init_xlocale () 1007rxvt_term::init_xlocale ()
781{ 1008{
782 set_environ (envv); 1009 set_environ (envv);
783 1010
784#ifdef USE_XIM 1011#if USE_XIM
785 if (!locale) 1012 if (!locale)
786 rxvt_warn ("setting locale failed, working without locale support.\n"); 1013 rxvt_warn ("setting locale failed, continuing without locale support.\n");
787 else 1014 else
788 { 1015 {
789 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1016 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
790 1017
791 if (!XSupportsLocale ()) 1018 if (!XSupportsLocale ())
792 { 1019 {
793 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1020 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
794 return; 1021 return;
795 } 1022 }
796 1023
797 im_ev.start (display); 1024 im_ev.start (display);
798 1025
… …
947/*----------------------------------------------------------------------*/ 1174/*----------------------------------------------------------------------*/
948/* color aliases, fg/bg bright-bold */ 1175/* color aliases, fg/bg bright-bold */
949void 1176void
950rxvt_term::color_aliases (int idx) 1177rxvt_term::color_aliases (int idx)
951{ 1178{
952 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1179 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
953 { 1180 {
954 int i = atoi (rs[Rs_color + idx]); 1181 int i = atoi (rs[Rs_color + idx]);
955 1182
956 if (i >= 8 && i <= 15) 1183 if (i >= 8 && i <= 15)
957 /* bright colors */ 1184 /* bright colors */
… …
1049 1276
1050 if (i) 1277 if (i)
1051 ModMetaMask = modmasks[i - 1]; 1278 ModMetaMask = modmasks[i - 1];
1052} 1279}
1053 1280
1281void
1282rxvt_term::set_icon (const char *file)
1283{
1284#if HAVE_PIXBUF
1285 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1286 if (!pixbuf)
1287 {
1288 rxvt_warn ("Loading image icon failed, continuing without.\n");
1289 return;
1290 }
1291
1292 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1293 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1294
1295 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1296 {
1297 rxvt_warn ("Icon image too big, continuing without.\n");
1298 g_object_unref (pixbuf);
1299 return;
1300 }
1301
1302 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1303 {
1304 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1305 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1306 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1307
1308 buffer [0] = w;
1309 buffer [1] = h;
1310 for (int i = 0; i < h; i++)
1311 {
1312 for (int j = 0; j < w; j++)
1313 {
1314 unsigned char *pixel = row + j * channels;
1315 long value;
1316
1317 if (channels == 4)
1318 value = pixel[3];
1319 else
1320 value = (unsigned char)0x00ff;
1321
1322 value = (value << 8) + pixel[0];
1323 value = (value << 8) + pixel[1];
1324 value = (value << 8) + pixel[2];
1325 buffer[(i * w + j) + 2] = value;
1326 }
1327
1328 row += rowstride;
1329 }
1330
1331 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1332 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1333 free (buffer);
1334 }
1335 else
1336 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1337
1338 g_object_unref (pixbuf);
1339#endif
1340}
1341
1054/*----------------------------------------------------------------------*/ 1342/*----------------------------------------------------------------------*/
1055/* rxvt_Create_Windows () - Open and map the window */ 1343/* Open and map the window */
1056void 1344void
1057rxvt_term::create_windows (int argc, const char *const *argv) 1345rxvt_term::create_windows (int argc, const char *const *argv)
1058{ 1346{
1059 XClassHint classHint; 1347 XClassHint classHint;
1060 XWMHints wmHint; 1348 XWMHints wmHint;
… …
1106 } 1394 }
1107#endif 1395#endif
1108 1396
1109 window_calc (0, 0); 1397 window_calc (0, 0);
1110 1398
1111 /* sub-window placement & size in rxvt_resize_subwindows () */ 1399 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1112 attributes.background_pixel = pix_colors_focused [Color_border]; 1400 attributes.background_pixel = pix_colors_focused [Color_border];
1113 attributes.border_pixel = pix_colors_focused [Color_border]; 1401 attributes.border_pixel = pix_colors_focused [Color_border];
1114 attributes.colormap = cmap; 1402 attributes.colormap = cmap;
1115 1403
1116 top = XCreateWindow (dpy, parent, 1404 top = XCreateWindow (dpy, parent,
… …
1119 ext_bwidth, 1407 ext_bwidth,
1120 depth, InputOutput, visual, 1408 depth, InputOutput, visual,
1121 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1409 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1122 &attributes); 1410 &attributes);
1123 1411
1124 this->parent[0] = top; 1412 this->parent = top;
1125
1126 old_width = szHint.width;
1127 old_height = szHint.height;
1128 1413
1129 set_title (rs [Rs_title]); 1414 set_title (rs [Rs_title]);
1130 set_icon_name (rs [Rs_iconName]); 1415 set_icon_name (rs [Rs_iconName]);
1131 1416
1132 classHint.res_name = (char *)rs[Rs_name]; 1417 classHint.res_name = (char *)rs[Rs_name];
… …
1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1422 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1138 wmHint.window_group = top; 1423 wmHint.window_group = top;
1139 1424
1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1141 &szHint, &wmHint, &classHint); 1426 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH 1427#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE
1144 /* 1428 /*
1145 * set up icon hint 1429 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1430 * rs [Rs_iconfile] is path to icon
1147 */ 1431 */
1148 1432
1149 if (rs [Rs_iconfile]) 1433 if (rs [Rs_iconfile])
1150 { 1434 {
1151 init_asv (); 1435 set_icon (rs [Rs_iconfile]);
1152
1153 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1154 if (asv && im)
1155 {
1156 int w = im->width;
1157 int h = im->height;
1158 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1159 ASImage *result = scale_asimage (asv, im,
1160 w, h, ASA_ARGB32,
1161 100, ASIMAGE_QUALITY_DEFAULT);
1162 destroy_asimage (&im);
1163
1164 if (buffer && result)
1165 {
1166 ARGB32 *asbuf = result->alt.argb32;
1167 buffer [0] = w;
1168 buffer [1] = h;
1169
1170 for (unsigned int i = 0; i < w * h; ++i)
1171 buffer [i + 2] = asbuf [i];
1172
1173 destroy_asimage (&result);
1174 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1175 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1176 free (buffer);
1177 }
1178 else
1179 {
1180 if (!buffer)
1181 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1182
1183 if (!result)
1184 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1185 }
1186 }
1187 else
1188 rxvt_warn ("Loading image icon failed, continuing without.\n");
1189 } 1436 }
1190# endif
1191#endif 1437#endif
1192 1438
1193#if ENABLE_FRILLS 1439#if ENABLE_FRILLS
1194 if (mwmhints.flags) 1440 if (mwmhints.flags)
1195 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1441 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1201#if ENABLE_EWMH 1447#if ENABLE_EWMH
1202 xa[XA_NET_WM_PING], 1448 xa[XA_NET_WM_PING],
1203#endif 1449#endif
1204 }; 1450 };
1205 1451
1206 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1452 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1207 1453
1208#if ENABLE_FRILLS 1454#if ENABLE_FRILLS
1209 if (rs[Rs_transient_for]) 1455 if (rs[Rs_transient_for])
1210 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1211#endif 1457#endif
… …
1234 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1235 1481
1236 /* the vt window */ 1482 /* the vt window */
1237 vt = XCreateSimpleWindow (dpy, top, 1483 vt = XCreateSimpleWindow (dpy, top,
1238 window_vt_x, window_vt_y, 1484 window_vt_x, window_vt_y,
1239 width, height, 1485 vt_width, vt_height,
1240 0, 1486 0,
1241 pix_colors_focused[Color_fg], 1487 pix_colors_focused[Color_fg],
1242 pix_colors_focused[Color_bg]); 1488 pix_colors_focused[Color_bg]);
1243 1489
1244 attributes.bit_gravity = NorthWestGravity; 1490 attributes.bit_gravity = NorthWestGravity;
… …
1272 pix_colors = pix_colors_unfocused; 1518 pix_colors = pix_colors_unfocused;
1273#endif 1519#endif
1274 1520
1275 pointer_unblank (); 1521 pointer_unblank ();
1276 scr_recolour (); 1522 scr_recolour ();
1277}
1278
1279/* ------------------------------------------------------------------------- *
1280 * GET TTY CURRENT STATE *
1281 * ------------------------------------------------------------------------- */
1282void
1283rxvt_get_ttymode (struct termios *tio, int erase)
1284{
1285 /*
1286 * standard System V termios interface
1287 */
1288 if (tcgetattr (STDIN_FILENO, tio) < 0)
1289 {
1290 // return error - use system defaults,
1291 // where possible, and zero elsewhere
1292 memset (tio, 0, sizeof (struct termios));
1293
1294 tio->c_cc[VINTR] = CINTR;
1295 tio->c_cc[VQUIT] = CQUIT;
1296 tio->c_cc[VERASE] = CERASE;
1297#ifdef VERASE2
1298 tio->c_cc[VERASE2] = CERASE2;
1299#endif
1300 tio->c_cc[VKILL] = CKILL;
1301 tio->c_cc[VSTART] = CSTART;
1302 tio->c_cc[VSTOP] = CSTOP;
1303 tio->c_cc[VSUSP] = CSUSP;
1304# ifdef VDSUSP
1305 tio->c_cc[VDSUSP] = CDSUSP;
1306# endif
1307# ifdef VREPRINT
1308 tio->c_cc[VREPRINT] = CRPRNT;
1309# endif
1310# ifdef VDISCRD
1311 tio->c_cc[VDISCRD] = CFLUSH;
1312# endif
1313# ifdef VWERSE
1314 tio->c_cc[VWERSE] = CWERASE;
1315# endif
1316# ifdef VLNEXT
1317 tio->c_cc[VLNEXT] = CLNEXT;
1318# endif
1319 }
1320
1321 tio->c_cc[VEOF] = CEOF;
1322 tio->c_cc[VEOL] = VDISABLE;
1323# ifdef VEOL2
1324 tio->c_cc[VEOL2] = VDISABLE;
1325# endif
1326# ifdef VSWTC
1327 tio->c_cc[VSWTC] = VDISABLE;
1328# endif
1329# ifdef VSWTCH
1330 tio->c_cc[VSWTCH] = VDISABLE;
1331# endif
1332# if VMIN != VEOF
1333 tio->c_cc[VMIN] = 1;
1334# endif
1335# if VTIME != VEOL
1336 tio->c_cc[VTIME] = 0;
1337# endif
1338
1339 if (erase != -1)
1340 tio->c_cc[VERASE] = (char)erase;
1341
1342 /* input modes */
1343 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1344# ifdef IMAXBEL
1345 | IMAXBEL
1346# endif
1347 | IXON);
1348
1349 /* output modes */
1350 tio->c_oflag = (OPOST | ONLCR);
1351
1352 /* control modes */
1353 tio->c_cflag = (CS8 | CREAD);
1354
1355 /* line discipline modes */
1356 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1357# if defined (ECHOCTL) && defined (ECHOKE)
1358 | ECHOCTL | ECHOKE
1359# endif
1360 | ECHOE | ECHOK);
1361
1362 /*
1363 * Debugging
1364 */
1365#ifdef DEBUG_TTYMODE
1366 /* c_iflag bits */
1367 fprintf (stderr, "Input flags\n");
1368
1369 /* cpp token stringize doesn't work on all machines <sigh> */
1370# define FOO(flag,name) \
1371 if ((tio->c_iflag) & flag) \
1372 fprintf (stderr, "%s ", name)
1373
1374 /* c_iflag bits */
1375 FOO (IGNBRK, "IGNBRK");
1376 FOO (BRKINT, "BRKINT");
1377 FOO (IGNPAR, "IGNPAR");
1378 FOO (PARMRK, "PARMRK");
1379 FOO (INPCK, "INPCK");
1380 FOO (ISTRIP, "ISTRIP");
1381 FOO (INLCR, "INLCR");
1382 FOO (IGNCR, "IGNCR");
1383 FOO (ICRNL, "ICRNL");
1384 FOO (IXON, "IXON");
1385 FOO (IXOFF, "IXOFF");
1386# ifdef IUCLC
1387 FOO (IUCLC, "IUCLC");
1388# endif
1389# ifdef IXANY
1390 FOO (IXANY, "IXANY");
1391# endif
1392# ifdef IMAXBEL
1393 FOO (IMAXBEL, "IMAXBEL");
1394# endif
1395
1396 fprintf (stderr, "\n");
1397
1398# undef FOO
1399# define FOO(entry, name) \
1400 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1401
1402 FOO (VINTR, "VINTR");
1403 FOO (VQUIT, "VQUIT");
1404 FOO (VERASE, "VERASE");
1405 FOO (VKILL, "VKILL");
1406 FOO (VEOF, "VEOF");
1407 FOO (VEOL, "VEOL");
1408# ifdef VEOL2
1409 FOO (VEOL2, "VEOL2");
1410# endif
1411# ifdef VSWTC
1412 FOO (VSWTC, "VSWTC");
1413# endif
1414# ifdef VSWTCH
1415 FOO (VSWTCH, "VSWTCH");
1416# endif
1417 FOO (VSTART, "VSTART");
1418 FOO (VSTOP, "VSTOP");
1419 FOO (VSUSP, "VSUSP");
1420# ifdef VDSUSP
1421 FOO (VDSUSP, "VDSUSP");
1422# endif
1423# ifdef VREPRINT
1424 FOO (VREPRINT, "VREPRINT");
1425# endif
1426# ifdef VDISCRD
1427 FOO (VDISCRD, "VDISCRD");
1428# endif
1429# ifdef VWERSE
1430 FOO (VWERSE, "VWERSE");
1431# endif
1432# ifdef VLNEXT
1433 FOO (VLNEXT, "VLNEXT");
1434# endif
1435
1436 fprintf (stderr, "\n");
1437# undef FOO
1438#endif /* DEBUG_TTYMODE */
1439} 1523}
1440 1524
1441/*----------------------------------------------------------------------*/ 1525/*----------------------------------------------------------------------*/
1442/* 1526/*
1443 * Run the command in a subprocess and return a file descriptor for the 1527 * Run the command in a subprocess and return a file descriptor for the
… …
1455 if (pty->pty >= 0) 1539 if (pty->pty >= 0)
1456 { 1540 {
1457 if (getfd_hook) 1541 if (getfd_hook)
1458 pty->pty = (*getfd_hook) (pty->pty); 1542 pty->pty = (*getfd_hook) (pty->pty);
1459 1543
1460 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1544 if (pty->pty < 0)
1461 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1545 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1462 } 1546 }
1463 } 1547 }
1464 else 1548 else
1465#endif 1549#endif
1466 if (!pty->get ()) 1550 if (!pty->get ())
1467 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1468 1552
1469 int er; 1553 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1554
1555 struct termios tio = def_tio;
1470 1556
1471#ifndef NO_BACKSPACE_KEY 1557#ifndef NO_BACKSPACE_KEY
1472 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1558 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1473 er = rs[Rs_backspace_key][0]; 1559 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1474 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1560 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1475 er = '\177'; /* the initial state anyway */ 1561 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1476 else
1477#endif 1562#endif
1478 er = -1;
1479 1563
1480 rxvt_get_ttymode (&tio, er);
1481 /* init terminal attributes */ 1564 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE); 1565 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE); 1566 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio); 1567 tcsetattr (pty->tty, TCSANOW, &tio);
1485 pty->set_utf8_mode (enc_utf8); 1568 pty->set_utf8_mode (enc_utf8);
… …
1525 1608
1526 _exit (EXIT_FAILURE); 1609 _exit (EXIT_FAILURE);
1527 1610
1528 default: 1611 default:
1529 if (!option (Opt_utmpInhibit)) 1612 if (!option (Opt_utmpInhibit))
1613 {
1614#ifdef LOG_ONLY_ON_LOGIN
1615 bool login_shell = option (Opt_loginShell);
1616#else
1617 bool login_shell = true;
1618#endif
1530 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1619 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1620 }
1531 1621
1532 pty->close_tty (); 1622 pty->close_tty ();
1533 1623
1534 child_ev.start (cmd_pid); 1624 child_ev.start (cmd_pid);
1535 1625
… …
1560#elif defined (SRIOCSREDIR) 1650#elif defined (SRIOCSREDIR)
1561 int fd; 1651 int fd;
1562 1652
1563 fd = open (CONSOLE, O_WRONLY, 0); 1653 fd = open (CONSOLE, O_WRONLY, 0);
1564 if (fd >= 0) 1654 if (fd >= 0)
1565 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1655 {
1656 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1566 close (fd); 1657 close (fd);
1658 }
1567#endif /* SRIOCSREDIR */ 1659#endif /* SRIOCSREDIR */
1568 } 1660 }
1569 1661
1570 /* reset signals and spin off the command interpreter */ 1662 /* reset signals and spin off the command interpreter */
1571 signal (SIGINT, SIG_DFL); 1663 signal (SIGINT, SIG_DFL);
1572 signal (SIGQUIT, SIG_DFL); 1664 signal (SIGQUIT, SIG_DFL);
1573 signal (SIGCHLD, SIG_DFL); 1665 signal (SIGCHLD, SIG_DFL);
1574 signal (SIGHUP, SIG_DFL); 1666 signal (SIGHUP, SIG_DFL);
1575 signal (SIGPIPE, SIG_DFL); 1667 signal (SIGPIPE, SIG_DFL);
1576 /* 1668 /*
1577 * mimick login's behavior by disabling the job control signals 1669 * mimic login's behavior by disabling the job control signals
1578 * a shell that wants them can turn them back on 1670 * a shell that wants them can turn them back on
1579 */ 1671 */
1580#ifdef SIGTSTP 1672#ifdef SIGTSTP
1581 signal (SIGTSTP, SIG_IGN); 1673 signal (SIGTSTP, SIG_IGN);
1582 signal (SIGTTIN, SIG_IGN); 1674 signal (SIGTTIN, SIG_IGN);

Diff Legend

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