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.244 by ayin, Sat Jan 26 14:24:43 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 KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 525#endif
276#if ENABLE_TRANSPARENCY 526#if ENABLE_TRANSPARENCY
277 NULL, 527 NULL,
278#endif 528#endif
279#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 530 "rgb:00/00/00",
293 ncol = 80; 543 ncol = 80;
294 nrow = 24; 544 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 549 saveLines = SAVELINES;
299 550
300 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
301 552
302 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
307 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 565 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} 566}
333 567
334/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
335const char ** 569const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
337{ 571{
338 int i, r_argc; 572 int i;
339 const char **cmd_argv, **r_argv; 573 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 574
369 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
370 576
371 /* 577 /*
372 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
373 */ 579 */
374 580
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
377 583
378 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
379 585
380 if (!(display = displays.get (rs[Rs_display_name]))) 586 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]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 588
386 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
387 xa = display->xa; 590 xa = display->xa;
388 591
389 set (display); 592 set (display);
392#if XFT 595#if XFT
393 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 598#endif
396 599
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--; ) 600 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
406 rs [i] = 0; 602 rs [i] = 0;
407 603
408#if ENABLE_PERL 604#if ENABLE_PERL
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])
425 { 625 {
426 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
428 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
430 } 631 }
431 else 632 else
432 { 633 {
433 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
435 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
437 } 639 }
438 640
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
446 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)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 650
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 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]);
451#endif 656#endif
452 657
453#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 660 pointerBlankDelay = i;
458#endif 663#endif
459 664
460 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 666 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 668
469 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
471 671
472#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
485# else 685# else
486 rs[Rs_delete_key] = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
487# endif 687# endif
488#endif 688#endif
489 689
490#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
491 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
492#endif
493 691
494#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
495 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
496 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
497 { 695 {
535 return cmd_argv; 733 return cmd_argv;
536} 734}
537 735
538/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
539void 737void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
541{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
542 this->envv = envv; 744 this->envv = envv;
543 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{
544 SET_R (this); 771 SET_R (this);
545 set_locale (""); 772 set_locale ("");
546 set_environ (envv); // few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
547 774
548 init_vars (); 775 init_vars ();
549
550 init_secondary ();
551 776
552 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
553 778
554#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
555 keyboard->register_done (); 780 keyboard->register_done ();
556#endif 781#endif
557 782
558#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
559 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
560 scrollBar.setIdle (); /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
561#endif
562 795
563 pty = ptytty::create (); 796 pty = ptytty::create ();
564 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
565 create_windows (argc, argv); 808 create_windows (argc, argv);
566 809
567 init_xlocale (); 810 init_xlocale ();
568 811
569 scr_reset (); // initialize screen 812 scr_poweron (); // initialize screen
570 813
571#if 0 814#if 0
572 XSynchronize (dpy, True); 815 XSynchronize (dpy, True);
573#endif 816#endif
574 817
575#ifdef HAVE_SCROLLBARS
576 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
577 resize_scrollbar (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
578#endif
579#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
580 { 821 {
581 bgPixmap.set_target (this); 822 bg_init ();
582 bgPixmap.invalidate ();
583 823
584#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
585 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
586 { 826 {
587 bgPixmap.set_transparent (); 827 bg_set_transparent ();
588 828
589#ifdef HAVE_AFTERIMAGE
590 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
591 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
592#endif 831
593 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
594 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
595 834
596 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
597 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
598 837
599 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
600 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
601 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
602 } 841 }
603#endif 842#endif
604 843
605#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
606 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
607 {
608 const char *p = rs[Rs_backgroundPixmap];
609
610 if ((p = strchr (p, ';')) != 0)
611 {
612 p++;
613 bgPixmap.set_geometry (p);
614 }
615 else
616 bgPixmap.set_defaultGeometry ();
617
618 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
619 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
620 update_background (); 848 update_background ();
621 }
622#endif 849#endif
623 } 850 }
624#endif 851#endif
625 852
626#if ENABLE_PERL 853#if ENABLE_PERL
629 856
630 set_colorfgbg (); 857 set_colorfgbg ();
631 858
632 init_command (cmd_argv); 859 init_command (cmd_argv);
633 860
634 free (cmd_argv);
635
636 if (pty->pty >= 0) 861 if (pty->pty >= 0)
637 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
638 863
639 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
640 865
641#if ENABLE_XEMBED 866#if ENABLE_XEMBED
642 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
643 { 868 {
644 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
645 870
646 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
647 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
648 } 873 }
649#endif 874#endif
650 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
651 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
652 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
653 902
654 refresh_check (); 903 refresh_check ();
655} 904}
656 905
657/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
658void 907void
659rxvt_term::init_env () 908rxvt_term::init_env ()
660{ 909{
661 int i;
662 char *val; 910 char *val;
663 911
664#ifdef DISPLAY_IS_IP 912#ifdef DISPLAY_IS_IP
665 /* Fixup display_name for export over pty to any interested terminal 913 /* Fixup display_name for export over pty to any interested terminal
666 * 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
680 val = XDisplayString (dpy); 928 val = XDisplayString (dpy);
681 929
682 if (rs[Rs_display_name] == NULL) 930 if (rs[Rs_display_name] == NULL)
683 rs[Rs_display_name] = val; /* use broken `:0' value */ 931 rs[Rs_display_name] = val; /* use broken `:0' value */
684 932
685 i = strlen (val);
686 env_display = (char *)rxvt_malloc (i + 9); 933 env_display = (char *)rxvt_malloc (strlen (val) + 9);
687 934
688 sprintf (env_display, "DISPLAY=%s", val); 935 sprintf (env_display, "DISPLAY=%s", val);
689 936
690 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
691 938
692 /* add entries to the environment: 939 /* add entries to the environment:
693 * @ DISPLAY: in case we started with -display 940 * @ DISPLAY: in case we started with -display
694 * @ WINDOWID: X window id number of the window 941 * @ WINDOWID: X window id number of the window
695 * @ COLORTERM: terminal sub-name and also indicates its color 942 * @ COLORTERM: terminal sub-name and also indicates its color
728 unsetenv ("TERMCAP"); /* terminfo should be okay */ 975 unsetenv ("TERMCAP"); /* terminfo should be okay */
729#endif /* HAVE_UNSETENV */ 976#endif /* HAVE_UNSETENV */
730} 977}
731 978
732/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
733/*
734 * This is more or less stolen straight from XFree86 xterm.
735 * This should support all European type languages.
736 */
737void 980void
738rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
739{ 982{
740 set_environ (envv); 983 set_environ (envv);
741 984
761 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
762 mbstate.reset (); 1005 mbstate.reset ();
763#endif 1006#endif
764 1007
765#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
766 char *codeset = strdup (nl_langinfo (CODESET)); 1009 char *codeset = nl_langinfo (CODESET);
767 // /^UTF.?8/i 1010 // /^UTF.?8/i
768 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
769 && (codeset[1] == 'T' || codeset[1] == 't') 1012 && (codeset[1] == 'T' || codeset[1] == 't')
770 && (codeset[2] == 'F' || codeset[2] == 'f') 1013 && (codeset[2] == 'F' || codeset[2] == 'f')
771 && (codeset[3] == '8' || codeset[4] == '8'); 1014 && (codeset[3] == '8' || codeset[4] == '8');
772 free (codeset);
773#else 1015#else
774 enc_utf8 = 0; 1016 enc_utf8 = 0;
775#endif 1017#endif
776} 1018}
777 1019
780{ 1022{
781 set_environ (envv); 1023 set_environ (envv);
782 1024
783#ifdef USE_XIM 1025#ifdef USE_XIM
784 if (!locale) 1026 if (!locale)
785 rxvt_warn ("setting locale failed, working without locale support.\n"); 1027 rxvt_warn ("setting locale failed, continuing without locale support.\n");
786 else 1028 else
787 { 1029 {
788 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
789 1031
790 if (!XSupportsLocale ()) 1032 if (!XSupportsLocale ())
791 { 1033 {
792 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");
793 return; 1035 return;
794 } 1036 }
795 1037
796 im_ev.start (display); 1038 im_ev.start (display);
797 1039
838 run_command (argv); 1080 run_command (argv);
839} 1081}
840 1082
841/*----------------------------------------------------------------------*/ 1083/*----------------------------------------------------------------------*/
842void 1084void
843rxvt_term::Get_Colours () 1085rxvt_term::get_colours ()
844{ 1086{
845 int i; 1087 int i;
846 1088
847#ifdef OFF_FOCUS_FADING 1089#ifdef OFF_FOCUS_FADING
848 pix_colors = pix_colors_focused; 1090 pix_colors = pix_colors_focused;
908 * get scrollBar shadow colors 1150 * get scrollBar shadow colors
909 * 1151 *
910 * The calculations of topShadow/bottomShadow values are adapted 1152 * The calculations of topShadow/bottomShadow values are adapted
911 * from the fvwm window manager. 1153 * from the fvwm window manager.
912 */ 1154 */
913#ifdef KEEP_SCROLLCOLOR 1155#ifdef RXVT_SCROLLBAR
914 if (depth <= 2) 1156 if (depth <= 2)
915 { 1157 {
916 /* Monochrome */ 1158 /* Monochrome */
917 alias_color (Color_scroll, Color_fg); 1159 alias_color (Color_scroll, Color_fg);
918 alias_color (Color_topShadow, Color_bg); 1160 alias_color (Color_topShadow, Color_bg);
933 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1175 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
934 cscroll.a) 1176 cscroll.a)
935 )) 1177 ))
936 alias_color (Color_topShadow, Color_White); 1178 alias_color (Color_topShadow, Color_White);
937 } 1179 }
938#endif /* KEEP_SCROLLCOLOR */ 1180#endif
939 1181
940#ifdef OFF_FOCUS_FADING 1182#ifdef OFF_FOCUS_FADING
941 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1183 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
942 update_fade_color (i); 1184 update_fade_color (i);
943#endif 1185#endif
1048 1290
1049 if (i) 1291 if (i)
1050 ModMetaMask = modmasks[i - 1]; 1292 ModMetaMask = modmasks[i - 1];
1051} 1293}
1052 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
1053/*----------------------------------------------------------------------*/ 1407/*----------------------------------------------------------------------*/
1054/* rxvt_Create_Windows () - Open and map the window */ 1408/* Open and map the window */
1055void 1409void
1056rxvt_term::create_windows (int argc, const char *const *argv) 1410rxvt_term::create_windows (int argc, const char *const *argv)
1057{ 1411{
1058 XClassHint classHint; 1412 XClassHint classHint;
1059 XWMHints wmHint; 1413 XWMHints wmHint;
1065 Window top, parent; 1419 Window top, parent;
1066 1420
1067 dLocal (Display *, dpy); 1421 dLocal (Display *, dpy);
1068 1422
1069 /* grab colors before netscape does */ 1423 /* grab colors before netscape does */
1070 Get_Colours (); 1424 get_colours ();
1071 1425
1072 if (!set_fonts ()) 1426 if (!set_fonts ())
1073 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");
1074 1428
1075 parent = display->root; 1429 parent = display->root;
1105 } 1459 }
1106#endif 1460#endif
1107 1461
1108 window_calc (0, 0); 1462 window_calc (0, 0);
1109 1463
1110 /* sub-window placement & size in rxvt_resize_subwindows () */ 1464 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1111 attributes.background_pixel = pix_colors_focused [Color_border]; 1465 attributes.background_pixel = pix_colors_focused [Color_border];
1112 attributes.border_pixel = pix_colors_focused [Color_border]; 1466 attributes.border_pixel = pix_colors_focused [Color_border];
1113 attributes.colormap = cmap; 1467 attributes.colormap = cmap;
1114 1468
1115 top = XCreateWindow (dpy, parent, 1469 top = XCreateWindow (dpy, parent,
1118 ext_bwidth, 1472 ext_bwidth,
1119 depth, InputOutput, visual, 1473 depth, InputOutput, visual,
1120 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1121 &attributes); 1475 &attributes);
1122 1476
1123 this->parent[0] = top; 1477 this->parent = top;
1124 1478
1125 old_width = szHint.width; 1479 set_title (rs [Rs_title]);
1126 old_height = szHint.height; 1480 set_icon_name (rs [Rs_iconName]);
1127
1128 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1129 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1130 1481
1131 classHint.res_name = (char *)rs[Rs_name]; 1482 classHint.res_name = (char *)rs[Rs_name];
1132 classHint.res_class = (char *)RESCLASS; 1483 classHint.res_class = (char *)RESCLASS;
1133 1484
1134 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1485 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1136 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1487 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1137 wmHint.window_group = top; 1488 wmHint.window_group = top;
1138 1489
1139 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1490 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1140 &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
1141 1503
1142#if ENABLE_FRILLS 1504#if ENABLE_FRILLS
1143 if (mwmhints.flags) 1505 if (mwmhints.flags)
1144 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,
1145 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1507 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1150#if ENABLE_EWMH 1512#if ENABLE_EWMH
1151 xa[XA_NET_WM_PING], 1513 xa[XA_NET_WM_PING],
1152#endif 1514#endif
1153 }; 1515 };
1154 1516
1155 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1517 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1156 1518
1157#if ENABLE_FRILLS 1519#if ENABLE_FRILLS
1158 if (rs[Rs_transient_for]) 1520 if (rs[Rs_transient_for])
1159 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1521 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1160#endif 1522#endif
1221 pix_colors = pix_colors_unfocused; 1583 pix_colors = pix_colors_unfocused;
1222#endif 1584#endif
1223 1585
1224 pointer_unblank (); 1586 pointer_unblank ();
1225 scr_recolour (); 1587 scr_recolour ();
1226}
1227
1228/* ------------------------------------------------------------------------- *
1229 * GET TTY CURRENT STATE *
1230 * ------------------------------------------------------------------------- */
1231void
1232rxvt_get_ttymode (struct termios *tio, int erase)
1233{
1234 /*
1235 * standard System V termios interface
1236 */
1237 if (tcgetattr (STDIN_FILENO, tio) < 0)
1238 {
1239 // return error - use system defaults,
1240 // where possible, and zero elsewhere
1241 memset (tio, 0, sizeof (struct termios));
1242
1243 tio->c_cc[VINTR] = CINTR;
1244 tio->c_cc[VQUIT] = CQUIT;
1245 tio->c_cc[VERASE] = CERASE;
1246#ifdef VERASE2
1247 tio->c_cc[VERASE2] = CERASE2;
1248#endif
1249 tio->c_cc[VKILL] = CKILL;
1250 tio->c_cc[VSTART] = CSTART;
1251 tio->c_cc[VSTOP] = CSTOP;
1252 tio->c_cc[VSUSP] = CSUSP;
1253# ifdef VDSUSP
1254 tio->c_cc[VDSUSP] = CDSUSP;
1255# endif
1256# ifdef VREPRINT
1257 tio->c_cc[VREPRINT] = CRPRNT;
1258# endif
1259# ifdef VDISCRD
1260 tio->c_cc[VDISCRD] = CFLUSH;
1261# endif
1262# ifdef VWERSE
1263 tio->c_cc[VWERSE] = CWERASE;
1264# endif
1265# ifdef VLNEXT
1266 tio->c_cc[VLNEXT] = CLNEXT;
1267# endif
1268 }
1269
1270 tio->c_cc[VEOF] = CEOF;
1271 tio->c_cc[VEOL] = VDISABLE;
1272# ifdef VEOL2
1273 tio->c_cc[VEOL2] = VDISABLE;
1274# endif
1275# ifdef VSWTC
1276 tio->c_cc[VSWTC] = VDISABLE;
1277# endif
1278# ifdef VSWTCH
1279 tio->c_cc[VSWTCH] = VDISABLE;
1280# endif
1281# if VMIN != VEOF
1282 tio->c_cc[VMIN] = 1;
1283# endif
1284# if VTIME != VEOL
1285 tio->c_cc[VTIME] = 0;
1286# endif
1287
1288 if (erase != -1)
1289 tio->c_cc[VERASE] = (char)erase;
1290
1291 /* input modes */
1292 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1293# ifdef IMAXBEL
1294 | IMAXBEL
1295# endif
1296 | IXON);
1297
1298 /* output modes */
1299 tio->c_oflag = (OPOST | ONLCR);
1300
1301 /* control modes */
1302 tio->c_cflag = (CS8 | CREAD);
1303
1304 /* line discipline modes */
1305 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1306# if defined (ECHOCTL) && defined (ECHOKE)
1307 | ECHOCTL | ECHOKE
1308# endif
1309 | ECHOE | ECHOK);
1310
1311 /*
1312 * Debugging
1313 */
1314#ifdef DEBUG_TTYMODE
1315 /* c_iflag bits */
1316 fprintf (stderr, "Input flags\n");
1317
1318 /* cpp token stringize doesn't work on all machines <sigh> */
1319# define FOO(flag,name) \
1320 if ((tio->c_iflag) & flag) \
1321 fprintf (stderr, "%s ", name)
1322
1323 /* c_iflag bits */
1324 FOO (IGNBRK, "IGNBRK");
1325 FOO (BRKINT, "BRKINT");
1326 FOO (IGNPAR, "IGNPAR");
1327 FOO (PARMRK, "PARMRK");
1328 FOO (INPCK, "INPCK");
1329 FOO (ISTRIP, "ISTRIP");
1330 FOO (INLCR, "INLCR");
1331 FOO (IGNCR, "IGNCR");
1332 FOO (ICRNL, "ICRNL");
1333 FOO (IXON, "IXON");
1334 FOO (IXOFF, "IXOFF");
1335# ifdef IUCLC
1336 FOO (IUCLC, "IUCLC");
1337# endif
1338# ifdef IXANY
1339 FOO (IXANY, "IXANY");
1340# endif
1341# ifdef IMAXBEL
1342 FOO (IMAXBEL, "IMAXBEL");
1343# endif
1344
1345 fprintf (stderr, "\n");
1346
1347# undef FOO
1348# define FOO(entry, name) \
1349 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1350
1351 FOO (VINTR, "VINTR");
1352 FOO (VQUIT, "VQUIT");
1353 FOO (VERASE, "VERASE");
1354 FOO (VKILL, "VKILL");
1355 FOO (VEOF, "VEOF");
1356 FOO (VEOL, "VEOL");
1357# ifdef VEOL2
1358 FOO (VEOL2, "VEOL2");
1359# endif
1360# ifdef VSWTC
1361 FOO (VSWTC, "VSWTC");
1362# endif
1363# ifdef VSWTCH
1364 FOO (VSWTCH, "VSWTCH");
1365# endif
1366 FOO (VSTART, "VSTART");
1367 FOO (VSTOP, "VSTOP");
1368 FOO (VSUSP, "VSUSP");
1369# ifdef VDSUSP
1370 FOO (VDSUSP, "VDSUSP");
1371# endif
1372# ifdef VREPRINT
1373 FOO (VREPRINT, "VREPRINT");
1374# endif
1375# ifdef VDISCRD
1376 FOO (VDISCRD, "VDISCRD");
1377# endif
1378# ifdef VWERSE
1379 FOO (VWERSE, "VWERSE");
1380# endif
1381# ifdef VLNEXT
1382 FOO (VLNEXT, "VLNEXT");
1383# endif
1384
1385 fprintf (stderr, "\n");
1386# undef FOO
1387#endif /* DEBUG_TTYMODE */
1388} 1588}
1389 1589
1390/*----------------------------------------------------------------------*/ 1590/*----------------------------------------------------------------------*/
1391/* 1591/*
1392 * 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
1404 if (pty->pty >= 0) 1604 if (pty->pty >= 0)
1405 { 1605 {
1406 if (getfd_hook) 1606 if (getfd_hook)
1407 pty->pty = (*getfd_hook) (pty->pty); 1607 pty->pty = (*getfd_hook) (pty->pty);
1408 1608
1409 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1609 if (pty->pty < 0)
1410 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1610 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1411 } 1611 }
1412 } 1612 }
1413 else 1613 else
1414#endif 1614#endif
1415 if (!pty->get ()) 1615 if (!pty->get ())
1416 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1616 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1417 1617
1418 int er; 1618 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1619
1620 struct termios tio = def_tio;
1419 1621
1420#ifndef NO_BACKSPACE_KEY 1622#ifndef NO_BACKSPACE_KEY
1421 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1422 er = rs[Rs_backspace_key][0]; 1624 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1423 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1625 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1424 er = '\177'; /* the initial state anyway */ 1626 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1425 else
1426#endif 1627#endif
1427 er = -1;
1428 1628
1429 rxvt_get_ttymode (&tio, er);
1430 /* init terminal attributes */ 1629 /* init terminal attributes */
1431 cfsetospeed (&tio, BAUDRATE); 1630 cfsetospeed (&tio, BAUDRATE);
1432 cfsetispeed (&tio, BAUDRATE); 1631 cfsetispeed (&tio, BAUDRATE);
1433 tcsetattr (pty->tty, TCSANOW, &tio); 1632 tcsetattr (pty->tty, TCSANOW, &tio);
1434 pty->set_utf8_mode (enc_utf8); 1633 pty->set_utf8_mode (enc_utf8);
1474 1673
1475 _exit (EXIT_FAILURE); 1674 _exit (EXIT_FAILURE);
1476 1675
1477 default: 1676 default:
1478 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
1479 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1684 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1685 }
1480 1686
1481 pty->close_tty (); 1687 pty->close_tty ();
1482 1688
1483 child_ev.start (cmd_pid); 1689 child_ev.start (cmd_pid);
1484 1690
1509#elif defined (SRIOCSREDIR) 1715#elif defined (SRIOCSREDIR)
1510 int fd; 1716 int fd;
1511 1717
1512 fd = open (CONSOLE, O_WRONLY, 0); 1718 fd = open (CONSOLE, O_WRONLY, 0);
1513 if (fd >= 0) 1719 if (fd >= 0)
1514 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1720 {
1721 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1515 close (fd); 1722 close (fd);
1723 }
1516#endif /* SRIOCSREDIR */ 1724#endif /* SRIOCSREDIR */
1517 } 1725 }
1518 1726
1519 /* reset signals and spin off the command interpreter */ 1727 /* reset signals and spin off the command interpreter */
1520 signal (SIGINT, SIG_DFL); 1728 signal (SIGINT, SIG_DFL);
1521 signal (SIGQUIT, SIG_DFL); 1729 signal (SIGQUIT, SIG_DFL);
1522 signal (SIGCHLD, SIG_DFL); 1730 signal (SIGCHLD, SIG_DFL);
1523 signal (SIGHUP, SIG_DFL); 1731 signal (SIGHUP, SIG_DFL);
1524 signal (SIGPIPE, SIG_DFL); 1732 signal (SIGPIPE, SIG_DFL);
1525 /* 1733 /*
1526 * mimick login's behavior by disabling the job control signals 1734 * mimic login's behavior by disabling the job control signals
1527 * a shell that wants them can turn them back on 1735 * a shell that wants them can turn them back on
1528 */ 1736 */
1529#ifdef SIGTSTP 1737#ifdef SIGTSTP
1530 signal (SIGTSTP, SIG_IGN); 1738 signal (SIGTSTP, SIG_IGN);
1531 signal (SIGTTIN, SIG_IGN); 1739 signal (SIGTTIN, SIG_IGN);
1532 signal (SIGTTOU, SIG_IGN); 1740 signal (SIGTTOU, SIG_IGN);
1533#endif /* SIGTSTP */ 1741#endif /* SIGTSTP */
1534 1742
1535 // unblock signals (signals are blocked by iom.C
1536 sigset_t ss;
1537 sigemptyset (&ss);
1538 sigprocmask (SIG_SETMASK, &ss, 0);
1539
1540 /* command interpreter path */ 1743 /* command interpreter path */
1541 if (argv) 1744 if (argv)
1542 { 1745 {
1543# ifdef DEBUG_CMD 1746# ifdef DEBUG_CMD
1544 int i; 1747 int i;
1555 const char *argv0, *shell; 1758 const char *argv0, *shell;
1556 1759
1557 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1760 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1558 shell = "/bin/sh"; 1761 shell = "/bin/sh";
1559 1762
1560 argv0 = (const char *)rxvt_basename (shell); 1763 argv0 = rxvt_basename (shell);
1561 1764
1562 if (option (Opt_loginShell)) 1765 if (option (Opt_loginShell))
1563 { 1766 {
1564 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1767 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1565 1768

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines