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.236 by ayin, Mon Dec 31 01:05:50 2007 UTC vs.
Revision 1.327 by root, Mon Jun 4 15:18:52 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>
… …
72#include <netinet/in.h> 76#include <netinet/in.h>
73#include <arpa/inet.h> 77#include <arpa/inet.h>
74#include <net/if.h> 78#include <net/if.h>
75#include <net/if_arp.h> 79#include <net/if_arp.h>
76 80
77static char * 81static char * ecb_cold
78rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
79{ 83{
80 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
81 struct ifconf ifc; 85 struct ifconf ifc;
82 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
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 create_windows (argc, argv);
797
798 init_xlocale ();
799
800 scr_poweron (); // initialize screen
801
802#if 0
803 XSynchronize (dpy, True);
804#endif
805
806 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */
808#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init ();
811
812#if ENABLE_TRANSPARENCY
813 if (option (Opt_transparent))
814 {
815 bg_set_transparent ();
816
817 if (rs [Rs_blurradius])
818 root_effects.set_blur (rs [Rs_blurradius]);
819
820 if (ISSET_PIXCOLOR (Color_tint))
821 root_effects.set_tint (pix_colors_focused [Color_tint]);
822
823 if (rs [Rs_shade])
824 root_effects.set_shade (rs [Rs_shade]);
825
826 bg_set_root_pixmap ();
827 XSelectInput (dpy, display->root, PropertyChangeMask);
828 rootwin_ev.start (display, display->root);
829 }
830#endif
831 }
832#endif
833
834#if ENABLE_PERL
835 rootwin_ev.start (display, display->root);
836#endif
837
838 init_done = 1;
839
840 init_command (cmd_argv);
841
842 if (pty->pty >= 0)
843 pty_ev.start (pty->pty, ev::READ);
844
845 HOOK_INVOKE ((this, HOOK_START, DT_END));
846
847#if ENABLE_XEMBED
848 if (rs[Rs_embed])
849 {
850 long info[2] = { 0, XEMBED_MAPPED };
851
852 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
853 32, PropModeReplace, (unsigned char *)&info, 2);
854 }
855#endif
856
857#if HAVE_STARTUP_NOTIFICATION
858 SnDisplay *snDisplay;
859 SnLauncheeContext *snContext;
860
861 snDisplay = sn_display_new (dpy, NULL, NULL);
862 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
863
864 /* Tell the window manager that this window is part of the startup context */
865 if (snContext)
866 sn_launchee_context_setup_window (snContext, parent);
867#endif
868
869 XMapWindow (dpy, vt);
870 XMapWindow (dpy, parent);
871
872#if HAVE_STARTUP_NOTIFICATION
873 if (snContext)
874 {
875 /* Mark the startup process as complete */
876 sn_launchee_context_complete (snContext);
877
878 sn_launchee_context_unref (snContext);
879 }
880
881 sn_display_unref (snDisplay);
882#endif
883
884 refresh_check ();
885}
886
887/*----------------------------------------------------------------------*/
888void
554rxvt_term::init_env () 889rxvt_term::init_env ()
555{ 890{
556 int i;
557 char *val; 891 char *val;
892 char *env_display;
893 char *env_windowid;
894 char *env_colorfgbg;
895 char *env_term;
558 896
559#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
560 /* Fixup display_name for export over pty to any interested terminal 898 /* 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 899 * 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 900 * (for the first non-loopback interface) that we get from
… …
575 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
576 914
577 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
578 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
579 917
580 i = strlen (val);
581 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
582 919
583 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
584 921
922 env_windowid = (char *)rxvt_malloc (21);
585 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 923 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
586 924
587 /* add entries to the environment: 925 /* add entries to the environment:
588 * @ DISPLAY: in case we started with -display 926 * @ DISPLAY: in case we started with -display
589 * @ WINDOWID: X window id number of the window 927 * @ WINDOWID: X window id number of the window
590 * @ COLORTERM: terminal sub-name and also indicates its color 928 * @ COLORTERM: terminal sub-name and also indicates its color
… …
593 * @ COLORFGBG: fg;bg color codes 931 * @ COLORFGBG: fg;bg color codes
594 */ 932 */
595 putenv (env_display); 933 putenv (env_display);
596 putenv (env_windowid); 934 putenv (env_windowid);
597 935
598 if (env_colorfgbg) 936 env_colorfgbg = get_colorfgbg ();
599 putenv (env_colorfgbg); 937 putenv (env_colorfgbg);
600 938
601#ifdef RXVT_TERMINFO 939#ifdef RXVT_TERMINFO
602 putenv ("TERMINFO=" RXVT_TERMINFO); 940 putenv ("TERMINFO=" RXVT_TERMINFO);
603#endif 941#endif
604 942
… …
623 unsetenv ("TERMCAP"); /* terminfo should be okay */ 961 unsetenv ("TERMCAP"); /* terminfo should be okay */
624#endif /* HAVE_UNSETENV */ 962#endif /* HAVE_UNSETENV */
625} 963}
626 964
627/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
628/*
629 * This is more or less stolen straight from XFree86 xterm.
630 * This should support all European type languages.
631 */
632void 966void
633rxvt_term::set_locale (const char *locale) 967rxvt_term::set_locale (const char *locale)
634{ 968{
635 set_environ (envv); 969 set_environ (envv);
636 970
637#if HAVE_XSETLOCALE || HAVE_SETLOCALE
638 free (this->locale); 971 free (this->locale);
639 this->locale = setlocale (LC_CTYPE, locale); 972 this->locale = setlocale (LC_CTYPE, locale);
640 973
641 if (!this->locale) 974 if (!this->locale)
642 { 975 {
… …
653 986
654 987
655 this->locale = strdup (this->locale); 988 this->locale = strdup (this->locale);
656 SET_LOCALE (this->locale); 989 SET_LOCALE (this->locale);
657 mbstate.reset (); 990 mbstate.reset ();
658#endif
659 991
660#if HAVE_NL_LANGINFO 992#if HAVE_NL_LANGINFO
661 char *codeset = strdup (nl_langinfo (CODESET)); 993 char *codeset = nl_langinfo (CODESET);
662 // /^UTF.?8/i 994 // /^UTF.?8/i
663 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 995 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
664 && (codeset[1] == 'T' || codeset[1] == 't') 996 && (codeset[1] == 'T' || codeset[1] == 't')
665 && (codeset[2] == 'F' || codeset[2] == 'f') 997 && (codeset[2] == 'F' || codeset[2] == 'f')
666 && (codeset[3] == '8' || codeset[4] == '8'); 998 && (codeset[3] == '8' || codeset[4] == '8');
667 free (codeset);
668#else 999#else
669 enc_utf8 = 0; 1000 enc_utf8 = 0;
670#endif 1001#endif
671} 1002}
672 1003
673void 1004void
674rxvt_term::init_xlocale () 1005rxvt_term::init_xlocale ()
675{ 1006{
676 set_environ (envv); 1007 set_environ (envv);
677 1008
678#ifdef USE_XIM 1009#if USE_XIM
679 if (!locale) 1010 if (!locale)
680 rxvt_warn ("setting locale failed, working without locale support.\n"); 1011 rxvt_warn ("setting locale failed, continuing without locale support.\n");
681 else 1012 else
682 { 1013 {
683 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
684 1015
685 if (!XSupportsLocale ()) 1016 if (!XSupportsLocale ())
686 { 1017 {
687 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1018 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
688 return; 1019 return;
689 } 1020 }
690 1021
691 im_ev.start (display); 1022 im_ev.start (display);
692 1023
… …
733 run_command (argv); 1064 run_command (argv);
734} 1065}
735 1066
736/*----------------------------------------------------------------------*/ 1067/*----------------------------------------------------------------------*/
737void 1068void
738rxvt_term::Get_Colours () 1069rxvt_term::get_colours ()
739{ 1070{
740 int i; 1071 int i;
741 1072
742#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
743 pix_colors = pix_colors_focused; 1074 pix_colors = pix_colors_focused;
… …
803 * get scrollBar shadow colors 1134 * get scrollBar shadow colors
804 * 1135 *
805 * The calculations of topShadow/bottomShadow values are adapted 1136 * The calculations of topShadow/bottomShadow values are adapted
806 * from the fvwm window manager. 1137 * from the fvwm window manager.
807 */ 1138 */
808#ifdef KEEP_SCROLLCOLOR 1139#ifdef RXVT_SCROLLBAR
809 if (depth <= 2) 1140 if (depth <= 2)
810 { 1141 {
811 /* Monochrome */ 1142 /* Monochrome */
812 alias_color (Color_scroll, Color_fg); 1143 alias_color (Color_scroll, Color_fg);
813 alias_color (Color_topShadow, Color_bg); 1144 alias_color (Color_topShadow, Color_bg);
… …
828 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1159 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
829 cscroll.a) 1160 cscroll.a)
830 )) 1161 ))
831 alias_color (Color_topShadow, Color_White); 1162 alias_color (Color_topShadow, Color_White);
832 } 1163 }
833#endif /* KEEP_SCROLLCOLOR */ 1164#endif
834 1165
835#ifdef OFF_FOCUS_FADING 1166#ifdef OFF_FOCUS_FADING
836 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1167 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
837 update_fade_color (i); 1168 update_fade_color (i);
838#endif 1169#endif
… …
841/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
842/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
843void 1174void
844rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
845{ 1176{
846 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
847 { 1178 {
848 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
849 1180
850 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
851 /* bright colors */ 1182 /* bright colors */
… …
943 1274
944 if (i) 1275 if (i)
945 ModMetaMask = modmasks[i - 1]; 1276 ModMetaMask = modmasks[i - 1];
946} 1277}
947 1278
1279void
1280rxvt_term::set_icon (const char *file)
1281{
1282#if HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf)
1285 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return;
1288 }
1289
1290 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1291 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1292
1293 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1294 {
1295 rxvt_warn ("Icon image too big, continuing without.\n");
1296 g_object_unref (pixbuf);
1297 return;
1298 }
1299
1300 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1301 {
1302 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1303 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1304 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1305
1306 buffer [0] = w;
1307 buffer [1] = h;
1308 for (int i = 0; i < h; i++)
1309 {
1310 for (int j = 0; j < w; j++)
1311 {
1312 unsigned char *pixel = row + j * channels;
1313 long value;
1314
1315 if (channels == 4)
1316 value = pixel[3];
1317 else
1318 value = (unsigned char)0x00ff;
1319
1320 value = (value << 8) + pixel[0];
1321 value = (value << 8) + pixel[1];
1322 value = (value << 8) + pixel[2];
1323 buffer[(i * w + j) + 2] = value;
1324 }
1325
1326 row += rowstride;
1327 }
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 g_object_unref (pixbuf);
1337#endif
1338}
1339
948/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
949/* rxvt_Create_Windows () - Open and map the window */ 1341/* Open and map the window */
950void 1342void
951rxvt_term::create_windows (int argc, const char *const *argv) 1343rxvt_term::create_windows (int argc, const char *const *argv)
952{ 1344{
953 XClassHint classHint; 1345 XClassHint classHint;
954 XWMHints wmHint; 1346 XWMHints wmHint;
… …
960 Window top, parent; 1352 Window top, parent;
961 1353
962 dLocal (Display *, dpy); 1354 dLocal (Display *, dpy);
963 1355
964 /* grab colors before netscape does */ 1356 /* grab colors before netscape does */
965 Get_Colours (); 1357 get_colours ();
966 1358
967 if (!set_fonts ()) 1359 if (!set_fonts ())
968 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
969 1361
970 parent = display->root; 1362 parent = display->root;
… …
1000 } 1392 }
1001#endif 1393#endif
1002 1394
1003 window_calc (0, 0); 1395 window_calc (0, 0);
1004 1396
1005 /* sub-window placement & size in rxvt_resize_subwindows () */ 1397 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1006 attributes.background_pixel = pix_colors_focused [Color_border]; 1398 attributes.background_pixel = pix_colors_focused [Color_border];
1007 attributes.border_pixel = pix_colors_focused [Color_border]; 1399 attributes.border_pixel = pix_colors_focused [Color_border];
1008 attributes.colormap = cmap; 1400 attributes.colormap = cmap;
1009 1401
1010 top = XCreateWindow (dpy, parent, 1402 top = XCreateWindow (dpy, parent,
… …
1013 ext_bwidth, 1405 ext_bwidth,
1014 depth, InputOutput, visual, 1406 depth, InputOutput, visual,
1015 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1016 &attributes); 1408 &attributes);
1017 1409
1018 this->parent[0] = top; 1410 this->parent = top;
1019 1411
1020 old_width = szHint.width; 1412 set_title (rs [Rs_title]);
1021 old_height = szHint.height; 1413 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 1414
1026 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1416 classHint.res_class = (char *)RESCLASS;
1028 1417
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1418 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1031 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1421 wmHint.window_group = top;
1033 1422
1034 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1424 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH
1426 /*
1427 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon
1429 */
1430
1431 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif
1036 1436
1037#if ENABLE_FRILLS 1437#if ENABLE_FRILLS
1038 if (mwmhints.flags) 1438 if (mwmhints.flags)
1039 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1040 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1440 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1045#if ENABLE_EWMH 1445#if ENABLE_EWMH
1046 xa[XA_NET_WM_PING], 1446 xa[XA_NET_WM_PING],
1047#endif 1447#endif
1048 }; 1448 };
1049 1449
1050 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1450 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1051 1451
1052#if ENABLE_FRILLS 1452#if ENABLE_FRILLS
1053 if (rs[Rs_transient_for]) 1453 if (rs[Rs_transient_for])
1054 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1454 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1055#endif 1455#endif
… …
1075 termwin_ev.start (display, top); 1475 termwin_ev.start (display, top);
1076 1476
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 1477 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079 1479
1080#ifdef HAVE_SCROLLBARS
1081 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1083#endif
1084
1085 /* the vt window */ 1480 /* the vt window */
1086 vt = XCreateSimpleWindow (dpy, top, 1481 vt = XCreateSimpleWindow (dpy, top,
1087 window_vt_x, window_vt_y, 1482 window_vt_x, window_vt_y,
1088 width, height, 1483 vt_width, vt_height,
1089 0, 1484 0,
1090 pix_colors_focused[Color_fg], 1485 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_bg]); 1486 pix_colors_focused[Color_bg]);
1092 1487
1093 attributes.bit_gravity = NorthWestGravity; 1488 attributes.bit_gravity = NorthWestGravity;
… …
1113 GCForeground | GCBackground | GCGraphicsExposures, 1508 GCForeground | GCBackground | GCGraphicsExposures,
1114 &gcvalue); 1509 &gcvalue);
1115 1510
1116 drawable = new rxvt_drawable (this, vt); 1511 drawable = new rxvt_drawable (this, vt);
1117 1512
1118#ifdef RXVT_SCROLLBAR
1119 gcvalue.foreground = pix_colors[Color_topShadow];
1120 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1121 gcvalue.foreground = pix_colors[Color_bottomShadow];
1122 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1123 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1124 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1125#endif
1126
1127#ifdef OFF_FOCUS_FADING 1513#ifdef OFF_FOCUS_FADING
1128 // initially we are in unfocused state 1514 // initially we are in unfocused state
1129 if (rs[Rs_fade]) 1515 if (rs[Rs_fade])
1130 pix_colors = pix_colors_unfocused; 1516 pix_colors = pix_colors_unfocused;
1131#endif 1517#endif
1132 1518
1133 pointer_unblank (); 1519 pointer_unblank ();
1134 scr_recolour (); 1520 scr_recolour ();
1135}
1136
1137/* ------------------------------------------------------------------------- *
1138 * GET TTY CURRENT STATE *
1139 * ------------------------------------------------------------------------- */
1140void
1141rxvt_get_ttymode (struct termios *tio, int erase)
1142{
1143 /*
1144 * standard System V termios interface
1145 */
1146 if (tcgetattr (STDIN_FILENO, tio) < 0)
1147 {
1148 // return error - use system defaults,
1149 // where possible, and zero elsewhere
1150 memset (tio, 0, sizeof (struct termios));
1151
1152 tio->c_cc[VINTR] = CINTR;
1153 tio->c_cc[VQUIT] = CQUIT;
1154 tio->c_cc[VERASE] = CERASE;
1155#ifdef VERASE2
1156 tio->c_cc[VERASE2] = CERASE2;
1157#endif
1158 tio->c_cc[VKILL] = CKILL;
1159 tio->c_cc[VSTART] = CSTART;
1160 tio->c_cc[VSTOP] = CSTOP;
1161 tio->c_cc[VSUSP] = CSUSP;
1162# ifdef VDSUSP
1163 tio->c_cc[VDSUSP] = CDSUSP;
1164# endif
1165# ifdef VREPRINT
1166 tio->c_cc[VREPRINT] = CRPRNT;
1167# endif
1168# ifdef VDISCRD
1169 tio->c_cc[VDISCRD] = CFLUSH;
1170# endif
1171# ifdef VWERSE
1172 tio->c_cc[VWERSE] = CWERASE;
1173# endif
1174# ifdef VLNEXT
1175 tio->c_cc[VLNEXT] = CLNEXT;
1176# endif
1177 }
1178
1179 tio->c_cc[VEOF] = CEOF;
1180 tio->c_cc[VEOL] = VDISABLE;
1181# ifdef VEOL2
1182 tio->c_cc[VEOL2] = VDISABLE;
1183# endif
1184# ifdef VSWTC
1185 tio->c_cc[VSWTC] = VDISABLE;
1186# endif
1187# ifdef VSWTCH
1188 tio->c_cc[VSWTCH] = VDISABLE;
1189# endif
1190# if VMIN != VEOF
1191 tio->c_cc[VMIN] = 1;
1192# endif
1193# if VTIME != VEOL
1194 tio->c_cc[VTIME] = 0;
1195# endif
1196
1197 if (erase != -1)
1198 tio->c_cc[VERASE] = (char)erase;
1199
1200 /* input modes */
1201 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1202# ifdef IMAXBEL
1203 | IMAXBEL
1204# endif
1205 | IXON);
1206
1207 /* output modes */
1208 tio->c_oflag = (OPOST | ONLCR);
1209
1210 /* control modes */
1211 tio->c_cflag = (CS8 | CREAD);
1212
1213 /* line discipline modes */
1214 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1215# if defined (ECHOCTL) && defined (ECHOKE)
1216 | ECHOCTL | ECHOKE
1217# endif
1218 | ECHOE | ECHOK);
1219
1220 /*
1221 * Debugging
1222 */
1223#ifdef DEBUG_TTYMODE
1224 /* c_iflag bits */
1225 fprintf (stderr, "Input flags\n");
1226
1227 /* cpp token stringize doesn't work on all machines <sigh> */
1228# define FOO(flag,name) \
1229 if ((tio->c_iflag) & flag) \
1230 fprintf (stderr, "%s ", name)
1231
1232 /* c_iflag bits */
1233 FOO (IGNBRK, "IGNBRK");
1234 FOO (BRKINT, "BRKINT");
1235 FOO (IGNPAR, "IGNPAR");
1236 FOO (PARMRK, "PARMRK");
1237 FOO (INPCK, "INPCK");
1238 FOO (ISTRIP, "ISTRIP");
1239 FOO (INLCR, "INLCR");
1240 FOO (IGNCR, "IGNCR");
1241 FOO (ICRNL, "ICRNL");
1242 FOO (IXON, "IXON");
1243 FOO (IXOFF, "IXOFF");
1244# ifdef IUCLC
1245 FOO (IUCLC, "IUCLC");
1246# endif
1247# ifdef IXANY
1248 FOO (IXANY, "IXANY");
1249# endif
1250# ifdef IMAXBEL
1251 FOO (IMAXBEL, "IMAXBEL");
1252# endif
1253
1254 fprintf (stderr, "\n");
1255
1256# undef FOO
1257# define FOO(entry, name) \
1258 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1259
1260 FOO (VINTR, "VINTR");
1261 FOO (VQUIT, "VQUIT");
1262 FOO (VERASE, "VERASE");
1263 FOO (VKILL, "VKILL");
1264 FOO (VEOF, "VEOF");
1265 FOO (VEOL, "VEOL");
1266# ifdef VEOL2
1267 FOO (VEOL2, "VEOL2");
1268# endif
1269# ifdef VSWTC
1270 FOO (VSWTC, "VSWTC");
1271# endif
1272# ifdef VSWTCH
1273 FOO (VSWTCH, "VSWTCH");
1274# endif
1275 FOO (VSTART, "VSTART");
1276 FOO (VSTOP, "VSTOP");
1277 FOO (VSUSP, "VSUSP");
1278# ifdef VDSUSP
1279 FOO (VDSUSP, "VDSUSP");
1280# endif
1281# ifdef VREPRINT
1282 FOO (VREPRINT, "VREPRINT");
1283# endif
1284# ifdef VDISCRD
1285 FOO (VDISCRD, "VDISCRD");
1286# endif
1287# ifdef VWERSE
1288 FOO (VWERSE, "VWERSE");
1289# endif
1290# ifdef VLNEXT
1291 FOO (VLNEXT, "VLNEXT");
1292# endif
1293
1294 fprintf (stderr, "\n");
1295# undef FOO
1296#endif /* DEBUG_TTYMODE */
1297} 1521}
1298 1522
1299/*----------------------------------------------------------------------*/ 1523/*----------------------------------------------------------------------*/
1300/* 1524/*
1301 * Run the command in a subprocess and return a file descriptor for the 1525 * Run the command in a subprocess and return a file descriptor for the
… …
1313 if (pty->pty >= 0) 1537 if (pty->pty >= 0)
1314 { 1538 {
1315 if (getfd_hook) 1539 if (getfd_hook)
1316 pty->pty = (*getfd_hook) (pty->pty); 1540 pty->pty = (*getfd_hook) (pty->pty);
1317 1541
1318 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1542 if (pty->pty < 0)
1319 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1543 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1320 } 1544 }
1321 } 1545 }
1322 else 1546 else
1323#endif 1547#endif
1324 if (!pty->get ()) 1548 if (!pty->get ())
1325 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1326 1550
1327 int er; 1551 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552
1553 struct termios tio = def_tio;
1328 1554
1329#ifndef NO_BACKSPACE_KEY 1555#ifndef NO_BACKSPACE_KEY
1330 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1331 er = rs[Rs_backspace_key][0]; 1557 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1332 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1558 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1333 er = '\177'; /* the initial state anyway */ 1559 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1334 else
1335#endif 1560#endif
1336 er = -1;
1337 1561
1338 rxvt_get_ttymode (&tio, er);
1339 /* init terminal attributes */ 1562 /* init terminal attributes */
1340 cfsetospeed (&tio, BAUDRATE); 1563 cfsetospeed (&tio, BAUDRATE);
1341 cfsetispeed (&tio, BAUDRATE); 1564 cfsetispeed (&tio, BAUDRATE);
1342 tcsetattr (pty->tty, TCSANOW, &tio); 1565 tcsetattr (pty->tty, TCSANOW, &tio);
1343 pty->set_utf8_mode (enc_utf8); 1566 pty->set_utf8_mode (enc_utf8);
… …
1383 1606
1384 _exit (EXIT_FAILURE); 1607 _exit (EXIT_FAILURE);
1385 1608
1386 default: 1609 default:
1387 if (!option (Opt_utmpInhibit)) 1610 if (!option (Opt_utmpInhibit))
1611 {
1612#ifdef LOG_ONLY_ON_LOGIN
1613 bool login_shell = option (Opt_loginShell);
1614#else
1615 bool login_shell = true;
1616#endif
1388 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1617 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1618 }
1389 1619
1390 pty->close_tty (); 1620 pty->close_tty ();
1391 1621
1392 child_ev.start (cmd_pid); 1622 child_ev.start (cmd_pid);
1393 1623
… …
1418#elif defined (SRIOCSREDIR) 1648#elif defined (SRIOCSREDIR)
1419 int fd; 1649 int fd;
1420 1650
1421 fd = open (CONSOLE, O_WRONLY, 0); 1651 fd = open (CONSOLE, O_WRONLY, 0);
1422 if (fd >= 0) 1652 if (fd >= 0)
1423 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1653 {
1654 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1424 close (fd); 1655 close (fd);
1656 }
1425#endif /* SRIOCSREDIR */ 1657#endif /* SRIOCSREDIR */
1426 } 1658 }
1427 1659
1428 /* reset signals and spin off the command interpreter */ 1660 /* reset signals and spin off the command interpreter */
1429 signal (SIGINT, SIG_DFL); 1661 signal (SIGINT, SIG_DFL);
1430 signal (SIGQUIT, SIG_DFL); 1662 signal (SIGQUIT, SIG_DFL);
1431 signal (SIGCHLD, SIG_DFL); 1663 signal (SIGCHLD, SIG_DFL);
1432 signal (SIGHUP, SIG_DFL); 1664 signal (SIGHUP, SIG_DFL);
1433 signal (SIGPIPE, SIG_DFL); 1665 signal (SIGPIPE, SIG_DFL);
1434 /* 1666 /*
1435 * mimick login's behavior by disabling the job control signals 1667 * mimic login's behavior by disabling the job control signals
1436 * a shell that wants them can turn them back on 1668 * a shell that wants them can turn them back on
1437 */ 1669 */
1438#ifdef SIGTSTP 1670#ifdef SIGTSTP
1439 signal (SIGTSTP, SIG_IGN); 1671 signal (SIGTSTP, SIG_IGN);
1440 signal (SIGTTIN, SIG_IGN); 1672 signal (SIGTTIN, SIG_IGN);
1441 signal (SIGTTOU, SIG_IGN); 1673 signal (SIGTTOU, SIG_IGN);
1442#endif /* SIGTSTP */ 1674#endif /* SIGTSTP */
1443 1675
1444 // unblock signals (signals are blocked by iom.C
1445 sigset_t ss;
1446 sigemptyset (&ss);
1447 sigprocmask (SIG_SETMASK, &ss, 0);
1448
1449 /* command interpreter path */ 1676 /* command interpreter path */
1450 if (argv) 1677 if (argv)
1451 { 1678 {
1452# ifdef DEBUG_CMD 1679# ifdef DEBUG_CMD
1453 int i; 1680 int i;
… …
1464 const char *argv0, *shell; 1691 const char *argv0, *shell;
1465 1692
1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1693 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1467 shell = "/bin/sh"; 1694 shell = "/bin/sh";
1468 1695
1469 argv0 = (const char *)rxvt_basename (shell); 1696 argv0 = rxvt_basename (shell);
1470 1697
1471 if (option (Opt_loginShell)) 1698 if (option (Opt_loginShell))
1472 { 1699 {
1473 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1700 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1474 1701

Diff Legend

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