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.252 by root, Sun Jun 15 13:54:15 2008 UTC vs.
Revision 1.330 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
… …
73#include <netinet/in.h> 76#include <netinet/in.h>
74#include <arpa/inet.h> 77#include <arpa/inet.h>
75#include <net/if.h> 78#include <net/if.h>
76#include <net/if_arp.h> 79#include <net/if_arp.h>
77 80
78static char * 81static char * ecb_cold
79rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
80{ 83{
81 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 85 struct ifconf ifc;
83 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
143 146
144 return rval; 147 return rval;
145} 148}
146#endif 149#endif
147 150
148const char *const def_colorName[] = 151static const char *const def_colorName[] =
149 { 152 {
150 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
152 /* low-intensity colors */ 155 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 181
182#if !USE_256_COLORS
179 // 88 xterm colours 183 // 88 xterm colours
180 "rgb:00/00/00", 184 "rgb:00/00/00",
181 "rgb:00/00/8b", 185 "rgb:00/00/8b",
182 "rgb:00/00/cd", 186 "rgb:00/00/cd",
183 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 255 "rgb:e7/e7/e7",
256#else
257 // 256 xterm colours
258 "rgb:00/00/00",
259 "rgb:00/00/5f",
260 "rgb:00/00/87",
261 "rgb:00/00/af",
262 "rgb:00/00/d7",
263 "rgb:00/00/ff",
264 "rgb:00/5f/00",
265 "rgb:00/5f/5f",
266 "rgb:00/5f/87",
267 "rgb:00/5f/af",
268 "rgb:00/5f/d7",
269 "rgb:00/5f/ff",
270 "rgb:00/87/00",
271 "rgb:00/87/5f",
272 "rgb:00/87/87",
273 "rgb:00/87/af",
274 "rgb:00/87/d7",
275 "rgb:00/87/ff",
276 "rgb:00/af/00",
277 "rgb:00/af/5f",
278 "rgb:00/af/87",
279 "rgb:00/af/af",
280 "rgb:00/af/d7",
281 "rgb:00/af/ff",
282 "rgb:00/d7/00",
283 "rgb:00/d7/5f",
284 "rgb:00/d7/87",
285 "rgb:00/d7/af",
286 "rgb:00/d7/d7",
287 "rgb:00/d7/ff",
288 "rgb:00/ff/00",
289 "rgb:00/ff/5f",
290 "rgb:00/ff/87",
291 "rgb:00/ff/af",
292 "rgb:00/ff/d7",
293 "rgb:00/ff/ff",
294 "rgb:5f/00/00",
295 "rgb:5f/00/5f",
296 "rgb:5f/00/87",
297 "rgb:5f/00/af",
298 "rgb:5f/00/d7",
299 "rgb:5f/00/ff",
300 "rgb:5f/5f/00",
301 "rgb:5f/5f/5f",
302 "rgb:5f/5f/87",
303 "rgb:5f/5f/af",
304 "rgb:5f/5f/d7",
305 "rgb:5f/5f/ff",
306 "rgb:5f/87/00",
307 "rgb:5f/87/5f",
308 "rgb:5f/87/87",
309 "rgb:5f/87/af",
310 "rgb:5f/87/d7",
311 "rgb:5f/87/ff",
312 "rgb:5f/af/00",
313 "rgb:5f/af/5f",
314 "rgb:5f/af/87",
315 "rgb:5f/af/af",
316 "rgb:5f/af/d7",
317 "rgb:5f/af/ff",
318 "rgb:5f/d7/00",
319 "rgb:5f/d7/5f",
320 "rgb:5f/d7/87",
321 "rgb:5f/d7/af",
322 "rgb:5f/d7/d7",
323 "rgb:5f/d7/ff",
324 "rgb:5f/ff/00",
325 "rgb:5f/ff/5f",
326 "rgb:5f/ff/87",
327 "rgb:5f/ff/af",
328 "rgb:5f/ff/d7",
329 "rgb:5f/ff/ff",
330 "rgb:87/00/00",
331 "rgb:87/00/5f",
332 "rgb:87/00/87",
333 "rgb:87/00/af",
334 "rgb:87/00/d7",
335 "rgb:87/00/ff",
336 "rgb:87/5f/00",
337 "rgb:87/5f/5f",
338 "rgb:87/5f/87",
339 "rgb:87/5f/af",
340 "rgb:87/5f/d7",
341 "rgb:87/5f/ff",
342 "rgb:87/87/00",
343 "rgb:87/87/5f",
344 "rgb:87/87/87",
345 "rgb:87/87/af",
346 "rgb:87/87/d7",
347 "rgb:87/87/ff",
348 "rgb:87/af/00",
349 "rgb:87/af/5f",
350 "rgb:87/af/87",
351 "rgb:87/af/af",
352 "rgb:87/af/d7",
353 "rgb:87/af/ff",
354 "rgb:87/d7/00",
355 "rgb:87/d7/5f",
356 "rgb:87/d7/87",
357 "rgb:87/d7/af",
358 "rgb:87/d7/d7",
359 "rgb:87/d7/ff",
360 "rgb:87/ff/00",
361 "rgb:87/ff/5f",
362 "rgb:87/ff/87",
363 "rgb:87/ff/af",
364 "rgb:87/ff/d7",
365 "rgb:87/ff/ff",
366 "rgb:af/00/00",
367 "rgb:af/00/5f",
368 "rgb:af/00/87",
369 "rgb:af/00/af",
370 "rgb:af/00/d7",
371 "rgb:af/00/ff",
372 "rgb:af/5f/00",
373 "rgb:af/5f/5f",
374 "rgb:af/5f/87",
375 "rgb:af/5f/af",
376 "rgb:af/5f/d7",
377 "rgb:af/5f/ff",
378 "rgb:af/87/00",
379 "rgb:af/87/5f",
380 "rgb:af/87/87",
381 "rgb:af/87/af",
382 "rgb:af/87/d7",
383 "rgb:af/87/ff",
384 "rgb:af/af/00",
385 "rgb:af/af/5f",
386 "rgb:af/af/87",
387 "rgb:af/af/af",
388 "rgb:af/af/d7",
389 "rgb:af/af/ff",
390 "rgb:af/d7/00",
391 "rgb:af/d7/5f",
392 "rgb:af/d7/87",
393 "rgb:af/d7/af",
394 "rgb:af/d7/d7",
395 "rgb:af/d7/ff",
396 "rgb:af/ff/00",
397 "rgb:af/ff/5f",
398 "rgb:af/ff/87",
399 "rgb:af/ff/af",
400 "rgb:af/ff/d7",
401 "rgb:af/ff/ff",
402 "rgb:d7/00/00",
403 "rgb:d7/00/5f",
404 "rgb:d7/00/87",
405 "rgb:d7/00/af",
406 "rgb:d7/00/d7",
407 "rgb:d7/00/ff",
408 "rgb:d7/5f/00",
409 "rgb:d7/5f/5f",
410 "rgb:d7/5f/87",
411 "rgb:d7/5f/af",
412 "rgb:d7/5f/d7",
413 "rgb:d7/5f/ff",
414 "rgb:d7/87/00",
415 "rgb:d7/87/5f",
416 "rgb:d7/87/87",
417 "rgb:d7/87/af",
418 "rgb:d7/87/d7",
419 "rgb:d7/87/ff",
420 "rgb:d7/af/00",
421 "rgb:d7/af/5f",
422 "rgb:d7/af/87",
423 "rgb:d7/af/af",
424 "rgb:d7/af/d7",
425 "rgb:d7/af/ff",
426 "rgb:d7/d7/00",
427 "rgb:d7/d7/5f",
428 "rgb:d7/d7/87",
429 "rgb:d7/d7/af",
430 "rgb:d7/d7/d7",
431 "rgb:d7/d7/ff",
432 "rgb:d7/ff/00",
433 "rgb:d7/ff/5f",
434 "rgb:d7/ff/87",
435 "rgb:d7/ff/af",
436 "rgb:d7/ff/d7",
437 "rgb:d7/ff/ff",
438 "rgb:ff/00/00",
439 "rgb:ff/00/5f",
440 "rgb:ff/00/87",
441 "rgb:ff/00/af",
442 "rgb:ff/00/d7",
443 "rgb:ff/00/ff",
444 "rgb:ff/5f/00",
445 "rgb:ff/5f/5f",
446 "rgb:ff/5f/87",
447 "rgb:ff/5f/af",
448 "rgb:ff/5f/d7",
449 "rgb:ff/5f/ff",
450 "rgb:ff/87/00",
451 "rgb:ff/87/5f",
452 "rgb:ff/87/87",
453 "rgb:ff/87/af",
454 "rgb:ff/87/d7",
455 "rgb:ff/87/ff",
456 "rgb:ff/af/00",
457 "rgb:ff/af/5f",
458 "rgb:ff/af/87",
459 "rgb:ff/af/af",
460 "rgb:ff/af/d7",
461 "rgb:ff/af/ff",
462 "rgb:ff/d7/00",
463 "rgb:ff/d7/5f",
464 "rgb:ff/d7/87",
465 "rgb:ff/d7/af",
466 "rgb:ff/d7/d7",
467 "rgb:ff/d7/ff",
468 "rgb:ff/ff/00",
469 "rgb:ff/ff/5f",
470 "rgb:ff/ff/87",
471 "rgb:ff/ff/af",
472 "rgb:ff/ff/d7",
473 "rgb:ff/ff/ff",
474 "rgb:08/08/08",
475 "rgb:12/12/12",
476 "rgb:1c/1c/1c",
477 "rgb:26/26/26",
478 "rgb:30/30/30",
479 "rgb:3a/3a/3a",
480 "rgb:44/44/44",
481 "rgb:4e/4e/4e",
482 "rgb:58/58/58",
483 "rgb:62/62/62",
484 "rgb:6c/6c/6c",
485 "rgb:76/76/76",
486 "rgb:80/80/80",
487 "rgb:8a/8a/8a",
488 "rgb:94/94/94",
489 "rgb:9e/9e/9e",
490 "rgb:a8/a8/a8",
491 "rgb:b2/b2/b2",
492 "rgb:bc/bc/bc",
493 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0",
495 "rgb:da/da/da",
496 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee",
498#endif
252 499
253#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 513#if ENABLE_FRILLS
267 NULL, // Color_underline 514 NULL, // Color_underline
268#endif 515#endif
269#ifdef OPTION_HC 516#ifdef OPTION_HC
270 NULL, 517 NULL,
518 NULL,
271#endif 519#endif
272 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
275#endif 523#endif
276#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
277 NULL, 525 NULL,
278#endif 526#endif
279#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 528 "rgb:00/00/00",
281#endif 529#endif
… …
293 ncol = 80; 541 ncol = 80;
294 nrow = 24; 542 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 547 saveLines = SAVELINES;
299 548
300 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
301 550
302 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 563 set_option (Opt_buffered);
314}
315
316static void
317init_secondary ()
318{
319 int i;
320
321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
322 {
323 dup2 (STDERR_FILENO, STDIN_FILENO);
324 }
325 else if (i != STDIN_FILENO)
326 {
327 dup2 (i, STDIN_FILENO);
328 close (i);
329 }
330
331 dup2 (STDERR_FILENO, STDOUT_FILENO);
332} 564}
333 565
334/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
335const char ** 567const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
337{ 569{
338 int i, r_argc; 570 int i;
339 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
340
341 /*
342 * Look for -e option. Find => split and make cmd_argv[] of command args
343 */
344 for (r_argc = 0; r_argc < argc; r_argc++)
345 if (!strcmp (argv[r_argc], "-e"))
346 break;
347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
363
364 for (i = 0; i < r_argc; i++)
365 r_argv[i] = (const char *)argv[i];
366
367 r_argv[i] = NULL;
368 572
369 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
370 574
371 /* 575 /*
372 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
373 */ 577 */
374 578
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
377 581
378 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
379 583
380 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 586
386 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
387 xa = display->xa; 588 xa = display->xa;
388 589
389 set (display); 590 set (display);
390 extract_resources (); 591 extract_resources ();
391 592
392#if XFT 593#if ENABLE_FRILLS
393 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
395#endif 598#endif
396
397#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 599
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
… …
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
… …
533 return cmd_argv; 733 return cmd_argv;
534} 734}
535 735
536/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
537void 737void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
539{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
540 this->envv = envv; 744 this->envv = envv;
541 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{
542 SET_R (this); 771 SET_R (this);
543 set_locale (""); 772 set_locale ("");
544 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
545 774
546 init_vars (); 775 init_vars ();
547
548 init_secondary ();
549 776
550 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
551 778
552#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
553 keyboard->register_done (); 780 keyboard->register_done ();
… …
562 if (chdir (path)) 789 if (chdir (path))
563 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
564 } 791 }
565 792
566 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
567 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
568 795
569 pty = ptytty::create (); 796 pty = ptytty::create ();
570 797
571 create_windows (argc, argv); 798 create_windows (argc, argv);
572 799
573 init_xlocale (); 800 init_xlocale ();
574 801
575 scr_reset (); // initialize screen 802 scr_poweron (); // initialize screen
576 803
577#if 0 804#if 0
578 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
579#endif 806#endif
580 807
581 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
582 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
583#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
584 { 812 bg_init ();
585 bgPixmap.set_target (this);
586 bgPixmap.invalidate ();
587
588#ifdef ENABLE_TRANSPARENCY
589 if (option (Opt_transparent))
590 {
591 bgPixmap.set_transparent ();
592
593#ifdef HAVE_AFTERIMAGE
594 if (rs [Rs_blurradius])
595 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
596#endif
597 if (ISSET_PIXCOLOR (Color_tint))
598 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
599
600 if (rs [Rs_shade])
601 bgPixmap.set_shade (rs [Rs_shade]);
602
603 bgPixmap.set_root_pixmap ();
604 XSelectInput (dpy, display->root, PropertyChangeMask);
605 rootwin_ev.start (display, display->root);
606 }
607#endif
608
609#ifdef BG_IMAGE_FROM_FILE
610 if (rs[Rs_backgroundPixmap])
611 {
612 const char *p = rs[Rs_backgroundPixmap];
613
614 if ((p = strchr (p, ';')) != 0)
615 {
616 p++;
617 bgPixmap.set_geometry (p);
618 }
619 else
620 bgPixmap.set_defaultGeometry ();
621
622 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
623 if (!bgPixmap.window_position_sensitive ())
624 update_background ();
625 }
626#endif
627 }
628#endif 813#endif
629 814
630#if ENABLE_PERL 815#if ENABLE_PERL
631 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
632#endif 817#endif
633 818
634 set_colorfgbg (); 819 init_done = 1;
635 820
636 init_command (cmd_argv); 821 init_command (cmd_argv);
637
638 free (cmd_argv);
639 822
640 if (pty->pty >= 0) 823 if (pty->pty >= 0)
641 pty_ev.start (pty->pty, ev::READ); 824 pty_ev.start (pty->pty, ev::READ);
642 825
643 HOOK_INVOKE ((this, HOOK_START, DT_END)); 826 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
645#if ENABLE_XEMBED 828#if ENABLE_XEMBED
646 if (rs[Rs_embed]) 829 if (rs[Rs_embed])
647 { 830 {
648 long info[2] = { 0, XEMBED_MAPPED }; 831 long info[2] = { 0, XEMBED_MAPPED };
649 832
650 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 833 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
651 32, PropModeReplace, (unsigned char *)&info, 2); 834 32, PropModeReplace, (unsigned char *)&info, 2);
652 } 835 }
653#endif 836#endif
654 837
838#if HAVE_STARTUP_NOTIFICATION
839 SnDisplay *snDisplay;
840 SnLauncheeContext *snContext;
841
842 snDisplay = sn_display_new (dpy, NULL, NULL);
843 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
844
845 /* Tell the window manager that this window is part of the startup context */
846 if (snContext)
847 sn_launchee_context_setup_window (snContext, parent);
848#endif
849
655 XMapWindow (dpy, vt); 850 XMapWindow (dpy, vt);
656 XMapWindow (dpy, parent[0]); 851 XMapWindow (dpy, parent);
852
853#if HAVE_STARTUP_NOTIFICATION
854 if (snContext)
855 {
856 /* Mark the startup process as complete */
857 sn_launchee_context_complete (snContext);
858
859 sn_launchee_context_unref (snContext);
860 }
861
862 sn_display_unref (snDisplay);
863#endif
657 864
658 refresh_check (); 865 refresh_check ();
659} 866}
660 867
661/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
662void 869void
663rxvt_term::init_env () 870rxvt_term::init_env ()
664{ 871{
665 int i;
666 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
667 877
668#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
669 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
670 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
671 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
684 val = XDisplayString (dpy); 894 val = XDisplayString (dpy);
685 895
686 if (rs[Rs_display_name] == NULL) 896 if (rs[Rs_display_name] == NULL)
687 rs[Rs_display_name] = val; /* use broken `:0' value */ 897 rs[Rs_display_name] = val; /* use broken `:0' value */
688 898
689 i = strlen (val);
690 env_display = (char *)rxvt_malloc (i + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
691 900
692 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
693 902
903 env_windowid = (char *)rxvt_malloc (21);
694 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
695 905
696 /* add entries to the environment: 906 /* add entries to the environment:
697 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
698 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
699 * @ COLORTERM: terminal sub-name and also indicates its color 909 * @ COLORTERM: terminal sub-name and also indicates its color
… …
702 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
703 */ 913 */
704 putenv (env_display); 914 putenv (env_display);
705 putenv (env_windowid); 915 putenv (env_windowid);
706 916
707 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
708 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
709 919
710#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
711 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
712#endif 922#endif
713 923
… …
732 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
733#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
734} 944}
735 945
736/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
737/*
738 * This is more or less stolen straight from XFree86 xterm.
739 * This should support all European type languages.
740 */
741void 947void
742rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
743{ 949{
744 set_environ (envv); 950 set_environ (envv);
745 951
746#if HAVE_XSETLOCALE || HAVE_SETLOCALE
747 free (this->locale); 952 free (this->locale);
748 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
749 954
750 if (!this->locale) 955 if (!this->locale)
751 { 956 {
… …
762 967
763 968
764 this->locale = strdup (this->locale); 969 this->locale = strdup (this->locale);
765 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
766 mbstate.reset (); 971 mbstate.reset ();
767#endif
768 972
769#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
770 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
771 // /^UTF.?8/i 975 // /^UTF.?8/i
772 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
773 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
774 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
775 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
776 free (codeset);
777#else 980#else
778 enc_utf8 = 0; 981 enc_utf8 = 0;
779#endif 982#endif
780} 983}
781 984
782void 985void
783rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
784{ 987{
785 set_environ (envv); 988 set_environ (envv);
786 989
787#ifdef USE_XIM 990#if USE_XIM
788 if (!locale) 991 if (!locale)
789 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
790 else 993 else
791 { 994 {
792 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
793 996
794 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
795 { 998 {
796 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
797 return; 1000 return;
798 } 1001 }
799 1002
800 im_ev.start (display); 1003 im_ev.start (display);
801 1004
… …
950/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
951/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
952void 1155void
953rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
954{ 1157{
955 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
956 { 1159 {
957 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
958 1161
959 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
960 /* bright colors */ 1163 /* bright colors */
… …
1052 1255
1053 if (i) 1256 if (i)
1054 ModMetaMask = modmasks[i - 1]; 1257 ModMetaMask = modmasks[i - 1];
1055} 1258}
1056 1259
1260void
1261rxvt_term::set_icon (const char *file)
1262{
1263#if HAVE_PIXBUF
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf)
1266 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return;
1269 }
1270
1271 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1272 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1273
1274 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1275 {
1276 rxvt_warn ("Icon image too big, continuing without.\n");
1277 g_object_unref (pixbuf);
1278 return;
1279 }
1280
1281 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1282 {
1283 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1284 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1285 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1286
1287 buffer [0] = w;
1288 buffer [1] = h;
1289 for (int i = 0; i < h; i++)
1290 {
1291 for (int j = 0; j < w; j++)
1292 {
1293 unsigned char *pixel = row + j * channels;
1294 long value;
1295
1296 if (channels == 4)
1297 value = pixel[3];
1298 else
1299 value = (unsigned char)0x00ff;
1300
1301 value = (value << 8) + pixel[0];
1302 value = (value << 8) + pixel[1];
1303 value = (value << 8) + pixel[2];
1304 buffer[(i * w + j) + 2] = value;
1305 }
1306
1307 row += rowstride;
1308 }
1309
1310 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1311 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1312 free (buffer);
1313 }
1314 else
1315 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1316
1317 g_object_unref (pixbuf);
1318#endif
1319}
1320
1057/*----------------------------------------------------------------------*/ 1321/*----------------------------------------------------------------------*/
1058/* rxvt_Create_Windows () - Open and map the window */ 1322/* Open and map the window */
1059void 1323void
1060rxvt_term::create_windows (int argc, const char *const *argv) 1324rxvt_term::create_windows (int argc, const char *const *argv)
1061{ 1325{
1062 XClassHint classHint; 1326 XClassHint classHint;
1063 XWMHints wmHint; 1327 XWMHints wmHint;
… …
1109 } 1373 }
1110#endif 1374#endif
1111 1375
1112 window_calc (0, 0); 1376 window_calc (0, 0);
1113 1377
1114 /* sub-window placement & size in rxvt_resize_subwindows () */ 1378 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1115 attributes.background_pixel = pix_colors_focused [Color_border]; 1379 attributes.background_pixel = pix_colors_focused [Color_border];
1116 attributes.border_pixel = pix_colors_focused [Color_border]; 1380 attributes.border_pixel = pix_colors_focused [Color_border];
1117 attributes.colormap = cmap; 1381 attributes.colormap = cmap;
1118 1382
1119 top = XCreateWindow (dpy, parent, 1383 top = XCreateWindow (dpy, parent,
… …
1122 ext_bwidth, 1386 ext_bwidth,
1123 depth, InputOutput, visual, 1387 depth, InputOutput, visual,
1124 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1125 &attributes); 1389 &attributes);
1126 1390
1127 this->parent[0] = top; 1391 this->parent = top;
1128 1392
1129 old_width = szHint.width; 1393 set_title (rs [Rs_title]);
1130 old_height = szHint.height; 1394 set_icon_name (rs [Rs_iconName]);
1131
1132 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1133 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1134 1395
1135 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1136 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
1137 1398
1138 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1140 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1141 wmHint.window_group = top; 1402 wmHint.window_group = top;
1142 1403
1143 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1144 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH
1407 /*
1408 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon
1410 */
1411
1412 if (rs [Rs_iconfile])
1413 {
1414 set_icon (rs [Rs_iconfile]);
1415 }
1416#endif
1145 1417
1146#if ENABLE_FRILLS 1418#if ENABLE_FRILLS
1147 if (mwmhints.flags) 1419 if (mwmhints.flags)
1148 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1149 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1421 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1154#if ENABLE_EWMH 1426#if ENABLE_EWMH
1155 xa[XA_NET_WM_PING], 1427 xa[XA_NET_WM_PING],
1156#endif 1428#endif
1157 }; 1429 };
1158 1430
1159 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1431 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1160 1432
1161#if ENABLE_FRILLS 1433#if ENABLE_FRILLS
1162 if (rs[Rs_transient_for]) 1434 if (rs[Rs_transient_for])
1163 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1435 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1164#endif 1436#endif
… …
1187 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1188 1460
1189 /* the vt window */ 1461 /* the vt window */
1190 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1191 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1192 width, height, 1464 vt_width, vt_height,
1193 0, 1465 0,
1194 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1195 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1196 1468
1197 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1225 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1226#endif 1498#endif
1227 1499
1228 pointer_unblank (); 1500 pointer_unblank ();
1229 scr_recolour (); 1501 scr_recolour ();
1230}
1231
1232/* ------------------------------------------------------------------------- *
1233 * GET TTY CURRENT STATE *
1234 * ------------------------------------------------------------------------- */
1235void
1236rxvt_get_ttymode (struct termios *tio, int erase)
1237{
1238 /*
1239 * standard System V termios interface
1240 */
1241 if (tcgetattr (STDIN_FILENO, tio) < 0)
1242 {
1243 // return error - use system defaults,
1244 // where possible, and zero elsewhere
1245 memset (tio, 0, sizeof (struct termios));
1246
1247 tio->c_cc[VINTR] = CINTR;
1248 tio->c_cc[VQUIT] = CQUIT;
1249 tio->c_cc[VERASE] = CERASE;
1250#ifdef VERASE2
1251 tio->c_cc[VERASE2] = CERASE2;
1252#endif
1253 tio->c_cc[VKILL] = CKILL;
1254 tio->c_cc[VSTART] = CSTART;
1255 tio->c_cc[VSTOP] = CSTOP;
1256 tio->c_cc[VSUSP] = CSUSP;
1257# ifdef VDSUSP
1258 tio->c_cc[VDSUSP] = CDSUSP;
1259# endif
1260# ifdef VREPRINT
1261 tio->c_cc[VREPRINT] = CRPRNT;
1262# endif
1263# ifdef VDISCRD
1264 tio->c_cc[VDISCRD] = CFLUSH;
1265# endif
1266# ifdef VWERSE
1267 tio->c_cc[VWERSE] = CWERASE;
1268# endif
1269# ifdef VLNEXT
1270 tio->c_cc[VLNEXT] = CLNEXT;
1271# endif
1272 }
1273
1274 tio->c_cc[VEOF] = CEOF;
1275 tio->c_cc[VEOL] = VDISABLE;
1276# ifdef VEOL2
1277 tio->c_cc[VEOL2] = VDISABLE;
1278# endif
1279# ifdef VSWTC
1280 tio->c_cc[VSWTC] = VDISABLE;
1281# endif
1282# ifdef VSWTCH
1283 tio->c_cc[VSWTCH] = VDISABLE;
1284# endif
1285# if VMIN != VEOF
1286 tio->c_cc[VMIN] = 1;
1287# endif
1288# if VTIME != VEOL
1289 tio->c_cc[VTIME] = 0;
1290# endif
1291
1292 if (erase != -1)
1293 tio->c_cc[VERASE] = (char)erase;
1294
1295 /* input modes */
1296 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1297# ifdef IMAXBEL
1298 | IMAXBEL
1299# endif
1300 | IXON);
1301
1302 /* output modes */
1303 tio->c_oflag = (OPOST | ONLCR);
1304
1305 /* control modes */
1306 tio->c_cflag = (CS8 | CREAD);
1307
1308 /* line discipline modes */
1309 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1310# if defined (ECHOCTL) && defined (ECHOKE)
1311 | ECHOCTL | ECHOKE
1312# endif
1313 | ECHOE | ECHOK);
1314
1315 /*
1316 * Debugging
1317 */
1318#ifdef DEBUG_TTYMODE
1319 /* c_iflag bits */
1320 fprintf (stderr, "Input flags\n");
1321
1322 /* cpp token stringize doesn't work on all machines <sigh> */
1323# define FOO(flag,name) \
1324 if ((tio->c_iflag) & flag) \
1325 fprintf (stderr, "%s ", name)
1326
1327 /* c_iflag bits */
1328 FOO (IGNBRK, "IGNBRK");
1329 FOO (BRKINT, "BRKINT");
1330 FOO (IGNPAR, "IGNPAR");
1331 FOO (PARMRK, "PARMRK");
1332 FOO (INPCK, "INPCK");
1333 FOO (ISTRIP, "ISTRIP");
1334 FOO (INLCR, "INLCR");
1335 FOO (IGNCR, "IGNCR");
1336 FOO (ICRNL, "ICRNL");
1337 FOO (IXON, "IXON");
1338 FOO (IXOFF, "IXOFF");
1339# ifdef IUCLC
1340 FOO (IUCLC, "IUCLC");
1341# endif
1342# ifdef IXANY
1343 FOO (IXANY, "IXANY");
1344# endif
1345# ifdef IMAXBEL
1346 FOO (IMAXBEL, "IMAXBEL");
1347# endif
1348
1349 fprintf (stderr, "\n");
1350
1351# undef FOO
1352# define FOO(entry, name) \
1353 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1354
1355 FOO (VINTR, "VINTR");
1356 FOO (VQUIT, "VQUIT");
1357 FOO (VERASE, "VERASE");
1358 FOO (VKILL, "VKILL");
1359 FOO (VEOF, "VEOF");
1360 FOO (VEOL, "VEOL");
1361# ifdef VEOL2
1362 FOO (VEOL2, "VEOL2");
1363# endif
1364# ifdef VSWTC
1365 FOO (VSWTC, "VSWTC");
1366# endif
1367# ifdef VSWTCH
1368 FOO (VSWTCH, "VSWTCH");
1369# endif
1370 FOO (VSTART, "VSTART");
1371 FOO (VSTOP, "VSTOP");
1372 FOO (VSUSP, "VSUSP");
1373# ifdef VDSUSP
1374 FOO (VDSUSP, "VDSUSP");
1375# endif
1376# ifdef VREPRINT
1377 FOO (VREPRINT, "VREPRINT");
1378# endif
1379# ifdef VDISCRD
1380 FOO (VDISCRD, "VDISCRD");
1381# endif
1382# ifdef VWERSE
1383 FOO (VWERSE, "VWERSE");
1384# endif
1385# ifdef VLNEXT
1386 FOO (VLNEXT, "VLNEXT");
1387# endif
1388
1389 fprintf (stderr, "\n");
1390# undef FOO
1391#endif /* DEBUG_TTYMODE */
1392} 1502}
1393 1503
1394/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1395/* 1505/*
1396 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the
… …
1408 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1409 { 1519 {
1410 if (getfd_hook) 1520 if (getfd_hook)
1411 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1412 1522
1413 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1414 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1415 } 1525 }
1416 } 1526 }
1417 else 1527 else
1418#endif 1528#endif
1419 if (!pty->get ()) 1529 if (!pty->get ())
1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1421 1531
1422 int er; 1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1533
1534 struct termios tio = def_tio;
1423 1535
1424#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1425 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1426 er = rs[Rs_backspace_key][0]; 1538 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1427 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1539 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1428 er = '\177'; /* the initial state anyway */ 1540 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1429 else
1430#endif 1541#endif
1431 er = -1;
1432 1542
1433 rxvt_get_ttymode (&tio, er);
1434 /* init terminal attributes */ 1543 /* init terminal attributes */
1435 cfsetospeed (&tio, BAUDRATE); 1544 cfsetospeed (&tio, BAUDRATE);
1436 cfsetispeed (&tio, BAUDRATE); 1545 cfsetispeed (&tio, BAUDRATE);
1437 tcsetattr (pty->tty, TCSANOW, &tio); 1546 tcsetattr (pty->tty, TCSANOW, &tio);
1438 pty->set_utf8_mode (enc_utf8); 1547 pty->set_utf8_mode (enc_utf8);
… …
1478 1587
1479 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1480 1589
1481 default: 1590 default:
1482 if (!option (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1483 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1484 1600
1485 pty->close_tty (); 1601 pty->close_tty ();
1486 1602
1487 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1488 1604
… …
1513#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1514 int fd; 1630 int fd;
1515 1631
1516 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1517 if (fd >= 0) 1633 if (fd >= 0)
1518 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1519 close (fd); 1636 close (fd);
1637 }
1520#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1521 } 1639 }
1522 1640
1523 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1524 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);
1525 signal (SIGQUIT, SIG_DFL); 1643 signal (SIGQUIT, SIG_DFL);
1526 signal (SIGCHLD, SIG_DFL); 1644 signal (SIGCHLD, SIG_DFL);
1527 signal (SIGHUP, SIG_DFL); 1645 signal (SIGHUP, SIG_DFL);
1528 signal (SIGPIPE, SIG_DFL); 1646 signal (SIGPIPE, SIG_DFL);
1529 /* 1647 /*
1530 * mimick login's behavior by disabling the job control signals 1648 * mimic login's behavior by disabling the job control signals
1531 * a shell that wants them can turn them back on 1649 * a shell that wants them can turn them back on
1532 */ 1650 */
1533#ifdef SIGTSTP 1651#ifdef SIGTSTP
1534 signal (SIGTSTP, SIG_IGN); 1652 signal (SIGTSTP, SIG_IGN);
1535 signal (SIGTTIN, SIG_IGN); 1653 signal (SIGTTIN, SIG_IGN);
… …
1554 const char *argv0, *shell; 1672 const char *argv0, *shell;
1555 1673
1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1674 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1557 shell = "/bin/sh"; 1675 shell = "/bin/sh";
1558 1676
1559 argv0 = (const char *)rxvt_basename (shell); 1677 argv0 = rxvt_basename (shell);
1560 1678
1561 if (option (Opt_loginShell)) 1679 if (option (Opt_loginShell))
1562 { 1680 {
1563 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1681 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1564 1682

Diff Legend

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