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.245 by ayin, Sun Jan 27 16:52:13 2008 UTC vs.
Revision 1.313 by sf-exg, Sat Jan 7 17:48:56 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.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 183
184#if !USE_256_COLORS
179 // 88 xterm colours 185 // 88 xterm colours
180 "rgb:00/00/00", 186 "rgb:00/00/00",
181 "rgb:00/00/8b", 187 "rgb:00/00/8b",
182 "rgb:00/00/cd", 188 "rgb:00/00/cd",
183 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
476 "rgb:08/08/08",
477 "rgb:12/12/12",
478 "rgb:1c/1c/1c",
479 "rgb:26/26/26",
480 "rgb:30/30/30",
481 "rgb:3a/3a/3a",
482 "rgb:44/44/44",
483 "rgb:4e/4e/4e",
484 "rgb:58/58/58",
485 "rgb:62/62/62",
486 "rgb:6c/6c/6c",
487 "rgb:76/76/76",
488 "rgb:80/80/80",
489 "rgb:8a/8a/8a",
490 "rgb:94/94/94",
491 "rgb:9e/9e/9e",
492 "rgb:a8/a8/a8",
493 "rgb:b2/b2/b2",
494 "rgb:bc/bc/bc",
495 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0",
497 "rgb:da/da/da",
498 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee",
500#endif
252 501
253#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 515#if ENABLE_FRILLS
267 NULL, // Color_underline 516 NULL, // Color_underline
268#endif 517#endif
269#ifdef OPTION_HC 518#ifdef OPTION_HC
270 NULL, 519 NULL,
520 NULL,
271#endif 521#endif
272#ifdef HAVE_SCROLLBARS
273 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
274#endif
275#ifdef RXVT_SCROLLBAR 523#ifdef RXVT_SCROLLBAR
276 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
277#endif 525#endif
278#if ENABLE_TRANSPARENCY 526#if ENABLE_TRANSPARENCY
279 NULL, 527 NULL,
… …
295 ncol = 80; 543 ncol = 80;
296 nrow = 24; 544 nrow = 24;
297 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
298 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
299 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
300 saveLines = SAVELINES; 549 saveLines = SAVELINES;
301 550
302 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
303 552
304 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
… …
309 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
310 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
311 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
312 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
313 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 565 set_option (Opt_buffered);
316}
317
318static void
319init_secondary ()
320{
321 int i;
322
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 dup2 (STDERR_FILENO, STDIN_FILENO);
326 }
327 else if (i != STDIN_FILENO)
328 {
329 dup2 (i, STDIN_FILENO);
330 close (i);
331 }
332
333 dup2 (STDERR_FILENO, STDOUT_FILENO);
334} 566}
335 567
336/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
337const char ** 569const char **
338rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
339{ 571{
340 int i, r_argc; 572 int i;
341 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
342
343 /*
344 * Look for -e option. Find => split and make cmd_argv[] of command args
345 */
346 for (r_argc = 0; r_argc < argc; r_argc++)
347 if (!strcmp (argv[r_argc], "-e"))
348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
363
364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
365
366 for (i = 0; i < r_argc; i++)
367 r_argv[i] = (const char *)argv[i];
368
369 r_argv[i] = NULL;
370 574
371 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
372 576
373 /* 577 /*
374 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
375 */ 579 */
376 580
377 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
378 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
379 583
380 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
381 585
382 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
385 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
386 }
387 588
388 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
389 xa = display->xa; 590 xa = display->xa;
390 591
391 set (display); 592 set (display);
… …
394#if XFT 595#if XFT
395 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
396 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
397#endif 598#endif
398 599
399#ifdef HAVE_AFTERIMAGE
400 set_application_name ((char*)rs[Rs_name]);
401 set_output_threshold (OUTPUT_LEVEL_WARNING);
402 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
403#endif
404 free (r_argv);
405
406 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
407 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
408 rs [i] = 0; 602 rs [i] = 0;
409 603
410#if ENABLE_PERL 604#if ENABLE_PERL
… …
417 { 611 {
418 rxvt_perl.init (this); 612 rxvt_perl.init (this);
419 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
420 } 614 }
421#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 ();
422 620
423 /* 621 /*
424 * set any defaults not already set 622 * set any defaults not already set
425 */ 623 */
426 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
427 { 625 {
428 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
429 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
430 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
431 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
432 } 631 }
433 else 632 else
434 { 633 {
435 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
436 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
437 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
438 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
439 } 639 }
440 640
441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 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;
… …
460#endif 663#endif
461 664
462 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
463 if (!saveLines) 666 if (!saveLines)
464 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
465
466#ifdef PRINTPIPE
467 if (!rs[Rs_print_pipe])
468 rs[Rs_print_pipe] = PRINTPIPE;
469#endif
470 668
471 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
472 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
473 671
474#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
… …
487# else 685# else
488 rs[Rs_delete_key] = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
489# endif 687# endif
490#endif 688#endif
491 689
492#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
494#endif
495 691
496#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
497 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
498 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
499 { 695 {
… …
537 return cmd_argv; 733 return cmd_argv;
538} 734}
539 735
540/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
541void 737void
542rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
543{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
544 this->envv = envv; 744 this->envv = envv;
545 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{
546 SET_R (this); 771 SET_R (this);
547 set_locale (""); 772 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
549 774
550 init_vars (); 775 init_vars ();
551
552 init_secondary ();
553 776
554 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
555 778
556#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
557 keyboard->register_done (); 780 keyboard->register_done ();
558#endif 781#endif
559 782
560#ifdef HAVE_SCROLLBARS 783 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty
785 {
786 if (*path != '/')
787 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
788
789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 }
792
561 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
563#endif
564 795
565 pty = ptytty::create (); 796 pty = ptytty::create ();
566 797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
807
567 create_windows (argc, argv); 808 create_windows (argc, argv);
568 809
569 init_xlocale (); 810 init_xlocale ();
570 811
571 scr_reset (); // initialize screen 812 scr_poweron (); // initialize screen
572 813
573#if 0 814#if 0
574 XSynchronize (dpy, True); 815 XSynchronize (dpy, True);
575#endif 816#endif
576 817
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
580#endif
581#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
582 { 821 {
583 bgPixmap.set_target (this); 822 bg_init ();
584 bgPixmap.invalidate ();
585 823
586#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
587 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
588 { 826 {
589 bgPixmap.set_transparent (); 827 bg_set_transparent ();
590 828
591#ifdef HAVE_AFTERIMAGE
592 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
593 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
594#endif 831
595 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
596 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
597 834
598 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
599 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
600 837
601 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
602 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
603 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
604 } 841 }
605#endif 842#endif
606 843
607#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
608 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
609 {
610 const char *p = rs[Rs_backgroundPixmap];
611
612 if ((p = strchr (p, ';')) != 0)
613 {
614 p++;
615 bgPixmap.set_geometry (p);
616 }
617 else
618 bgPixmap.set_defaultGeometry ();
619
620 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
621 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
622 update_background (); 848 update_background ();
623 }
624#endif 849#endif
625 } 850 }
626#endif 851#endif
627 852
628#if ENABLE_PERL 853#if ENABLE_PERL
… …
631 856
632 set_colorfgbg (); 857 set_colorfgbg ();
633 858
634 init_command (cmd_argv); 859 init_command (cmd_argv);
635 860
636 free (cmd_argv);
637
638 if (pty->pty >= 0) 861 if (pty->pty >= 0)
639 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
640 863
641 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
642 865
643#if ENABLE_XEMBED 866#if ENABLE_XEMBED
644 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
645 { 868 {
646 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
647 870
648 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
649 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
650 } 873 }
651#endif 874#endif
652 875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
653 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
654 XMapWindow (dpy, parent[0]); 889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
655 902
656 refresh_check (); 903 refresh_check ();
657} 904}
658 905
659/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
660void 907void
661rxvt_term::init_env () 908rxvt_term::init_env ()
662{ 909{
663 int i;
664 char *val; 910 char *val;
665 911
666#ifdef DISPLAY_IS_IP 912#ifdef DISPLAY_IS_IP
667 /* Fixup display_name for export over pty to any interested terminal 913 /* Fixup display_name for export over pty to any interested terminal
668 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 914 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
682 val = XDisplayString (dpy); 928 val = XDisplayString (dpy);
683 929
684 if (rs[Rs_display_name] == NULL) 930 if (rs[Rs_display_name] == NULL)
685 rs[Rs_display_name] = val; /* use broken `:0' value */ 931 rs[Rs_display_name] = val; /* use broken `:0' value */
686 932
687 i = strlen (val);
688 env_display = (char *)rxvt_malloc (i + 9); 933 env_display = (char *)rxvt_malloc (strlen (val) + 9);
689 934
690 sprintf (env_display, "DISPLAY=%s", val); 935 sprintf (env_display, "DISPLAY=%s", val);
691 936
692 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
693 938
694 /* add entries to the environment: 939 /* add entries to the environment:
695 * @ DISPLAY: in case we started with -display 940 * @ DISPLAY: in case we started with -display
696 * @ WINDOWID: X window id number of the window 941 * @ WINDOWID: X window id number of the window
697 * @ COLORTERM: terminal sub-name and also indicates its color 942 * @ COLORTERM: terminal sub-name and also indicates its color
… …
730 unsetenv ("TERMCAP"); /* terminfo should be okay */ 975 unsetenv ("TERMCAP"); /* terminfo should be okay */
731#endif /* HAVE_UNSETENV */ 976#endif /* HAVE_UNSETENV */
732} 977}
733 978
734/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
735/*
736 * This is more or less stolen straight from XFree86 xterm.
737 * This should support all European type languages.
738 */
739void 980void
740rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
741{ 982{
742 set_environ (envv); 983 set_environ (envv);
743 984
… …
763 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
764 mbstate.reset (); 1005 mbstate.reset ();
765#endif 1006#endif
766 1007
767#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
768 char *codeset = strdup (nl_langinfo (CODESET)); 1009 char *codeset = nl_langinfo (CODESET);
769 // /^UTF.?8/i 1010 // /^UTF.?8/i
770 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
771 && (codeset[1] == 'T' || codeset[1] == 't') 1012 && (codeset[1] == 'T' || codeset[1] == 't')
772 && (codeset[2] == 'F' || codeset[2] == 'f') 1013 && (codeset[2] == 'F' || codeset[2] == 'f')
773 && (codeset[3] == '8' || codeset[4] == '8'); 1014 && (codeset[3] == '8' || codeset[4] == '8');
774 free (codeset);
775#else 1015#else
776 enc_utf8 = 0; 1016 enc_utf8 = 0;
777#endif 1017#endif
778} 1018}
779 1019
… …
782{ 1022{
783 set_environ (envv); 1023 set_environ (envv);
784 1024
785#ifdef USE_XIM 1025#ifdef USE_XIM
786 if (!locale) 1026 if (!locale)
787 rxvt_warn ("setting locale failed, working without locale support.\n"); 1027 rxvt_warn ("setting locale failed, continuing without locale support.\n");
788 else 1028 else
789 { 1029 {
790 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
791 1031
792 if (!XSupportsLocale ()) 1032 if (!XSupportsLocale ())
793 { 1033 {
794 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1034 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
795 return; 1035 return;
796 } 1036 }
797 1037
798 im_ev.start (display); 1038 im_ev.start (display);
799 1039
… …
840 run_command (argv); 1080 run_command (argv);
841} 1081}
842 1082
843/*----------------------------------------------------------------------*/ 1083/*----------------------------------------------------------------------*/
844void 1084void
845rxvt_term::Get_Colours () 1085rxvt_term::get_colours ()
846{ 1086{
847 int i; 1087 int i;
848 1088
849#ifdef OFF_FOCUS_FADING 1089#ifdef OFF_FOCUS_FADING
850 pix_colors = pix_colors_focused; 1090 pix_colors = pix_colors_focused;
… …
1050 1290
1051 if (i) 1291 if (i)
1052 ModMetaMask = modmasks[i - 1]; 1292 ModMetaMask = modmasks[i - 1];
1053} 1293}
1054 1294
1295void
1296rxvt_term::set_icon (const char *file)
1297{
1298#ifdef HAVE_AFTERIMAGE
1299 init_asv ();
1300
1301 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1302 if (!im)
1303 {
1304 rxvt_warn ("Loading image icon failed, continuing without.\n");
1305 return;
1306 }
1307
1308 unsigned int w = im->width;
1309 unsigned int h = im->height;
1310
1311 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1312 {
1313 rxvt_warn ("Icon image too big, continuing without.\n");
1314 destroy_asimage (&im);
1315 return;
1316 }
1317
1318 ASImage *result = scale_asimage (asv, im,
1319 w, h, ASA_ARGB32,
1320 100, ASIMAGE_QUALITY_DEFAULT);
1321 destroy_asimage (&im);
1322
1323 if (!result)
1324 {
1325 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1326 return;
1327 }
1328
1329 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1330 if (buffer)
1331 {
1332 ARGB32 *asbuf = result->alt.argb32;
1333 buffer [0] = w;
1334 buffer [1] = h;
1335
1336 for (unsigned int i = 0; i < w * h; ++i)
1337 buffer [i + 2] = asbuf [i];
1338
1339 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1340 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1341 free (buffer);
1342 }
1343 else
1344 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1345
1346 destroy_asimage (&result);
1347#endif
1348
1349#ifdef HAVE_PIXBUF
1350 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf)
1352 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n");
1354 return;
1355 }
1356
1357 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1358 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1359
1360 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1361 {
1362 rxvt_warn ("Icon image too big, continuing without.\n");
1363 g_object_unref (pixbuf);
1364 return;
1365 }
1366
1367 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1368 {
1369 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1370 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1371 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1372
1373 buffer [0] = w;
1374 buffer [1] = h;
1375 for (int i = 0; i < h; i++)
1376 {
1377 for (int j = 0; j < w; j++)
1378 {
1379 unsigned char *pixel = row + j * channels;
1380 long value;
1381
1382 if (channels == 4)
1383 value = pixel[3];
1384 else
1385 value = (unsigned char)0x00ff;
1386
1387 value = (value << 8) + pixel[0];
1388 value = (value << 8) + pixel[1];
1389 value = (value << 8) + pixel[2];
1390 buffer[(i * w + j) + 2] = value;
1391 }
1392
1393 row += rowstride;
1394 }
1395
1396 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1397 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1398 free (buffer);
1399 }
1400 else
1401 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1402
1403 g_object_unref (pixbuf);
1404#endif
1405}
1406
1055/*----------------------------------------------------------------------*/ 1407/*----------------------------------------------------------------------*/
1056/* rxvt_Create_Windows () - Open and map the window */ 1408/* Open and map the window */
1057void 1409void
1058rxvt_term::create_windows (int argc, const char *const *argv) 1410rxvt_term::create_windows (int argc, const char *const *argv)
1059{ 1411{
1060 XClassHint classHint; 1412 XClassHint classHint;
1061 XWMHints wmHint; 1413 XWMHints wmHint;
… …
1067 Window top, parent; 1419 Window top, parent;
1068 1420
1069 dLocal (Display *, dpy); 1421 dLocal (Display *, dpy);
1070 1422
1071 /* grab colors before netscape does */ 1423 /* grab colors before netscape does */
1072 Get_Colours (); 1424 get_colours ();
1073 1425
1074 if (!set_fonts ()) 1426 if (!set_fonts ())
1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1427 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1076 1428
1077 parent = display->root; 1429 parent = display->root;
… …
1107 } 1459 }
1108#endif 1460#endif
1109 1461
1110 window_calc (0, 0); 1462 window_calc (0, 0);
1111 1463
1112 /* sub-window placement & size in rxvt_resize_subwindows () */ 1464 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1113 attributes.background_pixel = pix_colors_focused [Color_border]; 1465 attributes.background_pixel = pix_colors_focused [Color_border];
1114 attributes.border_pixel = pix_colors_focused [Color_border]; 1466 attributes.border_pixel = pix_colors_focused [Color_border];
1115 attributes.colormap = cmap; 1467 attributes.colormap = cmap;
1116 1468
1117 top = XCreateWindow (dpy, parent, 1469 top = XCreateWindow (dpy, parent,
… …
1120 ext_bwidth, 1472 ext_bwidth,
1121 depth, InputOutput, visual, 1473 depth, InputOutput, visual,
1122 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1123 &attributes); 1475 &attributes);
1124 1476
1125 this->parent[0] = top; 1477 this->parent = top;
1126 1478
1127 old_width = szHint.width; 1479 set_title (rs [Rs_title]);
1128 old_height = szHint.height; 1480 set_icon_name (rs [Rs_iconName]);
1129
1130 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1131 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1132 1481
1133 classHint.res_name = (char *)rs[Rs_name]; 1482 classHint.res_name = (char *)rs[Rs_name];
1134 classHint.res_class = (char *)RESCLASS; 1483 classHint.res_class = (char *)RESCLASS;
1135 1484
1136 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1485 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1138 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1487 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1139 wmHint.window_group = top; 1488 wmHint.window_group = top;
1140 1489
1141 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1490 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1142 &szHint, &wmHint, &classHint); 1491 &szHint, &wmHint, &classHint);
1492#if ENABLE_EWMH
1493 /*
1494 * set up icon hint
1495 * rs [Rs_iconfile] is path to icon
1496 */
1497
1498 if (rs [Rs_iconfile])
1499 {
1500 set_icon (rs [Rs_iconfile]);
1501 }
1502#endif
1143 1503
1144#if ENABLE_FRILLS 1504#if ENABLE_FRILLS
1145 if (mwmhints.flags) 1505 if (mwmhints.flags)
1146 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1506 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1147 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1507 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1152#if ENABLE_EWMH 1512#if ENABLE_EWMH
1153 xa[XA_NET_WM_PING], 1513 xa[XA_NET_WM_PING],
1154#endif 1514#endif
1155 }; 1515 };
1156 1516
1157 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1517 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1158 1518
1159#if ENABLE_FRILLS 1519#if ENABLE_FRILLS
1160 if (rs[Rs_transient_for]) 1520 if (rs[Rs_transient_for])
1161 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1521 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1162#endif 1522#endif
… …
1223 pix_colors = pix_colors_unfocused; 1583 pix_colors = pix_colors_unfocused;
1224#endif 1584#endif
1225 1585
1226 pointer_unblank (); 1586 pointer_unblank ();
1227 scr_recolour (); 1587 scr_recolour ();
1228}
1229
1230/* ------------------------------------------------------------------------- *
1231 * GET TTY CURRENT STATE *
1232 * ------------------------------------------------------------------------- */
1233void
1234rxvt_get_ttymode (struct termios *tio, int erase)
1235{
1236 /*
1237 * standard System V termios interface
1238 */
1239 if (tcgetattr (STDIN_FILENO, tio) < 0)
1240 {
1241 // return error - use system defaults,
1242 // where possible, and zero elsewhere
1243 memset (tio, 0, sizeof (struct termios));
1244
1245 tio->c_cc[VINTR] = CINTR;
1246 tio->c_cc[VQUIT] = CQUIT;
1247 tio->c_cc[VERASE] = CERASE;
1248#ifdef VERASE2
1249 tio->c_cc[VERASE2] = CERASE2;
1250#endif
1251 tio->c_cc[VKILL] = CKILL;
1252 tio->c_cc[VSTART] = CSTART;
1253 tio->c_cc[VSTOP] = CSTOP;
1254 tio->c_cc[VSUSP] = CSUSP;
1255# ifdef VDSUSP
1256 tio->c_cc[VDSUSP] = CDSUSP;
1257# endif
1258# ifdef VREPRINT
1259 tio->c_cc[VREPRINT] = CRPRNT;
1260# endif
1261# ifdef VDISCRD
1262 tio->c_cc[VDISCRD] = CFLUSH;
1263# endif
1264# ifdef VWERSE
1265 tio->c_cc[VWERSE] = CWERASE;
1266# endif
1267# ifdef VLNEXT
1268 tio->c_cc[VLNEXT] = CLNEXT;
1269# endif
1270 }
1271
1272 tio->c_cc[VEOF] = CEOF;
1273 tio->c_cc[VEOL] = VDISABLE;
1274# ifdef VEOL2
1275 tio->c_cc[VEOL2] = VDISABLE;
1276# endif
1277# ifdef VSWTC
1278 tio->c_cc[VSWTC] = VDISABLE;
1279# endif
1280# ifdef VSWTCH
1281 tio->c_cc[VSWTCH] = VDISABLE;
1282# endif
1283# if VMIN != VEOF
1284 tio->c_cc[VMIN] = 1;
1285# endif
1286# if VTIME != VEOL
1287 tio->c_cc[VTIME] = 0;
1288# endif
1289
1290 if (erase != -1)
1291 tio->c_cc[VERASE] = (char)erase;
1292
1293 /* input modes */
1294 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1295# ifdef IMAXBEL
1296 | IMAXBEL
1297# endif
1298 | IXON);
1299
1300 /* output modes */
1301 tio->c_oflag = (OPOST | ONLCR);
1302
1303 /* control modes */
1304 tio->c_cflag = (CS8 | CREAD);
1305
1306 /* line discipline modes */
1307 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1308# if defined (ECHOCTL) && defined (ECHOKE)
1309 | ECHOCTL | ECHOKE
1310# endif
1311 | ECHOE | ECHOK);
1312
1313 /*
1314 * Debugging
1315 */
1316#ifdef DEBUG_TTYMODE
1317 /* c_iflag bits */
1318 fprintf (stderr, "Input flags\n");
1319
1320 /* cpp token stringize doesn't work on all machines <sigh> */
1321# define FOO(flag,name) \
1322 if ((tio->c_iflag) & flag) \
1323 fprintf (stderr, "%s ", name)
1324
1325 /* c_iflag bits */
1326 FOO (IGNBRK, "IGNBRK");
1327 FOO (BRKINT, "BRKINT");
1328 FOO (IGNPAR, "IGNPAR");
1329 FOO (PARMRK, "PARMRK");
1330 FOO (INPCK, "INPCK");
1331 FOO (ISTRIP, "ISTRIP");
1332 FOO (INLCR, "INLCR");
1333 FOO (IGNCR, "IGNCR");
1334 FOO (ICRNL, "ICRNL");
1335 FOO (IXON, "IXON");
1336 FOO (IXOFF, "IXOFF");
1337# ifdef IUCLC
1338 FOO (IUCLC, "IUCLC");
1339# endif
1340# ifdef IXANY
1341 FOO (IXANY, "IXANY");
1342# endif
1343# ifdef IMAXBEL
1344 FOO (IMAXBEL, "IMAXBEL");
1345# endif
1346
1347 fprintf (stderr, "\n");
1348
1349# undef FOO
1350# define FOO(entry, name) \
1351 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1352
1353 FOO (VINTR, "VINTR");
1354 FOO (VQUIT, "VQUIT");
1355 FOO (VERASE, "VERASE");
1356 FOO (VKILL, "VKILL");
1357 FOO (VEOF, "VEOF");
1358 FOO (VEOL, "VEOL");
1359# ifdef VEOL2
1360 FOO (VEOL2, "VEOL2");
1361# endif
1362# ifdef VSWTC
1363 FOO (VSWTC, "VSWTC");
1364# endif
1365# ifdef VSWTCH
1366 FOO (VSWTCH, "VSWTCH");
1367# endif
1368 FOO (VSTART, "VSTART");
1369 FOO (VSTOP, "VSTOP");
1370 FOO (VSUSP, "VSUSP");
1371# ifdef VDSUSP
1372 FOO (VDSUSP, "VDSUSP");
1373# endif
1374# ifdef VREPRINT
1375 FOO (VREPRINT, "VREPRINT");
1376# endif
1377# ifdef VDISCRD
1378 FOO (VDISCRD, "VDISCRD");
1379# endif
1380# ifdef VWERSE
1381 FOO (VWERSE, "VWERSE");
1382# endif
1383# ifdef VLNEXT
1384 FOO (VLNEXT, "VLNEXT");
1385# endif
1386
1387 fprintf (stderr, "\n");
1388# undef FOO
1389#endif /* DEBUG_TTYMODE */
1390} 1588}
1391 1589
1392/*----------------------------------------------------------------------*/ 1590/*----------------------------------------------------------------------*/
1393/* 1591/*
1394 * Run the command in a subprocess and return a file descriptor for the 1592 * Run the command in a subprocess and return a file descriptor for the
… …
1406 if (pty->pty >= 0) 1604 if (pty->pty >= 0)
1407 { 1605 {
1408 if (getfd_hook) 1606 if (getfd_hook)
1409 pty->pty = (*getfd_hook) (pty->pty); 1607 pty->pty = (*getfd_hook) (pty->pty);
1410 1608
1411 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1609 if (pty->pty < 0)
1412 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1610 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1413 } 1611 }
1414 } 1612 }
1415 else 1613 else
1416#endif 1614#endif
1417 if (!pty->get ()) 1615 if (!pty->get ())
1418 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1616 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1419 1617
1420 int er; 1618 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1619
1620 struct termios tio = def_tio;
1421 1621
1422#ifndef NO_BACKSPACE_KEY 1622#ifndef NO_BACKSPACE_KEY
1423 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1424 er = rs[Rs_backspace_key][0]; 1624 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1425 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1625 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1426 er = '\177'; /* the initial state anyway */ 1626 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1427 else
1428#endif 1627#endif
1429 er = -1;
1430 1628
1431 rxvt_get_ttymode (&tio, er);
1432 /* init terminal attributes */ 1629 /* init terminal attributes */
1433 cfsetospeed (&tio, BAUDRATE); 1630 cfsetospeed (&tio, BAUDRATE);
1434 cfsetispeed (&tio, BAUDRATE); 1631 cfsetispeed (&tio, BAUDRATE);
1435 tcsetattr (pty->tty, TCSANOW, &tio); 1632 tcsetattr (pty->tty, TCSANOW, &tio);
1436 pty->set_utf8_mode (enc_utf8); 1633 pty->set_utf8_mode (enc_utf8);
… …
1476 1673
1477 _exit (EXIT_FAILURE); 1674 _exit (EXIT_FAILURE);
1478 1675
1479 default: 1676 default:
1480 if (!option (Opt_utmpInhibit)) 1677 if (!option (Opt_utmpInhibit))
1678 {
1679#ifdef LOG_ONLY_ON_LOGIN
1680 bool login_shell = option (Opt_loginShell);
1681#else
1682 bool login_shell = true;
1683#endif
1481 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1684 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1685 }
1482 1686
1483 pty->close_tty (); 1687 pty->close_tty ();
1484 1688
1485 child_ev.start (cmd_pid); 1689 child_ev.start (cmd_pid);
1486 1690
… …
1511#elif defined (SRIOCSREDIR) 1715#elif defined (SRIOCSREDIR)
1512 int fd; 1716 int fd;
1513 1717
1514 fd = open (CONSOLE, O_WRONLY, 0); 1718 fd = open (CONSOLE, O_WRONLY, 0);
1515 if (fd >= 0) 1719 if (fd >= 0)
1516 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1720 {
1721 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1517 close (fd); 1722 close (fd);
1723 }
1518#endif /* SRIOCSREDIR */ 1724#endif /* SRIOCSREDIR */
1519 } 1725 }
1520 1726
1521 /* reset signals and spin off the command interpreter */ 1727 /* reset signals and spin off the command interpreter */
1522 signal (SIGINT, SIG_DFL); 1728 signal (SIGINT, SIG_DFL);
1523 signal (SIGQUIT, SIG_DFL); 1729 signal (SIGQUIT, SIG_DFL);
1524 signal (SIGCHLD, SIG_DFL); 1730 signal (SIGCHLD, SIG_DFL);
1525 signal (SIGHUP, SIG_DFL); 1731 signal (SIGHUP, SIG_DFL);
1526 signal (SIGPIPE, SIG_DFL); 1732 signal (SIGPIPE, SIG_DFL);
1527 /* 1733 /*
1528 * mimick login's behavior by disabling the job control signals 1734 * mimic login's behavior by disabling the job control signals
1529 * a shell that wants them can turn them back on 1735 * a shell that wants them can turn them back on
1530 */ 1736 */
1531#ifdef SIGTSTP 1737#ifdef SIGTSTP
1532 signal (SIGTSTP, SIG_IGN); 1738 signal (SIGTSTP, SIG_IGN);
1533 signal (SIGTTIN, SIG_IGN); 1739 signal (SIGTTIN, SIG_IGN);
1534 signal (SIGTTOU, SIG_IGN); 1740 signal (SIGTTOU, SIG_IGN);
1535#endif /* SIGTSTP */ 1741#endif /* SIGTSTP */
1536 1742
1537 // unblock signals (signals are blocked by iom.C
1538 sigset_t ss;
1539 sigemptyset (&ss);
1540 sigprocmask (SIG_SETMASK, &ss, 0);
1541
1542 /* command interpreter path */ 1743 /* command interpreter path */
1543 if (argv) 1744 if (argv)
1544 { 1745 {
1545# ifdef DEBUG_CMD 1746# ifdef DEBUG_CMD
1546 int i; 1747 int i;
… …
1557 const char *argv0, *shell; 1758 const char *argv0, *shell;
1558 1759
1559 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1760 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1560 shell = "/bin/sh"; 1761 shell = "/bin/sh";
1561 1762
1562 argv0 = (const char *)rxvt_basename (shell); 1763 argv0 = rxvt_basename (shell);
1563 1764
1564 if (option (Opt_loginShell)) 1765 if (option (Opt_loginShell))
1565 { 1766 {
1566 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1767 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1567 1768

Diff Legend

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