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

Diff Legend

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