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.237 by ayin, Mon Dec 31 15:45:29 2007 UTC vs.
Revision 1.314 by sf-exg, Mon Jan 9 15:30:17 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-2007 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.
… …
34 34
35#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
36#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
37#include "rxvtutil.h" 37#include "rxvtutil.h"
38#include "init.h" 38#include "init.h"
39#include "keyboard.h"
39 40
40#include <limits> 41#include <limits>
41 42
42#include <csignal> 43#include <csignal>
43 44
… …
52# endif 53# endif
53#endif 54#endif
54 55
55#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
57#endif 63#endif
58 64
59#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h> 67#include <sys/types.h>
… …
142 148
143 return rval; 149 return rval;
144} 150}
145#endif 151#endif
146 152
147const char *const def_colorName[] = 153static const char *const def_colorName[] =
148 { 154 {
149 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
150 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
151 /* low-intensity colors */ 157 /* low-intensity colors */
152 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 183
184#if !USE_256_COLORS
178 // 88 xterm colours 185 // 88 xterm colours
179 "rgb:00/00/00", 186 "rgb:00/00/00",
180 "rgb:00/00/8b", 187 "rgb:00/00/8b",
181 "rgb:00/00/cd", 188 "rgb:00/00/cd",
182 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
250 "rgb:e7/e7/e7", 257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
476 "rgb:08/08/08",
477 "rgb:12/12/12",
478 "rgb:1c/1c/1c",
479 "rgb:26/26/26",
480 "rgb:30/30/30",
481 "rgb:3a/3a/3a",
482 "rgb:44/44/44",
483 "rgb:4e/4e/4e",
484 "rgb:58/58/58",
485 "rgb:62/62/62",
486 "rgb:6c/6c/6c",
487 "rgb:76/76/76",
488 "rgb:80/80/80",
489 "rgb:8a/8a/8a",
490 "rgb:94/94/94",
491 "rgb:9e/9e/9e",
492 "rgb:a8/a8/a8",
493 "rgb:b2/b2/b2",
494 "rgb:bc/bc/bc",
495 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0",
497 "rgb:da/da/da",
498 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee",
500#endif
251 501
252#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
… …
265#if ENABLE_FRILLS 515#if ENABLE_FRILLS
266 NULL, // Color_underline 516 NULL, // Color_underline
267#endif 517#endif
268#ifdef OPTION_HC 518#ifdef OPTION_HC
269 NULL, 519 NULL,
520 NULL,
270#endif 521#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 525#endif
275#if ENABLE_TRANSPARENCY 526#if ENABLE_TRANSPARENCY
276 NULL, 527 NULL,
277#endif 528#endif
278#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 530 "rgb:00/00/00",
… …
292 ncol = 80; 543 ncol = 80;
293 nrow = 24; 544 nrow = 24;
294 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
295 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
296 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
297 saveLines = SAVELINES; 549 saveLines = SAVELINES;
298 550
299 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
300 552
301 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
… …
306 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
307 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
308 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
309 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
310 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
311 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
312} 565 set_option (Opt_buffered);
313
314void
315rxvt_term::init_secondary ()
316{
317 int i;
318
319 /*
320 * Close all unused file descriptors
321 * We don't want them, we don't need them.
322 */
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 /* TODO: BOO HISS */
326 dup2 (STDERR_FILENO, STDIN_FILENO);
327 }
328 else if (i != STDIN_FILENO)
329 {
330 dup2 (i, STDIN_FILENO);
331 close (i);
332 }
333
334 dup2 (STDERR_FILENO, STDOUT_FILENO);
335
336#if 0 // schmorp sayz closing filies is murder
337 for (i = STDERR_FILENO + 1; i < num_fds; i++)
338 {
339#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
340 if (i == 4 || i == 7)
341 continue;
342#endif
343 close (i);
344 }
345#endif
346} 566}
347 567
348/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
349const char ** 569const char **
350rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
351{ 571{
352 int i, r_argc; 572 int i;
353 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
354
355 /*
356 * Look for -e option. Find => split and make cmd_argv[] of command args
357 */
358 for (r_argc = 0; r_argc < argc; r_argc++)
359 if (!strcmp (argv[r_argc], "-e"))
360 break;
361
362 if (r_argc == argc)
363 cmd_argv = NULL;
364 else if (!argv[r_argc + 1])
365 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
366 else
367 {
368 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
369
370 for (i = 0; i < argc - r_argc - 1; i++)
371 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
372
373 cmd_argv[i] = NULL;
374 }
375
376 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
377
378 for (i = 0; i < r_argc; i++)
379 r_argv[i] = (const char *)argv[i];
380
381 r_argv[i] = NULL;
382 574
383 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
384 576
385 /* 577 /*
386 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
387 */ 579 */
388 580
389 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
390 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
391 583
392 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
393 585
394 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
395 {
396 free (r_argv);
397 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]);
398 }
399 588
400 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
401 xa = display->xa; 590 xa = display->xa;
402 591
403 set (display); 592 set (display);
… …
406#if XFT 595#if XFT
407 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
408 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
409#endif 598#endif
410 599
411#ifdef HAVE_AFTERIMAGE
412 set_application_name ((char*)rs[Rs_name]);
413 set_output_threshold (OUTPUT_LEVEL_WARNING);
414 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
415#endif
416 free (r_argv);
417
418 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
419 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
420 rs [i] = 0; 602 rs [i] = 0;
421 603
422#if ENABLE_PERL 604#if ENABLE_PERL
… …
429 { 611 {
430 rxvt_perl.init (this); 612 rxvt_perl.init (this);
431 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
432 } 614 }
433#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 ();
434 620
435 /* 621 /*
436 * set any defaults not already set 622 * set any defaults not already set
437 */ 623 */
438 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
439 { 625 {
440 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
441 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
442 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
443 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
444 } 631 }
445 else 632 else
446 { 633 {
447 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
448 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
449 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
451 } 639 }
452 640
453 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
460 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)
461 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
462 650
463 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
464 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]);
465#endif 656#endif
466 657
467#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
468 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
469 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
472#endif 663#endif
473 664
474 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
475 if (!saveLines) 666 if (!saveLines)
476 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
477
478#ifdef PRINTPIPE
479 if (!rs[Rs_print_pipe])
480 rs[Rs_print_pipe] = PRINTPIPE;
481#endif
482 668
483 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
484 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
485 671
486#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
… …
499# else 685# else
500 rs[Rs_delete_key] = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
501# endif 687# endif
502#endif 688#endif
503 689
504#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
505 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
506#endif
507 691
508#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
509 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
510 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
511 { 695 {
… …
549 return cmd_argv; 733 return cmd_argv;
550} 734}
551 735
552/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
553void 737void
738rxvt_term::init (stringvec *argv, stringvec *envv)
739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
744 this->envv = envv;
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{
771 SET_R (this);
772 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :(
774
775 init_vars ();
776
777 const char **cmd_argv = init_resources (argc, argv);
778
779#ifdef KEYSYM_RESOURCE
780 keyboard->register_done ();
781#endif
782
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
793 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
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
808 create_windows (argc, argv);
809
810 init_xlocale ();
811
812 scr_poweron (); // initialize screen
813
814#if 0
815 XSynchronize (dpy, True);
816#endif
817
818 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */
820#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init ();
823
824#ifdef ENABLE_TRANSPARENCY
825 if (option (Opt_transparent))
826 {
827 bg_set_transparent ();
828
829 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]);
831
832 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]);
834
835 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]);
837
838 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root);
841 }
842#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 if (bg_set_file (rs[Rs_backgroundPixmap]))
847 if (!bg_window_position_sensitive ())
848 update_background ();
849#endif
850 }
851#endif
852
853#if ENABLE_PERL
854 rootwin_ev.start (display, display->root);
855#endif
856
857 set_colorfgbg ();
858
859 init_command (cmd_argv);
860
861 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ);
863
864 HOOK_INVOKE ((this, HOOK_START, DT_END));
865
866#if ENABLE_XEMBED
867 if (rs[Rs_embed])
868 {
869 long info[2] = { 0, XEMBED_MAPPED };
870
871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
872 32, PropModeReplace, (unsigned char *)&info, 2);
873 }
874#endif
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
888 XMapWindow (dpy, vt);
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
902
903 refresh_check ();
904}
905
906/*----------------------------------------------------------------------*/
907void
554rxvt_term::init_env () 908rxvt_term::init_env ()
555{ 909{
556 int i;
557 char *val; 910 char *val;
911 char *env_display;
912 char *env_term;
558 913
559#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
560 /* Fixup display_name for export over pty to any interested terminal 915 /* Fixup display_name for export over pty to any interested terminal
561 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 916 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
562 * (for the first non-loopback interface) that we get from 917 * (for the first non-loopback interface) that we get from
… …
575 val = XDisplayString (dpy); 930 val = XDisplayString (dpy);
576 931
577 if (rs[Rs_display_name] == NULL) 932 if (rs[Rs_display_name] == NULL)
578 rs[Rs_display_name] = val; /* use broken `:0' value */ 933 rs[Rs_display_name] = val; /* use broken `:0' value */
579 934
580 i = strlen (val);
581 env_display = (char *)rxvt_malloc (i + 9); 935 env_display = (char *)rxvt_malloc (strlen (val) + 9);
582 936
583 sprintf (env_display, "DISPLAY=%s", val); 937 sprintf (env_display, "DISPLAY=%s", val);
584 938
585 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
586 940
587 /* add entries to the environment: 941 /* add entries to the environment:
588 * @ DISPLAY: in case we started with -display 942 * @ DISPLAY: in case we started with -display
589 * @ WINDOWID: X window id number of the window 943 * @ WINDOWID: X window id number of the window
590 * @ COLORTERM: terminal sub-name and also indicates its color 944 * @ COLORTERM: terminal sub-name and also indicates its color
… …
623 unsetenv ("TERMCAP"); /* terminfo should be okay */ 977 unsetenv ("TERMCAP"); /* terminfo should be okay */
624#endif /* HAVE_UNSETENV */ 978#endif /* HAVE_UNSETENV */
625} 979}
626 980
627/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
628/*
629 * This is more or less stolen straight from XFree86 xterm.
630 * This should support all European type languages.
631 */
632void 982void
633rxvt_term::set_locale (const char *locale) 983rxvt_term::set_locale (const char *locale)
634{ 984{
635 set_environ (envv); 985 set_environ (envv);
636 986
… …
656 SET_LOCALE (this->locale); 1006 SET_LOCALE (this->locale);
657 mbstate.reset (); 1007 mbstate.reset ();
658#endif 1008#endif
659 1009
660#if HAVE_NL_LANGINFO 1010#if HAVE_NL_LANGINFO
661 char *codeset = strdup (nl_langinfo (CODESET)); 1011 char *codeset = nl_langinfo (CODESET);
662 // /^UTF.?8/i 1012 // /^UTF.?8/i
663 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
664 && (codeset[1] == 'T' || codeset[1] == 't') 1014 && (codeset[1] == 'T' || codeset[1] == 't')
665 && (codeset[2] == 'F' || codeset[2] == 'f') 1015 && (codeset[2] == 'F' || codeset[2] == 'f')
666 && (codeset[3] == '8' || codeset[4] == '8'); 1016 && (codeset[3] == '8' || codeset[4] == '8');
667 free (codeset);
668#else 1017#else
669 enc_utf8 = 0; 1018 enc_utf8 = 0;
670#endif 1019#endif
671} 1020}
672 1021
… …
675{ 1024{
676 set_environ (envv); 1025 set_environ (envv);
677 1026
678#ifdef USE_XIM 1027#ifdef USE_XIM
679 if (!locale) 1028 if (!locale)
680 rxvt_warn ("setting locale failed, working without locale support.\n"); 1029 rxvt_warn ("setting locale failed, continuing without locale support.\n");
681 else 1030 else
682 { 1031 {
683 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
684 1033
685 if (!XSupportsLocale ()) 1034 if (!XSupportsLocale ())
686 { 1035 {
687 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1036 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
688 return; 1037 return;
689 } 1038 }
690 1039
691 im_ev.start (display); 1040 im_ev.start (display);
692 1041
… …
733 run_command (argv); 1082 run_command (argv);
734} 1083}
735 1084
736/*----------------------------------------------------------------------*/ 1085/*----------------------------------------------------------------------*/
737void 1086void
738rxvt_term::Get_Colours () 1087rxvt_term::get_colours ()
739{ 1088{
740 int i; 1089 int i;
741 1090
742#ifdef OFF_FOCUS_FADING 1091#ifdef OFF_FOCUS_FADING
743 pix_colors = pix_colors_focused; 1092 pix_colors = pix_colors_focused;
… …
803 * get scrollBar shadow colors 1152 * get scrollBar shadow colors
804 * 1153 *
805 * The calculations of topShadow/bottomShadow values are adapted 1154 * The calculations of topShadow/bottomShadow values are adapted
806 * from the fvwm window manager. 1155 * from the fvwm window manager.
807 */ 1156 */
808#ifdef KEEP_SCROLLCOLOR 1157#ifdef RXVT_SCROLLBAR
809 if (depth <= 2) 1158 if (depth <= 2)
810 { 1159 {
811 /* Monochrome */ 1160 /* Monochrome */
812 alias_color (Color_scroll, Color_fg); 1161 alias_color (Color_scroll, Color_fg);
813 alias_color (Color_topShadow, Color_bg); 1162 alias_color (Color_topShadow, Color_bg);
… …
828 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1177 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
829 cscroll.a) 1178 cscroll.a)
830 )) 1179 ))
831 alias_color (Color_topShadow, Color_White); 1180 alias_color (Color_topShadow, Color_White);
832 } 1181 }
833#endif /* KEEP_SCROLLCOLOR */ 1182#endif
834 1183
835#ifdef OFF_FOCUS_FADING 1184#ifdef OFF_FOCUS_FADING
836 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1185 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
837 update_fade_color (i); 1186 update_fade_color (i);
838#endif 1187#endif
… …
943 1292
944 if (i) 1293 if (i)
945 ModMetaMask = modmasks[i - 1]; 1294 ModMetaMask = modmasks[i - 1];
946} 1295}
947 1296
1297void
1298rxvt_term::set_icon (const char *file)
1299{
1300#ifdef HAVE_AFTERIMAGE
1301 init_asv ();
1302
1303 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1304 if (!im)
1305 {
1306 rxvt_warn ("Loading image icon failed, continuing without.\n");
1307 return;
1308 }
1309
1310 unsigned int w = im->width;
1311 unsigned int h = im->height;
1312
1313 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1314 {
1315 rxvt_warn ("Icon image too big, continuing without.\n");
1316 destroy_asimage (&im);
1317 return;
1318 }
1319
1320 ASImage *result = scale_asimage (asv, im,
1321 w, h, ASA_ARGB32,
1322 100, ASIMAGE_QUALITY_DEFAULT);
1323 destroy_asimage (&im);
1324
1325 if (!result)
1326 {
1327 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1328 return;
1329 }
1330
1331 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1332 if (buffer)
1333 {
1334 ARGB32 *asbuf = result->alt.argb32;
1335 buffer [0] = w;
1336 buffer [1] = h;
1337
1338 for (unsigned int i = 0; i < w * h; ++i)
1339 buffer [i + 2] = asbuf [i];
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 destroy_asimage (&result);
1349#endif
1350
1351#ifdef HAVE_PIXBUF
1352 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf)
1354 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n");
1356 return;
1357 }
1358
1359 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1360 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1361
1362 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1363 {
1364 rxvt_warn ("Icon image too big, continuing without.\n");
1365 g_object_unref (pixbuf);
1366 return;
1367 }
1368
1369 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1370 {
1371 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1372 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1373 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1374
1375 buffer [0] = w;
1376 buffer [1] = h;
1377 for (int i = 0; i < h; i++)
1378 {
1379 for (int j = 0; j < w; j++)
1380 {
1381 unsigned char *pixel = row + j * channels;
1382 long value;
1383
1384 if (channels == 4)
1385 value = pixel[3];
1386 else
1387 value = (unsigned char)0x00ff;
1388
1389 value = (value << 8) + pixel[0];
1390 value = (value << 8) + pixel[1];
1391 value = (value << 8) + pixel[2];
1392 buffer[(i * w + j) + 2] = value;
1393 }
1394
1395 row += rowstride;
1396 }
1397
1398 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1399 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1400 free (buffer);
1401 }
1402 else
1403 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1404
1405 g_object_unref (pixbuf);
1406#endif
1407}
1408
948/*----------------------------------------------------------------------*/ 1409/*----------------------------------------------------------------------*/
949/* rxvt_Create_Windows () - Open and map the window */ 1410/* Open and map the window */
950void 1411void
951rxvt_term::create_windows (int argc, const char *const *argv) 1412rxvt_term::create_windows (int argc, const char *const *argv)
952{ 1413{
953 XClassHint classHint; 1414 XClassHint classHint;
954 XWMHints wmHint; 1415 XWMHints wmHint;
… …
960 Window top, parent; 1421 Window top, parent;
961 1422
962 dLocal (Display *, dpy); 1423 dLocal (Display *, dpy);
963 1424
964 /* grab colors before netscape does */ 1425 /* grab colors before netscape does */
965 Get_Colours (); 1426 get_colours ();
966 1427
967 if (!set_fonts ()) 1428 if (!set_fonts ())
968 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1429 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
969 1430
970 parent = display->root; 1431 parent = display->root;
… …
1000 } 1461 }
1001#endif 1462#endif
1002 1463
1003 window_calc (0, 0); 1464 window_calc (0, 0);
1004 1465
1005 /* sub-window placement & size in rxvt_resize_subwindows () */ 1466 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1006 attributes.background_pixel = pix_colors_focused [Color_border]; 1467 attributes.background_pixel = pix_colors_focused [Color_border];
1007 attributes.border_pixel = pix_colors_focused [Color_border]; 1468 attributes.border_pixel = pix_colors_focused [Color_border];
1008 attributes.colormap = cmap; 1469 attributes.colormap = cmap;
1009 1470
1010 top = XCreateWindow (dpy, parent, 1471 top = XCreateWindow (dpy, parent,
… …
1013 ext_bwidth, 1474 ext_bwidth,
1014 depth, InputOutput, visual, 1475 depth, InputOutput, visual,
1015 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1476 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1016 &attributes); 1477 &attributes);
1017 1478
1018 this->parent[0] = top; 1479 this->parent = top;
1019 1480
1020 old_width = szHint.width; 1481 set_title (rs [Rs_title]);
1021 old_height = szHint.height; 1482 set_icon_name (rs [Rs_iconName]);
1022
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 1483
1026 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
1028 1486
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1487 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1031 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1490 wmHint.window_group = top;
1033 1491
1034 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1493 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH
1495 /*
1496 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon
1498 */
1499
1500 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif
1036 1505
1037#if ENABLE_FRILLS 1506#if ENABLE_FRILLS
1038 if (mwmhints.flags) 1507 if (mwmhints.flags)
1039 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1040 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1509 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1045#if ENABLE_EWMH 1514#if ENABLE_EWMH
1046 xa[XA_NET_WM_PING], 1515 xa[XA_NET_WM_PING],
1047#endif 1516#endif
1048 }; 1517 };
1049 1518
1050 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1519 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1051 1520
1052#if ENABLE_FRILLS 1521#if ENABLE_FRILLS
1053 if (rs[Rs_transient_for]) 1522 if (rs[Rs_transient_for])
1054 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1523 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1055#endif 1524#endif
… …
1074 1543
1075 termwin_ev.start (display, top); 1544 termwin_ev.start (display, top);
1076 1545
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 1546 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079
1080#ifdef HAVE_SCROLLBARS
1081 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1083#endif
1084 1548
1085 /* the vt window */ 1549 /* the vt window */
1086 vt = XCreateSimpleWindow (dpy, top, 1550 vt = XCreateSimpleWindow (dpy, top,
1087 window_vt_x, window_vt_y, 1551 window_vt_x, window_vt_y,
1088 width, height, 1552 width, height,
… …
1121 pix_colors = pix_colors_unfocused; 1585 pix_colors = pix_colors_unfocused;
1122#endif 1586#endif
1123 1587
1124 pointer_unblank (); 1588 pointer_unblank ();
1125 scr_recolour (); 1589 scr_recolour ();
1126}
1127
1128/* ------------------------------------------------------------------------- *
1129 * GET TTY CURRENT STATE *
1130 * ------------------------------------------------------------------------- */
1131void
1132rxvt_get_ttymode (struct termios *tio, int erase)
1133{
1134 /*
1135 * standard System V termios interface
1136 */
1137 if (tcgetattr (STDIN_FILENO, tio) < 0)
1138 {
1139 // return error - use system defaults,
1140 // where possible, and zero elsewhere
1141 memset (tio, 0, sizeof (struct termios));
1142
1143 tio->c_cc[VINTR] = CINTR;
1144 tio->c_cc[VQUIT] = CQUIT;
1145 tio->c_cc[VERASE] = CERASE;
1146#ifdef VERASE2
1147 tio->c_cc[VERASE2] = CERASE2;
1148#endif
1149 tio->c_cc[VKILL] = CKILL;
1150 tio->c_cc[VSTART] = CSTART;
1151 tio->c_cc[VSTOP] = CSTOP;
1152 tio->c_cc[VSUSP] = CSUSP;
1153# ifdef VDSUSP
1154 tio->c_cc[VDSUSP] = CDSUSP;
1155# endif
1156# ifdef VREPRINT
1157 tio->c_cc[VREPRINT] = CRPRNT;
1158# endif
1159# ifdef VDISCRD
1160 tio->c_cc[VDISCRD] = CFLUSH;
1161# endif
1162# ifdef VWERSE
1163 tio->c_cc[VWERSE] = CWERASE;
1164# endif
1165# ifdef VLNEXT
1166 tio->c_cc[VLNEXT] = CLNEXT;
1167# endif
1168 }
1169
1170 tio->c_cc[VEOF] = CEOF;
1171 tio->c_cc[VEOL] = VDISABLE;
1172# ifdef VEOL2
1173 tio->c_cc[VEOL2] = VDISABLE;
1174# endif
1175# ifdef VSWTC
1176 tio->c_cc[VSWTC] = VDISABLE;
1177# endif
1178# ifdef VSWTCH
1179 tio->c_cc[VSWTCH] = VDISABLE;
1180# endif
1181# if VMIN != VEOF
1182 tio->c_cc[VMIN] = 1;
1183# endif
1184# if VTIME != VEOL
1185 tio->c_cc[VTIME] = 0;
1186# endif
1187
1188 if (erase != -1)
1189 tio->c_cc[VERASE] = (char)erase;
1190
1191 /* input modes */
1192 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1193# ifdef IMAXBEL
1194 | IMAXBEL
1195# endif
1196 | IXON);
1197
1198 /* output modes */
1199 tio->c_oflag = (OPOST | ONLCR);
1200
1201 /* control modes */
1202 tio->c_cflag = (CS8 | CREAD);
1203
1204 /* line discipline modes */
1205 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1206# if defined (ECHOCTL) && defined (ECHOKE)
1207 | ECHOCTL | ECHOKE
1208# endif
1209 | ECHOE | ECHOK);
1210
1211 /*
1212 * Debugging
1213 */
1214#ifdef DEBUG_TTYMODE
1215 /* c_iflag bits */
1216 fprintf (stderr, "Input flags\n");
1217
1218 /* cpp token stringize doesn't work on all machines <sigh> */
1219# define FOO(flag,name) \
1220 if ((tio->c_iflag) & flag) \
1221 fprintf (stderr, "%s ", name)
1222
1223 /* c_iflag bits */
1224 FOO (IGNBRK, "IGNBRK");
1225 FOO (BRKINT, "BRKINT");
1226 FOO (IGNPAR, "IGNPAR");
1227 FOO (PARMRK, "PARMRK");
1228 FOO (INPCK, "INPCK");
1229 FOO (ISTRIP, "ISTRIP");
1230 FOO (INLCR, "INLCR");
1231 FOO (IGNCR, "IGNCR");
1232 FOO (ICRNL, "ICRNL");
1233 FOO (IXON, "IXON");
1234 FOO (IXOFF, "IXOFF");
1235# ifdef IUCLC
1236 FOO (IUCLC, "IUCLC");
1237# endif
1238# ifdef IXANY
1239 FOO (IXANY, "IXANY");
1240# endif
1241# ifdef IMAXBEL
1242 FOO (IMAXBEL, "IMAXBEL");
1243# endif
1244
1245 fprintf (stderr, "\n");
1246
1247# undef FOO
1248# define FOO(entry, name) \
1249 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1250
1251 FOO (VINTR, "VINTR");
1252 FOO (VQUIT, "VQUIT");
1253 FOO (VERASE, "VERASE");
1254 FOO (VKILL, "VKILL");
1255 FOO (VEOF, "VEOF");
1256 FOO (VEOL, "VEOL");
1257# ifdef VEOL2
1258 FOO (VEOL2, "VEOL2");
1259# endif
1260# ifdef VSWTC
1261 FOO (VSWTC, "VSWTC");
1262# endif
1263# ifdef VSWTCH
1264 FOO (VSWTCH, "VSWTCH");
1265# endif
1266 FOO (VSTART, "VSTART");
1267 FOO (VSTOP, "VSTOP");
1268 FOO (VSUSP, "VSUSP");
1269# ifdef VDSUSP
1270 FOO (VDSUSP, "VDSUSP");
1271# endif
1272# ifdef VREPRINT
1273 FOO (VREPRINT, "VREPRINT");
1274# endif
1275# ifdef VDISCRD
1276 FOO (VDISCRD, "VDISCRD");
1277# endif
1278# ifdef VWERSE
1279 FOO (VWERSE, "VWERSE");
1280# endif
1281# ifdef VLNEXT
1282 FOO (VLNEXT, "VLNEXT");
1283# endif
1284
1285 fprintf (stderr, "\n");
1286# undef FOO
1287#endif /* DEBUG_TTYMODE */
1288} 1590}
1289 1591
1290/*----------------------------------------------------------------------*/ 1592/*----------------------------------------------------------------------*/
1291/* 1593/*
1292 * Run the command in a subprocess and return a file descriptor for the 1594 * Run the command in a subprocess and return a file descriptor for the
… …
1304 if (pty->pty >= 0) 1606 if (pty->pty >= 0)
1305 { 1607 {
1306 if (getfd_hook) 1608 if (getfd_hook)
1307 pty->pty = (*getfd_hook) (pty->pty); 1609 pty->pty = (*getfd_hook) (pty->pty);
1308 1610
1309 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1611 if (pty->pty < 0)
1310 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1311 } 1613 }
1312 } 1614 }
1313 else 1615 else
1314#endif 1616#endif
1315 if (!pty->get ()) 1617 if (!pty->get ())
1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1317 1619
1318 int er; 1620 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1621
1622 struct termios tio = def_tio;
1319 1623
1320#ifndef NO_BACKSPACE_KEY 1624#ifndef NO_BACKSPACE_KEY
1321 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1322 er = rs[Rs_backspace_key][0]; 1626 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1323 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1627 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1324 er = '\177'; /* the initial state anyway */ 1628 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1325 else
1326#endif 1629#endif
1327 er = -1;
1328 1630
1329 rxvt_get_ttymode (&tio, er);
1330 /* init terminal attributes */ 1631 /* init terminal attributes */
1331 cfsetospeed (&tio, BAUDRATE); 1632 cfsetospeed (&tio, BAUDRATE);
1332 cfsetispeed (&tio, BAUDRATE); 1633 cfsetispeed (&tio, BAUDRATE);
1333 tcsetattr (pty->tty, TCSANOW, &tio); 1634 tcsetattr (pty->tty, TCSANOW, &tio);
1334 pty->set_utf8_mode (enc_utf8); 1635 pty->set_utf8_mode (enc_utf8);
… …
1374 1675
1375 _exit (EXIT_FAILURE); 1676 _exit (EXIT_FAILURE);
1376 1677
1377 default: 1678 default:
1378 if (!option (Opt_utmpInhibit)) 1679 if (!option (Opt_utmpInhibit))
1680 {
1681#ifdef LOG_ONLY_ON_LOGIN
1682 bool login_shell = option (Opt_loginShell);
1683#else
1684 bool login_shell = true;
1685#endif
1379 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1686 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1687 }
1380 1688
1381 pty->close_tty (); 1689 pty->close_tty ();
1382 1690
1383 child_ev.start (cmd_pid); 1691 child_ev.start (cmd_pid);
1384 1692
… …
1409#elif defined (SRIOCSREDIR) 1717#elif defined (SRIOCSREDIR)
1410 int fd; 1718 int fd;
1411 1719
1412 fd = open (CONSOLE, O_WRONLY, 0); 1720 fd = open (CONSOLE, O_WRONLY, 0);
1413 if (fd >= 0) 1721 if (fd >= 0)
1414 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1722 {
1723 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1415 close (fd); 1724 close (fd);
1725 }
1416#endif /* SRIOCSREDIR */ 1726#endif /* SRIOCSREDIR */
1417 } 1727 }
1418 1728
1419 /* reset signals and spin off the command interpreter */ 1729 /* reset signals and spin off the command interpreter */
1420 signal (SIGINT, SIG_DFL); 1730 signal (SIGINT, SIG_DFL);
1421 signal (SIGQUIT, SIG_DFL); 1731 signal (SIGQUIT, SIG_DFL);
1422 signal (SIGCHLD, SIG_DFL); 1732 signal (SIGCHLD, SIG_DFL);
1423 signal (SIGHUP, SIG_DFL); 1733 signal (SIGHUP, SIG_DFL);
1424 signal (SIGPIPE, SIG_DFL); 1734 signal (SIGPIPE, SIG_DFL);
1425 /* 1735 /*
1426 * mimick login's behavior by disabling the job control signals 1736 * mimic login's behavior by disabling the job control signals
1427 * a shell that wants them can turn them back on 1737 * a shell that wants them can turn them back on
1428 */ 1738 */
1429#ifdef SIGTSTP 1739#ifdef SIGTSTP
1430 signal (SIGTSTP, SIG_IGN); 1740 signal (SIGTSTP, SIG_IGN);
1431 signal (SIGTTIN, SIG_IGN); 1741 signal (SIGTTIN, SIG_IGN);
1432 signal (SIGTTOU, SIG_IGN); 1742 signal (SIGTTOU, SIG_IGN);
1433#endif /* SIGTSTP */ 1743#endif /* SIGTSTP */
1434 1744
1435 // unblock signals (signals are blocked by iom.C
1436 sigset_t ss;
1437 sigemptyset (&ss);
1438 sigprocmask (SIG_SETMASK, &ss, 0);
1439
1440 /* command interpreter path */ 1745 /* command interpreter path */
1441 if (argv) 1746 if (argv)
1442 { 1747 {
1443# ifdef DEBUG_CMD 1748# ifdef DEBUG_CMD
1444 int i; 1749 int i;
… …
1455 const char *argv0, *shell; 1760 const char *argv0, *shell;
1456 1761
1457 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1762 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1458 shell = "/bin/sh"; 1763 shell = "/bin/sh";
1459 1764
1460 argv0 = (const char *)rxvt_basename (shell); 1765 argv0 = rxvt_basename (shell);
1461 1766
1462 if (option (Opt_loginShell)) 1767 if (option (Opt_loginShell))
1463 { 1768 {
1464 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1769 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1465 1770

Diff Legend

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