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.260 by sf-exg, Wed Jan 6 12:10:44 2010 UTC vs.
Revision 1.340 by root, Sat Dec 13 12:24:32 2014 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 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
… …
313 set_option (Opt_iso14755); 561 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 563 set_option (Opt_buffered);
316} 564}
317 565
318static void
319init_secondary ()
320{
321 int i;
322
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 dup2 (STDERR_FILENO, STDIN_FILENO);
326 }
327 else if (i != STDIN_FILENO)
328 {
329 dup2 (i, STDIN_FILENO);
330 close (i);
331 }
332
333 dup2 (STDERR_FILENO, STDOUT_FILENO);
334}
335
336/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
337const char ** 567const char **
338rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
339{ 569{
340 int i, r_argc; 570 int i;
341 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
342
343 /*
344 * Look for -e option. Find => split and make cmd_argv[] of command args
345 */
346 for (r_argc = 0; r_argc < argc; r_argc++)
347 if (!strcmp (argv[r_argc], "-e"))
348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
363
364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
365
366 for (i = 0; i < r_argc; i++)
367 r_argv[i] = (const char *)argv[i];
368
369 r_argv[i] = NULL;
370 572
371 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
372 574
373 /* 575 /*
374 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
375 */ 577 */
376 578
377 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
378 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
379 581
380 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
381 583
382 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
385 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]);
386 }
387 586
388 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
389 xa = display->xa; 588 xa = display->xa;
390 589
391 set (display); 590 set (display);
392 extract_resources (); 591 extract_resources ();
393 592
394#if XFT 593#if ENABLE_FRILLS
395 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
396 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));
397#endif 598#endif
398
399 free (r_argv);
400 599
401 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
402 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
403 rs [i] = 0; 602 rs [i] = 0;
404 603
405#ifdef HAVE_AFTERIMAGE
406 set_application_name ((char *)rs[Rs_name]);
407 set_output_threshold (OUTPUT_LEVEL_WARNING);
408#endif
409
410#if ENABLE_PERL 604#if ENABLE_PERL
411 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
412 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
413 607
414 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
417 { 611 {
418 rxvt_perl.init (this); 612 rxvt_perl.init (this);
419 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
420 } 614 }
421#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 ();
422 620
423 /* 621 /*
424 * set any defaults not already set 622 * set any defaults not already set
425 */ 623 */
426 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
461 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
462 pointerBlankDelay = i; 660 pointerBlankDelay = i;
463 else 661 else
464 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
465#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
669
670 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
466 671
467 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
468 if (!saveLines) 673 if (!saveLines)
469 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
470 675
… …
535 return cmd_argv; 740 return cmd_argv;
536} 741}
537 742
538/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
539void 744void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
541{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
542 this->envv = envv; 751 this->envv = envv;
543 752
753 env = new char *[this->envv->size ()];
754 for (int i = 0; i < this->envv->size (); i++)
755 env[i] = this->envv->at (i);
756
757 init2 (argv->size () - 1, argv->begin ());
758}
759
760void
761rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
762{
763#if ENABLE_PERL
764 // perl might want to access the stringvecs later, so we need to copy them
765 stringvec *args = new stringvec;
766 for (int i = 0; i < argc; i++)
767 args->push_back (strdup (argv [i]));
768
769 stringvec *envs = new stringvec;
770 for (const char *const *var = envv; *var; var++)
771 envs->push_back (strdup (*var));
772
773 init (args, envs);
774#else
775 init2 (argc, argv);
776#endif
777}
778
779void
780rxvt_term::init2 (int argc, const char *const *argv)
781{
544 SET_R (this); 782 SET_R (this);
545 set_locale (""); 783 set_locale ("");
546 set_environ (envv); // a few things in X do not call setlocale :( 784 set_environ (env); // a few things in X do not call setlocale :(
547 785
548 init_vars (); 786 init_vars ();
549
550 init_secondary ();
551 787
552 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
553 789
554#ifdef KEYSYM_RESOURCE 790#ifdef KEYSYM_RESOURCE
555 keyboard->register_done (); 791 keyboard->register_done ();
… …
564 if (chdir (path)) 800 if (chdir (path))
565 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 801 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
566 } 802 }
567 803
568 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
570 806
571 pty = ptytty::create (); 807 pty = ptytty::create ();
572 808
573 create_windows (argc, argv); 809 create_windows (argc, argv);
574 810
… …
580 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
581#endif 817#endif
582 818
583 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
584 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
585#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
586 { 823 bg_init ();
587 bgPixmap.set_target (this);
588 bgPixmap.invalidate ();
589
590#ifdef ENABLE_TRANSPARENCY
591 if (option (Opt_transparent))
592 {
593 bgPixmap.set_transparent ();
594
595#ifdef HAVE_AFTERIMAGE
596 if (rs [Rs_blurradius])
597 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
598#endif
599 if (ISSET_PIXCOLOR (Color_tint))
600 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
601
602 if (rs [Rs_shade])
603 bgPixmap.set_shade (rs [Rs_shade]);
604
605 bgPixmap.set_root_pixmap ();
606 XSelectInput (dpy, display->root, PropertyChangeMask);
607 rootwin_ev.start (display, display->root);
608 }
609#endif
610
611#ifdef BG_IMAGE_FROM_FILE
612 if (rs[Rs_backgroundPixmap])
613 {
614 const char *p = rs[Rs_backgroundPixmap];
615
616 if ((p = strchr (p, ';')) != 0)
617 {
618 p++;
619 bgPixmap.set_geometry (p);
620 }
621 else
622 bgPixmap.set_defaultGeometry ();
623
624 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
625 if (!bgPixmap.window_position_sensitive ())
626 update_background ();
627 }
628#endif
629 }
630#endif 824#endif
631 825
632#if ENABLE_PERL 826#if ENABLE_PERL
633 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
634#endif 828#endif
635 829
636 set_colorfgbg (); 830 init_done = 1;
637 831
638 init_command (cmd_argv); 832 init_command (cmd_argv);
639
640 free (cmd_argv);
641 833
642 if (pty->pty >= 0) 834 if (pty->pty >= 0)
643 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
644 836
645 HOOK_INVOKE ((this, HOOK_START, DT_END)); 837 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
647#if ENABLE_XEMBED 839#if ENABLE_XEMBED
648 if (rs[Rs_embed]) 840 if (rs[Rs_embed])
649 { 841 {
650 long info[2] = { 0, XEMBED_MAPPED }; 842 long info[2] = { 0, XEMBED_MAPPED };
651 843
652 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 844 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
653 32, PropModeReplace, (unsigned char *)&info, 2); 845 32, PropModeReplace, (unsigned char *)&info, 2);
654 } 846 }
655#endif 847#endif
656 848
849#if HAVE_STARTUP_NOTIFICATION
850 SnDisplay *snDisplay;
851 SnLauncheeContext *snContext;
852
853 snDisplay = sn_display_new (dpy, NULL, NULL);
854 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
855
856 /* Tell the window manager that this window is part of the startup context */
857 if (snContext)
858 sn_launchee_context_setup_window (snContext, parent);
859#endif
860
657 XMapWindow (dpy, vt); 861 XMapWindow (dpy, vt);
658 XMapWindow (dpy, parent[0]); 862 XMapWindow (dpy, parent);
863
864#if HAVE_STARTUP_NOTIFICATION
865 if (snContext)
866 {
867 /* Mark the startup process as complete */
868 sn_launchee_context_complete (snContext);
869
870 sn_launchee_context_unref (snContext);
871 }
872
873 sn_display_unref (snDisplay);
874#endif
659 875
660 refresh_check (); 876 refresh_check ();
661} 877}
662 878
663/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
664void 880void
665rxvt_term::init_env () 881rxvt_term::init_env ()
666{ 882{
667 int i;
668 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
669 888
670#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
671 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
672 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 891 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
673 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
686 val = XDisplayString (dpy); 905 val = XDisplayString (dpy);
687 906
688 if (rs[Rs_display_name] == NULL) 907 if (rs[Rs_display_name] == NULL)
689 rs[Rs_display_name] = val; /* use broken `:0' value */ 908 rs[Rs_display_name] = val; /* use broken `:0' value */
690 909
691 i = strlen (val);
692 env_display = (char *)rxvt_malloc (i + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
693 911
694 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
695 913
914 env_windowid = (char *)rxvt_malloc (21);
696 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
697 916
698 /* add entries to the environment: 917 /* add entries to the environment:
699 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
700 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
701 * @ COLORTERM: terminal sub-name and also indicates its color 920 * @ COLORTERM: terminal sub-name and also indicates its color
… …
704 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
705 */ 924 */
706 putenv (env_display); 925 putenv (env_display);
707 putenv (env_windowid); 926 putenv (env_windowid);
708 927
709 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
710 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
711 930
712#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
713 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
714#endif 933#endif
715 934
… …
734 unsetenv ("TERMCAP"); /* terminfo should be okay */ 953 unsetenv ("TERMCAP"); /* terminfo should be okay */
735#endif /* HAVE_UNSETENV */ 954#endif /* HAVE_UNSETENV */
736} 955}
737 956
738/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
739/*
740 * This is more or less stolen straight from XFree86 xterm.
741 * This should support all European type languages.
742 */
743void 958void
744rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
745{ 960{
746 set_environ (envv); 961 set_environ (env);
747 962
748#if HAVE_XSETLOCALE || HAVE_SETLOCALE
749 free (this->locale); 963 free (this->locale);
750 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
751 965
752 if (!this->locale) 966 if (!this->locale)
753 { 967 {
… …
764 978
765 979
766 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
767 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
768 mbstate.reset (); 982 mbstate.reset ();
769#endif
770 983
771#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
772 char *codeset = strdup (nl_langinfo (CODESET)); 985 char *codeset = nl_langinfo (CODESET);
773 // /^UTF.?8/i 986 // /^UTF.?8/i
774 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
775 && (codeset[1] == 'T' || codeset[1] == 't') 988 && (codeset[1] == 'T' || codeset[1] == 't')
776 && (codeset[2] == 'F' || codeset[2] == 'f') 989 && (codeset[2] == 'F' || codeset[2] == 'f')
777 && (codeset[3] == '8' || codeset[4] == '8'); 990 && (codeset[3] == '8' || codeset[4] == '8');
778 free (codeset);
779#else 991#else
780 enc_utf8 = 0; 992 enc_utf8 = 0;
781#endif 993#endif
782} 994}
783 995
784void 996void
785rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
786{ 998{
787 set_environ (envv); 999 set_environ (env);
788 1000
789#ifdef USE_XIM 1001#if USE_XIM
790 if (!locale) 1002 if (!locale)
791 rxvt_warn ("setting locale failed, working without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
792 else 1004 else
793 { 1005 {
794 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
795 1007
796 if (!XSupportsLocale ()) 1008 if (!XSupportsLocale ())
797 { 1009 {
798 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1010 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
799 return; 1011 return;
800 } 1012 }
801 1013
802 im_ev.start (display); 1014 im_ev.start (display);
803 1015
… …
844 run_command (argv); 1056 run_command (argv);
845} 1057}
846 1058
847/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
848void 1060void
849rxvt_term::get_colours () 1061rxvt_term::get_colors ()
850{ 1062{
851 int i; 1063 int i;
852 1064
853#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
854 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
855#endif 1067#endif
856 1068
857 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
858 { 1070 {
859 const char *name = rs[Rs_color + i]; 1071 const char *name = rs[Rs_color + i];
860 1072
861 if (!name) 1073 if (!name)
862 continue; 1074 continue;
… …
872#endif 1084#endif
873 name = def_colorName [i]; 1085 name = def_colorName [i];
874 1086
875 if (!name) 1087 if (!name)
876 continue; 1088 continue;
1089
1090 xcol.free (this);
877 1091
878 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
879 { 1093 {
880 switch (i) 1094 switch (i)
881 { 1095 {
… …
901 1115
902 pix_colors[i] = xcol; 1116 pix_colors[i] = xcol;
903 rs[Rs_color + i] = name; 1117 rs[Rs_color + i] = name;
904 } 1118 }
905 1119
906 if (depth <= 2)
907 {
908 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
909 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
910 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
911 }
912
913 /* 1120 /*
914 * get scrollBar shadow colors 1121 * get scrollBar shadow colors
915 * 1122 *
916 * The calculations of topShadow/bottomShadow values are adapted 1123 * The calculations of topShadow/bottomShadow values are adapted
917 * from the fvwm window manager. 1124 * from the fvwm window manager.
918 */ 1125 */
919#ifdef RXVT_SCROLLBAR 1126#ifdef RXVT_SCROLLBAR
920 if (depth <= 2)
921 {
922 /* Monochrome */
923 alias_color (Color_scroll, Color_fg);
924 alias_color (Color_topShadow, Color_bg);
925 alias_color (Color_bottomShadow, Color_bg);
926 }
927 else
928 {
929 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1127 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
930 1128
931 rgba cscroll; 1129 rgba cscroll;
932 pix_colors [Color_scroll].get (cscroll); 1130 pix_colors [Color_scroll].get (cscroll);
933 1131
934 /* topShadowColor */ 1132 /* topShadowColor */
935 if (!pix_colors[Color_topShadow].set (this, 1133 if (!pix_colors[Color_topShadow].set (this,
936 rgba ( 1134 rgba (
937 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1135 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
938 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1136 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
939 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
940 cscroll.a) 1138 cscroll.a)
941 )) 1139 ))
942 alias_color (Color_topShadow, Color_White); 1140 alias_color (Color_topShadow, Color_White);
943 }
944#endif 1141#endif
945 1142
946#ifdef OFF_FOCUS_FADING 1143#ifdef OFF_FOCUS_FADING
947 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1144 for (i = 0; i < NRS_COLORS; i++)
948 update_fade_color (i); 1145 update_fade_color (i, true);
949#endif 1146#endif
950} 1147}
951 1148
952/*----------------------------------------------------------------------*/ 1149/*----------------------------------------------------------------------*/
953/* color aliases, fg/bg bright-bold */ 1150/* color aliases, fg/bg bright-bold */
954void 1151void
955rxvt_term::color_aliases (int idx) 1152rxvt_term::color_aliases (int idx)
956{ 1153{
957 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1154 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
958 { 1155 {
959 int i = atoi (rs[Rs_color + idx]); 1156 int i = atoi (rs[Rs_color + idx]);
960 1157
961 if (i >= 8 && i <= 15) 1158 if (i >= 8 && i <= 15)
962 /* bright colors */ 1159 /* bright colors */
… …
1002 for (j = map->max_keypermod; j--; k++) 1199 for (j = map->max_keypermod; j--; k++)
1003 { 1200 {
1004 if (kc[k] == 0) 1201 if (kc[k] == 0)
1005 break; 1202 break;
1006 1203
1007 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1204 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1008 { 1205 {
1009 case XK_Num_Lock: 1206 case XK_Num_Lock:
1010 ModNumLockMask = modmasks[i - 1]; 1207 ModNumLockMask = modmasks[i - 1];
1011 continue; 1208 continue;
1012 1209
… …
1054 1251
1055 if (i) 1252 if (i)
1056 ModMetaMask = modmasks[i - 1]; 1253 ModMetaMask = modmasks[i - 1];
1057} 1254}
1058 1255
1256void
1257rxvt_term::set_icon (const char *file)
1258{
1259#if HAVE_PIXBUF
1260 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1261 if (!pixbuf)
1262 {
1263 rxvt_warn ("Loading image icon failed, continuing without.\n");
1264 return;
1265 }
1266
1267 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1268 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1269
1270 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1271 {
1272 rxvt_warn ("Icon image too big, continuing without.\n");
1273 g_object_unref (pixbuf);
1274 return;
1275 }
1276
1277 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1278 {
1279 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1280 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1281 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1282
1283 buffer [0] = w;
1284 buffer [1] = h;
1285 for (int i = 0; i < h; i++)
1286 {
1287 for (int j = 0; j < w; j++)
1288 {
1289 unsigned char *pixel = row + j * channels;
1290 long value;
1291
1292 if (channels == 4)
1293 value = pixel[3];
1294 else
1295 value = (unsigned char)0x00ff;
1296
1297 value = (value << 8) + pixel[0];
1298 value = (value << 8) + pixel[1];
1299 value = (value << 8) + pixel[2];
1300 buffer[(i * w + j) + 2] = value;
1301 }
1302
1303 row += rowstride;
1304 }
1305
1306 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1307 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1308 free (buffer);
1309 }
1310 else
1311 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1312
1313 g_object_unref (pixbuf);
1314#endif
1315}
1316
1059/*----------------------------------------------------------------------*/ 1317/*----------------------------------------------------------------------*/
1060/* rxvt_Create_Windows () - Open and map the window */ 1318/* Open and map the window */
1061void 1319void
1062rxvt_term::create_windows (int argc, const char *const *argv) 1320rxvt_term::create_windows (int argc, const char *const *argv)
1063{ 1321{
1064 XClassHint classHint; 1322 XClassHint classHint;
1065 XWMHints wmHint; 1323 XWMHints wmHint;
… …
1071 Window top, parent; 1329 Window top, parent;
1072 1330
1073 dLocal (Display *, dpy); 1331 dLocal (Display *, dpy);
1074 1332
1075 /* grab colors before netscape does */ 1333 /* grab colors before netscape does */
1076 get_colours (); 1334 get_colors ();
1077 1335
1078 if (!set_fonts ()) 1336 if (!set_fonts ())
1079 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1337 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1080 1338
1081 parent = display->root; 1339 parent = display->root;
… …
1111 } 1369 }
1112#endif 1370#endif
1113 1371
1114 window_calc (0, 0); 1372 window_calc (0, 0);
1115 1373
1116 /* sub-window placement & size in rxvt_resize_subwindows () */ 1374 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1117 attributes.background_pixel = pix_colors_focused [Color_border]; 1375 attributes.background_pixel = pix_colors_focused [Color_border];
1118 attributes.border_pixel = pix_colors_focused [Color_border]; 1376 attributes.border_pixel = pix_colors_focused [Color_border];
1119 attributes.colormap = cmap; 1377 attributes.colormap = cmap;
1120 1378
1121 top = XCreateWindow (dpy, parent, 1379 top = XCreateWindow (dpy, parent,
… …
1124 ext_bwidth, 1382 ext_bwidth,
1125 depth, InputOutput, visual, 1383 depth, InputOutput, visual,
1126 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1384 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1127 &attributes); 1385 &attributes);
1128 1386
1129 this->parent[0] = top; 1387 this->parent = top;
1130
1131 old_width = szHint.width;
1132 old_height = szHint.height;
1133 1388
1134 set_title (rs [Rs_title]); 1389 set_title (rs [Rs_title]);
1135 set_icon_name (rs [Rs_iconName]); 1390 set_icon_name (rs [Rs_iconName]);
1136 1391
1137 classHint.res_name = (char *)rs[Rs_name]; 1392 classHint.res_name = (char *)rs[Rs_name];
1138 classHint.res_class = (char *)RESCLASS; 1393 classHint.res_class = (char *)RESCLASS;
1139 1394
1140 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1395 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1141 wmHint.input = True; 1396 wmHint.input = True;
1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1397 wmHint.initial_state = option (Opt_iconic) ? IconicState
1398 : option (Opt_dockapp) ? WithdrawnState
1399 : NormalState;
1143 wmHint.window_group = top; 1400 wmHint.window_group = top;
1144 1401
1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1402 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1146 &szHint, &wmHint, &classHint); 1403 &szHint, &wmHint, &classHint);
1147#if ENABLE_EWMH 1404#if ENABLE_EWMH
1148# ifdef HAVE_AFTERIMAGE
1149 /* 1405 /*
1150 * set up icon hint 1406 * set up icon hint
1151 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1407 * rs [Rs_iconfile] is path to icon
1152 */ 1408 */
1153 1409
1154 if (rs [Rs_iconfile]) 1410 if (rs [Rs_iconfile])
1155 { 1411 set_icon (rs [Rs_iconfile]);
1156 init_asv ();
1157
1158 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1159 if (asv && im)
1160 {
1161 int w = im->width;
1162 int h = im->height;
1163 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1164 ASImage *result = scale_asimage (asv, im,
1165 w, h, ASA_ARGB32,
1166 100, ASIMAGE_QUALITY_DEFAULT);
1167 destroy_asimage (&im);
1168
1169 if (buffer && result)
1170 {
1171 ARGB32 *asbuf = result->alt.argb32;
1172 buffer [0] = w;
1173 buffer [1] = h;
1174
1175 for (unsigned int i = 0; i < w * h; ++i)
1176 buffer [i + 2] = asbuf [i];
1177
1178 destroy_asimage (&result);
1179 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1180 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1181 free (buffer);
1182 }
1183 else
1184 {
1185 if (!buffer)
1186 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1187
1188 if (!result)
1189 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1190 }
1191 }
1192 else
1193 rxvt_warn ("Loading image icon failed, continuing without.\n");
1194 }
1195# endif
1196#endif 1412#endif
1197 1413
1198#if ENABLE_FRILLS 1414#if ENABLE_FRILLS
1199 if (mwmhints.flags) 1415 if (mwmhints.flags)
1200 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1416 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1206#if ENABLE_EWMH 1422#if ENABLE_EWMH
1207 xa[XA_NET_WM_PING], 1423 xa[XA_NET_WM_PING],
1208#endif 1424#endif
1209 }; 1425 };
1210 1426
1211 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1427 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1212 1428
1213#if ENABLE_FRILLS 1429#if ENABLE_FRILLS
1214 if (rs[Rs_transient_for]) 1430 if (rs[Rs_transient_for])
1215 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1431 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1216#endif 1432#endif
… …
1239 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1455 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1240 1456
1241 /* the vt window */ 1457 /* the vt window */
1242 vt = XCreateSimpleWindow (dpy, top, 1458 vt = XCreateSimpleWindow (dpy, top,
1243 window_vt_x, window_vt_y, 1459 window_vt_x, window_vt_y,
1244 width, height, 1460 vt_width, vt_height,
1245 0, 1461 0,
1246 pix_colors_focused[Color_fg], 1462 pix_colors_focused[Color_fg],
1247 pix_colors_focused[Color_bg]); 1463 pix_colors_focused[Color_bg]);
1248 1464
1249 attributes.bit_gravity = NorthWestGravity; 1465 attributes.bit_gravity = NorthWestGravity;
… …
1276 if (rs[Rs_fade]) 1492 if (rs[Rs_fade])
1277 pix_colors = pix_colors_unfocused; 1493 pix_colors = pix_colors_unfocused;
1278#endif 1494#endif
1279 1495
1280 pointer_unblank (); 1496 pointer_unblank ();
1281 scr_recolour (); 1497 scr_recolor ();
1282}
1283
1284/* ------------------------------------------------------------------------- *
1285 * GET TTY CURRENT STATE *
1286 * ------------------------------------------------------------------------- */
1287void
1288rxvt_get_ttymode (struct termios *tio, int erase)
1289{
1290 /*
1291 * standard System V termios interface
1292 */
1293 if (tcgetattr (STDIN_FILENO, tio) < 0)
1294 {
1295 // return error - use system defaults,
1296 // where possible, and zero elsewhere
1297 memset (tio, 0, sizeof (struct termios));
1298
1299 tio->c_cc[VINTR] = CINTR;
1300 tio->c_cc[VQUIT] = CQUIT;
1301 tio->c_cc[VERASE] = CERASE;
1302#ifdef VERASE2
1303 tio->c_cc[VERASE2] = CERASE2;
1304#endif
1305 tio->c_cc[VKILL] = CKILL;
1306 tio->c_cc[VSTART] = CSTART;
1307 tio->c_cc[VSTOP] = CSTOP;
1308 tio->c_cc[VSUSP] = CSUSP;
1309# ifdef VDSUSP
1310 tio->c_cc[VDSUSP] = CDSUSP;
1311# endif
1312# ifdef VREPRINT
1313 tio->c_cc[VREPRINT] = CRPRNT;
1314# endif
1315# ifdef VDISCRD
1316 tio->c_cc[VDISCRD] = CFLUSH;
1317# endif
1318# ifdef VWERSE
1319 tio->c_cc[VWERSE] = CWERASE;
1320# endif
1321# ifdef VLNEXT
1322 tio->c_cc[VLNEXT] = CLNEXT;
1323# endif
1324 }
1325
1326 tio->c_cc[VEOF] = CEOF;
1327 tio->c_cc[VEOL] = VDISABLE;
1328# ifdef VEOL2
1329 tio->c_cc[VEOL2] = VDISABLE;
1330# endif
1331# ifdef VSWTC
1332 tio->c_cc[VSWTC] = VDISABLE;
1333# endif
1334# ifdef VSWTCH
1335 tio->c_cc[VSWTCH] = VDISABLE;
1336# endif
1337# if VMIN != VEOF
1338 tio->c_cc[VMIN] = 1;
1339# endif
1340# if VTIME != VEOL
1341 tio->c_cc[VTIME] = 0;
1342# endif
1343
1344 if (erase != -1)
1345 tio->c_cc[VERASE] = (char)erase;
1346
1347 /* input modes */
1348 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1349# ifdef IMAXBEL
1350 | IMAXBEL
1351# endif
1352 | IXON);
1353
1354 /* output modes */
1355 tio->c_oflag = (OPOST | ONLCR);
1356
1357 /* control modes */
1358 tio->c_cflag = (CS8 | CREAD);
1359
1360 /* line discipline modes */
1361 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1362# if defined (ECHOCTL) && defined (ECHOKE)
1363 | ECHOCTL | ECHOKE
1364# endif
1365 | ECHOE | ECHOK);
1366
1367 /*
1368 * Debugging
1369 */
1370#ifdef DEBUG_TTYMODE
1371 /* c_iflag bits */
1372 fprintf (stderr, "Input flags\n");
1373
1374 /* cpp token stringize doesn't work on all machines <sigh> */
1375# define FOO(flag,name) \
1376 if ((tio->c_iflag) & flag) \
1377 fprintf (stderr, "%s ", name)
1378
1379 /* c_iflag bits */
1380 FOO (IGNBRK, "IGNBRK");
1381 FOO (BRKINT, "BRKINT");
1382 FOO (IGNPAR, "IGNPAR");
1383 FOO (PARMRK, "PARMRK");
1384 FOO (INPCK, "INPCK");
1385 FOO (ISTRIP, "ISTRIP");
1386 FOO (INLCR, "INLCR");
1387 FOO (IGNCR, "IGNCR");
1388 FOO (ICRNL, "ICRNL");
1389 FOO (IXON, "IXON");
1390 FOO (IXOFF, "IXOFF");
1391# ifdef IUCLC
1392 FOO (IUCLC, "IUCLC");
1393# endif
1394# ifdef IXANY
1395 FOO (IXANY, "IXANY");
1396# endif
1397# ifdef IMAXBEL
1398 FOO (IMAXBEL, "IMAXBEL");
1399# endif
1400
1401 fprintf (stderr, "\n");
1402
1403# undef FOO
1404# define FOO(entry, name) \
1405 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1406
1407 FOO (VINTR, "VINTR");
1408 FOO (VQUIT, "VQUIT");
1409 FOO (VERASE, "VERASE");
1410 FOO (VKILL, "VKILL");
1411 FOO (VEOF, "VEOF");
1412 FOO (VEOL, "VEOL");
1413# ifdef VEOL2
1414 FOO (VEOL2, "VEOL2");
1415# endif
1416# ifdef VSWTC
1417 FOO (VSWTC, "VSWTC");
1418# endif
1419# ifdef VSWTCH
1420 FOO (VSWTCH, "VSWTCH");
1421# endif
1422 FOO (VSTART, "VSTART");
1423 FOO (VSTOP, "VSTOP");
1424 FOO (VSUSP, "VSUSP");
1425# ifdef VDSUSP
1426 FOO (VDSUSP, "VDSUSP");
1427# endif
1428# ifdef VREPRINT
1429 FOO (VREPRINT, "VREPRINT");
1430# endif
1431# ifdef VDISCRD
1432 FOO (VDISCRD, "VDISCRD");
1433# endif
1434# ifdef VWERSE
1435 FOO (VWERSE, "VWERSE");
1436# endif
1437# ifdef VLNEXT
1438 FOO (VLNEXT, "VLNEXT");
1439# endif
1440
1441 fprintf (stderr, "\n");
1442# undef FOO
1443#endif /* DEBUG_TTYMODE */
1444} 1498}
1445 1499
1446/*----------------------------------------------------------------------*/ 1500/*----------------------------------------------------------------------*/
1447/* 1501/*
1448 * Run the command in a subprocess and return a file descriptor for the 1502 * Run the command in a subprocess and return a file descriptor for the
… …
1460 if (pty->pty >= 0) 1514 if (pty->pty >= 0)
1461 { 1515 {
1462 if (getfd_hook) 1516 if (getfd_hook)
1463 pty->pty = (*getfd_hook) (pty->pty); 1517 pty->pty = (*getfd_hook) (pty->pty);
1464 1518
1465 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1519 if (pty->pty < 0)
1466 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1520 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1467 } 1521 }
1468 } 1522 }
1469 else 1523 else
1470#endif 1524#endif
1471 if (!pty->get ()) 1525 if (!pty->get ())
1472 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1526 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1473 1527
1474 int er; 1528 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1529
1530 struct termios tio = def_tio;
1475 1531
1476#ifndef NO_BACKSPACE_KEY 1532#ifndef NO_BACKSPACE_KEY
1477 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1533 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1478 er = rs[Rs_backspace_key][0]; 1534 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1479 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1535 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1480 er = '\177'; /* the initial state anyway */ 1536 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1481 else
1482#endif 1537#endif
1483 er = -1;
1484 1538
1485 rxvt_get_ttymode (&tio, er);
1486 /* init terminal attributes */ 1539 /* init terminal attributes */
1487 cfsetospeed (&tio, BAUDRATE); 1540 cfsetospeed (&tio, BAUDRATE);
1488 cfsetispeed (&tio, BAUDRATE); 1541 cfsetispeed (&tio, BAUDRATE);
1489 tcsetattr (pty->tty, TCSANOW, &tio); 1542 tcsetattr (pty->tty, TCSANOW, &tio);
1490 pty->set_utf8_mode (enc_utf8); 1543 pty->set_utf8_mode (enc_utf8);
… …
1530 1583
1531 _exit (EXIT_FAILURE); 1584 _exit (EXIT_FAILURE);
1532 1585
1533 default: 1586 default:
1534 if (!option (Opt_utmpInhibit)) 1587 if (!option (Opt_utmpInhibit))
1588 {
1589#ifdef LOG_ONLY_ON_LOGIN
1590 bool login_shell = option (Opt_loginShell);
1591#else
1592 bool login_shell = true;
1593#endif
1535 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1594 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1595 }
1536 1596
1537 pty->close_tty (); 1597 pty->close_tty ();
1538 1598
1539 child_ev.start (cmd_pid); 1599 child_ev.start (cmd_pid);
1540 1600
… …
1565#elif defined (SRIOCSREDIR) 1625#elif defined (SRIOCSREDIR)
1566 int fd; 1626 int fd;
1567 1627
1568 fd = open (CONSOLE, O_WRONLY, 0); 1628 fd = open (CONSOLE, O_WRONLY, 0);
1569 if (fd >= 0) 1629 if (fd >= 0)
1570 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1630 {
1631 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1571 close (fd); 1632 close (fd);
1633 }
1572#endif /* SRIOCSREDIR */ 1634#endif /* SRIOCSREDIR */
1573 } 1635 }
1574 1636
1575 /* reset signals and spin off the command interpreter */ 1637 /* reset signals and spin off the command interpreter */
1576 signal (SIGINT, SIG_DFL); 1638 signal (SIGINT, SIG_DFL);
1577 signal (SIGQUIT, SIG_DFL); 1639 signal (SIGQUIT, SIG_DFL);
1578 signal (SIGCHLD, SIG_DFL); 1640 signal (SIGCHLD, SIG_DFL);
1579 signal (SIGHUP, SIG_DFL); 1641 signal (SIGHUP, SIG_DFL);
1580 signal (SIGPIPE, SIG_DFL); 1642 signal (SIGPIPE, SIG_DFL);
1581 /* 1643 /*
1582 * mimick login's behavior by disabling the job control signals 1644 * mimic login's behavior by disabling the job control signals
1583 * a shell that wants them can turn them back on 1645 * a shell that wants them can turn them back on
1584 */ 1646 */
1585#ifdef SIGTSTP 1647#ifdef SIGTSTP
1586 signal (SIGTSTP, SIG_IGN); 1648 signal (SIGTSTP, SIG_IGN);
1587 signal (SIGTTIN, SIG_IGN); 1649 signal (SIGTTIN, SIG_IGN);

Diff Legend

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