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

Diff Legend

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