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.346 by sf-exg, Tue Jun 21 12:03:56 2016 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * 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 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 39#include "init.h"
39#include "keyboard.h" 40#include "keyboard.h"
40 41
41#include <limits> 42#include <limits>
42 43
43#include <csignal> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 56# include <locale.h>
53# endif
54#endif 57#endif
55 58
56#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 60# include <langinfo.h>
61#endif
62
63#ifdef HAVE_STARTUP_NOTIFICATION
64# define SN_API_NOT_YET_FROZEN
65# include <libsn/sn-launchee.h>
58#endif 66#endif
59 67
60#ifdef DISPLAY_IS_IP 68#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 69/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 70#include <sys/types.h>
… …
73#include <netinet/in.h> 81#include <netinet/in.h>
74#include <arpa/inet.h> 82#include <arpa/inet.h>
75#include <net/if.h> 83#include <net/if.h>
76#include <net/if_arp.h> 84#include <net/if_arp.h>
77 85
78static char * 86static char * ecb_cold
79rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
80{ 88{
81 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 90 struct ifconf ifc;
83 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
143 151
144 return rval; 152 return rval;
145} 153}
146#endif 154#endif
147 155
156#define NULL_5 \
157 NULL, \
158 NULL, \
159 NULL, \
160 NULL, \
161 NULL,
162
163#define NULL_10 \
164 NULL_5 \
165 NULL_5
166
167#define NULL_40 \
168 NULL_10 \
169 NULL_10 \
170 NULL_10 \
171 NULL_10
172
173#define NULL_50 \
174 NULL_40 \
175 NULL_10
176
177#define NULL_100 \
178 NULL_50 \
179 NULL_50
180
148const char *const def_colorName[] = 181static const char *const def_colorName[] =
149 { 182 {
150 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
152 /* low-intensity colors */ 185 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 186 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 207 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 208 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 209 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 210 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 211
212#if !USE_256_COLORS
179 // 88 xterm colours 213 // 88 xterm colours
180 "rgb:00/00/00", 214 "rgb:00/00/00",
181 "rgb:00/00/8b", 215 "rgb:00/00/8b",
182 "rgb:00/00/cd", 216 "rgb:00/00/cd",
183 "rgb:00/00/ff", 217 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
292#else
293 // 256 xterm colours
294 "rgb:00/00/00",
295 "rgb:00/00/5f",
296 "rgb:00/00/87",
297 "rgb:00/00/af",
298 "rgb:00/00/d7",
299 "rgb:00/00/ff",
300 "rgb:00/5f/00",
301 "rgb:00/5f/5f",
302 "rgb:00/5f/87",
303 "rgb:00/5f/af",
304 "rgb:00/5f/d7",
305 "rgb:00/5f/ff",
306 "rgb:00/87/00",
307 "rgb:00/87/5f",
308 "rgb:00/87/87",
309 "rgb:00/87/af",
310 "rgb:00/87/d7",
311 "rgb:00/87/ff",
312 "rgb:00/af/00",
313 "rgb:00/af/5f",
314 "rgb:00/af/87",
315 "rgb:00/af/af",
316 "rgb:00/af/d7",
317 "rgb:00/af/ff",
318 "rgb:00/d7/00",
319 "rgb:00/d7/5f",
320 "rgb:00/d7/87",
321 "rgb:00/d7/af",
322 "rgb:00/d7/d7",
323 "rgb:00/d7/ff",
324 "rgb:00/ff/00",
325 "rgb:00/ff/5f",
326 "rgb:00/ff/87",
327 "rgb:00/ff/af",
328 "rgb:00/ff/d7",
329 "rgb:00/ff/ff",
330 "rgb:5f/00/00",
331 "rgb:5f/00/5f",
332 "rgb:5f/00/87",
333 "rgb:5f/00/af",
334 "rgb:5f/00/d7",
335 "rgb:5f/00/ff",
336 "rgb:5f/5f/00",
337 "rgb:5f/5f/5f",
338 "rgb:5f/5f/87",
339 "rgb:5f/5f/af",
340 "rgb:5f/5f/d7",
341 "rgb:5f/5f/ff",
342 "rgb:5f/87/00",
343 "rgb:5f/87/5f",
344 "rgb:5f/87/87",
345 "rgb:5f/87/af",
346 "rgb:5f/87/d7",
347 "rgb:5f/87/ff",
348 "rgb:5f/af/00",
349 "rgb:5f/af/5f",
350 "rgb:5f/af/87",
351 "rgb:5f/af/af",
352 "rgb:5f/af/d7",
353 "rgb:5f/af/ff",
354 "rgb:5f/d7/00",
355 "rgb:5f/d7/5f",
356 "rgb:5f/d7/87",
357 "rgb:5f/d7/af",
358 "rgb:5f/d7/d7",
359 "rgb:5f/d7/ff",
360 "rgb:5f/ff/00",
361 "rgb:5f/ff/5f",
362 "rgb:5f/ff/87",
363 "rgb:5f/ff/af",
364 "rgb:5f/ff/d7",
365 "rgb:5f/ff/ff",
366 "rgb:87/00/00",
367 "rgb:87/00/5f",
368 "rgb:87/00/87",
369 "rgb:87/00/af",
370 "rgb:87/00/d7",
371 "rgb:87/00/ff",
372 "rgb:87/5f/00",
373 "rgb:87/5f/5f",
374 "rgb:87/5f/87",
375 "rgb:87/5f/af",
376 "rgb:87/5f/d7",
377 "rgb:87/5f/ff",
378 "rgb:87/87/00",
379 "rgb:87/87/5f",
380 "rgb:87/87/87",
381 "rgb:87/87/af",
382 "rgb:87/87/d7",
383 "rgb:87/87/ff",
384 "rgb:87/af/00",
385 "rgb:87/af/5f",
386 "rgb:87/af/87",
387 "rgb:87/af/af",
388 "rgb:87/af/d7",
389 "rgb:87/af/ff",
390 "rgb:87/d7/00",
391 "rgb:87/d7/5f",
392 "rgb:87/d7/87",
393 "rgb:87/d7/af",
394 "rgb:87/d7/d7",
395 "rgb:87/d7/ff",
396 "rgb:87/ff/00",
397 "rgb:87/ff/5f",
398 "rgb:87/ff/87",
399 "rgb:87/ff/af",
400 "rgb:87/ff/d7",
401 "rgb:87/ff/ff",
402 "rgb:af/00/00",
403 "rgb:af/00/5f",
404 "rgb:af/00/87",
405 "rgb:af/00/af",
406 "rgb:af/00/d7",
407 "rgb:af/00/ff",
408 "rgb:af/5f/00",
409 "rgb:af/5f/5f",
410 "rgb:af/5f/87",
411 "rgb:af/5f/af",
412 "rgb:af/5f/d7",
413 "rgb:af/5f/ff",
414 "rgb:af/87/00",
415 "rgb:af/87/5f",
416 "rgb:af/87/87",
417 "rgb:af/87/af",
418 "rgb:af/87/d7",
419 "rgb:af/87/ff",
420 "rgb:af/af/00",
421 "rgb:af/af/5f",
422 "rgb:af/af/87",
423 "rgb:af/af/af",
424 "rgb:af/af/d7",
425 "rgb:af/af/ff",
426 "rgb:af/d7/00",
427 "rgb:af/d7/5f",
428 "rgb:af/d7/87",
429 "rgb:af/d7/af",
430 "rgb:af/d7/d7",
431 "rgb:af/d7/ff",
432 "rgb:af/ff/00",
433 "rgb:af/ff/5f",
434 "rgb:af/ff/87",
435 "rgb:af/ff/af",
436 "rgb:af/ff/d7",
437 "rgb:af/ff/ff",
438 "rgb:d7/00/00",
439 "rgb:d7/00/5f",
440 "rgb:d7/00/87",
441 "rgb:d7/00/af",
442 "rgb:d7/00/d7",
443 "rgb:d7/00/ff",
444 "rgb:d7/5f/00",
445 "rgb:d7/5f/5f",
446 "rgb:d7/5f/87",
447 "rgb:d7/5f/af",
448 "rgb:d7/5f/d7",
449 "rgb:d7/5f/ff",
450 "rgb:d7/87/00",
451 "rgb:d7/87/5f",
452 "rgb:d7/87/87",
453 "rgb:d7/87/af",
454 "rgb:d7/87/d7",
455 "rgb:d7/87/ff",
456 "rgb:d7/af/00",
457 "rgb:d7/af/5f",
458 "rgb:d7/af/87",
459 "rgb:d7/af/af",
460 "rgb:d7/af/d7",
461 "rgb:d7/af/ff",
462 "rgb:d7/d7/00",
463 "rgb:d7/d7/5f",
464 "rgb:d7/d7/87",
465 "rgb:d7/d7/af",
466 "rgb:d7/d7/d7",
467 "rgb:d7/d7/ff",
468 "rgb:d7/ff/00",
469 "rgb:d7/ff/5f",
470 "rgb:d7/ff/87",
471 "rgb:d7/ff/af",
472 "rgb:d7/ff/d7",
473 "rgb:d7/ff/ff",
474 "rgb:ff/00/00",
475 "rgb:ff/00/5f",
476 "rgb:ff/00/87",
477 "rgb:ff/00/af",
478 "rgb:ff/00/d7",
479 "rgb:ff/00/ff",
480 "rgb:ff/5f/00",
481 "rgb:ff/5f/5f",
482 "rgb:ff/5f/87",
483 "rgb:ff/5f/af",
484 "rgb:ff/5f/d7",
485 "rgb:ff/5f/ff",
486 "rgb:ff/87/00",
487 "rgb:ff/87/5f",
488 "rgb:ff/87/87",
489 "rgb:ff/87/af",
490 "rgb:ff/87/d7",
491 "rgb:ff/87/ff",
492 "rgb:ff/af/00",
493 "rgb:ff/af/5f",
494 "rgb:ff/af/87",
495 "rgb:ff/af/af",
496 "rgb:ff/af/d7",
497 "rgb:ff/af/ff",
498 "rgb:ff/d7/00",
499 "rgb:ff/d7/5f",
500 "rgb:ff/d7/87",
501 "rgb:ff/d7/af",
502 "rgb:ff/d7/d7",
503 "rgb:ff/d7/ff",
504 "rgb:ff/ff/00",
505 "rgb:ff/ff/5f",
506 "rgb:ff/ff/87",
507 "rgb:ff/ff/af",
508 "rgb:ff/ff/d7",
509 "rgb:ff/ff/ff",
510 "rgb:08/08/08",
511 "rgb:12/12/12",
512 "rgb:1c/1c/1c",
513 "rgb:26/26/26",
514 "rgb:30/30/30",
515 "rgb:3a/3a/3a",
516 "rgb:44/44/44",
517 "rgb:4e/4e/4e",
518 "rgb:58/58/58",
519 "rgb:62/62/62",
520 "rgb:6c/6c/6c",
521 "rgb:76/76/76",
522 "rgb:80/80/80",
523 "rgb:8a/8a/8a",
524 "rgb:94/94/94",
525 "rgb:9e/9e/9e",
526 "rgb:a8/a8/a8",
527 "rgb:b2/b2/b2",
528 "rgb:bc/bc/bc",
529 "rgb:c6/c6/c6",
530 "rgb:d0/d0/d0",
531 "rgb:da/da/da",
532 "rgb:e4/e4/e4",
533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
538#endif
252 539
253#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 543#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 553#if ENABLE_FRILLS
267 NULL, // Color_underline 554 NULL, // Color_underline
268#endif 555#endif
269#ifdef OPTION_HC 556#ifdef OPTION_HC
270 NULL, 557 NULL,
558 NULL,
271#endif 559#endif
272 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
275#endif 563#endif
276#if ENABLE_TRANSPARENCY 564#if BG_IMAGE_FROM_ROOT
277 NULL, 565 NULL,
278#endif 566#endif
279#if OFF_FOCUS_FADING 567#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 568 "rgb:00/00/00",
281#endif 569#endif
… …
313 set_option (Opt_iso14755); 601 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 602 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 603 set_option (Opt_buffered);
316} 604}
317 605
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/*----------------------------------------------------------------------*/ 606/*----------------------------------------------------------------------*/
337const char ** 607const char **
338rxvt_term::init_resources (int argc, const char *const *argv) 608rxvt_term::init_resources (int argc, const char *const *argv)
339{ 609{
340 int i, r_argc; 610 int i;
341 const char **cmd_argv, **r_argv; 611 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 612
371 rs[Rs_name] = rxvt_basename (argv[0]); 613 rs[Rs_name] = rxvt_basename (argv[0]);
372 614
373 /* 615 /*
374 * Open display, get options/resources and create the window 616 * Open display, get options/resources and create the window
375 */ 617 */
376 618
377 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 619 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
378 rs[Rs_display_name] = ":0"; 620 rs[Rs_display_name] = ":0";
379 621
380 get_options (r_argc, r_argv); 622 cmd_argv = get_options (argc, argv);
381 623
382 if (!(display = displays.get (rs[Rs_display_name]))) 624 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]); 625 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
386 }
387 626
388 // using a local pointer decreases code size a lot 627 // using a local pointer decreases code size a lot
389 xa = display->xa; 628 xa = display->xa;
390 629
391 set (display); 630 set (display);
392 extract_resources (); 631 extract_resources ();
393 632
394#if XFT 633#if ENABLE_FRILLS
395 if (rs[Rs_depth]) 634 if (rs[Rs_visual])
396 select_visual (strtol (rs[Rs_depth], 0, 0)); 635 select_visual (strtol (rs[Rs_visual], 0, 0));
636 else if (rs[Rs_depth])
637 select_depth (strtol (rs[Rs_depth], 0, 0));
397#endif 638#endif
398
399 free (r_argv);
400 639
401 for (int i = NUM_RESOURCES; i--; ) 640 for (int i = NUM_RESOURCES; i--; )
402 if (rs [i] == resval_undef) 641 if (rs [i] == resval_undef)
403 rs [i] = 0; 642 rs [i] = 0;
404 643
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 644#if ENABLE_PERL
411 if (!rs[Rs_perl_ext_1]) 645 if (!rs[Rs_perl_ext_1])
412 rs[Rs_perl_ext_1] = "default"; 646 rs[Rs_perl_ext_1] = "default";
413 647
414 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 648 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
417 { 651 {
418 rxvt_perl.init (this); 652 rxvt_perl.init (this);
419 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 653 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
420 } 654 }
421#endif 655#endif
656
657 // must be called after initialising the perl interpreter as it
658 // may invoke the `on_register_command' hook
659 extract_keysym_resources ();
422 660
423 /* 661 /*
424 * set any defaults not already set 662 * set any defaults not already set
425 */ 663 */
426 if (cmd_argv && cmd_argv[0]) 664 if (cmd_argv && cmd_argv[0])
… …
461 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 699 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
462 pointerBlankDelay = i; 700 pointerBlankDelay = i;
463 else 701 else
464 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
465#endif 703#endif
704
705 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
706 multiClickTime = i;
707 else
708 multiClickTime = 500;
709
710 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
466 711
467 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
468 if (!saveLines) 713 if (!saveLines)
469 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
470 715
… …
535 return cmd_argv; 780 return cmd_argv;
536} 781}
537 782
538/*----------------------------------------------------------------------*/ 783/*----------------------------------------------------------------------*/
539void 784void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 785rxvt_term::init (stringvec *argv, stringvec *envv)
541{ 786{
787 argv->push_back (0);
788 envv->push_back (0);
789
790 this->argv = argv;
542 this->envv = envv; 791 this->envv = envv;
543 792
793 env = new char *[this->envv->size ()];
794 for (int i = 0; i < this->envv->size (); i++)
795 env[i] = this->envv->at (i);
796
797 init2 (argv->size () - 1, argv->begin ());
798}
799
800void
801rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
802{
803#if ENABLE_PERL
804 // perl might want to access the stringvecs later, so we need to copy them
805 stringvec *args = new stringvec;
806 for (int i = 0; i < argc; i++)
807 args->push_back (strdup (argv [i]));
808
809 stringvec *envs = new stringvec;
810 for (const char *const *var = envv; *var; var++)
811 envs->push_back (strdup (*var));
812
813 init (args, envs);
814#else
815 init2 (argc, argv);
816#endif
817}
818
819void
820rxvt_term::init2 (int argc, const char *const *argv)
821{
544 SET_R (this); 822 SET_R (this);
545 set_locale (""); 823 set_locale ("");
546 set_environ (envv); // a few things in X do not call setlocale :( 824 set_environ (env); // a few things in X do not call setlocale :(
547 825
548 init_vars (); 826 init_vars ();
549
550 init_secondary ();
551 827
552 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
553 829
554#ifdef KEYSYM_RESOURCE 830#ifdef KEYSYM_RESOURCE
555 keyboard->register_done (); 831 keyboard->register_done ();
… …
564 if (chdir (path)) 840 if (chdir (path))
565 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 841 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
566 } 842 }
567 843
568 if (option (Opt_scrollBar)) 844 if (option (Opt_scrollBar))
569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 845 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
570 846
571 pty = ptytty::create (); 847 pty = ptytty::create ();
572 848
573 create_windows (argc, argv); 849 create_windows (argc, argv);
574 850
… …
580 XSynchronize (dpy, True); 856 XSynchronize (dpy, True);
581#endif 857#endif
582 858
583 if (option (Opt_scrollBar)) 859 if (option (Opt_scrollBar))
584 scrollBar.resize (); /* create and map scrollbar */ 860 scrollBar.resize (); /* create and map scrollbar */
861
585#ifdef HAVE_BG_PIXMAP 862#ifdef HAVE_BG_PIXMAP
586 { 863 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 864#endif
631 865
632#if ENABLE_PERL 866#if ENABLE_PERL
633 rootwin_ev.start (display, display->root); 867 rootwin_ev.start (display, display->root);
634#endif 868#endif
635 869
636 set_colorfgbg (); 870 init_done = 1;
637 871
638 init_command (cmd_argv); 872 init_command (cmd_argv);
639
640 free (cmd_argv);
641 873
642 if (pty->pty >= 0) 874 if (pty->pty >= 0)
643 pty_ev.start (pty->pty, ev::READ); 875 pty_ev.start (pty->pty, ev::READ);
644 876
645 HOOK_INVOKE ((this, HOOK_START, DT_END)); 877 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
647#if ENABLE_XEMBED 879#if ENABLE_XEMBED
648 if (rs[Rs_embed]) 880 if (rs[Rs_embed])
649 { 881 {
650 long info[2] = { 0, XEMBED_MAPPED }; 882 long info[2] = { 0, XEMBED_MAPPED };
651 883
652 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 884 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
653 32, PropModeReplace, (unsigned char *)&info, 2); 885 32, PropModeReplace, (unsigned char *)&info, 2);
654 } 886 }
655#endif 887#endif
656 888
889#if HAVE_STARTUP_NOTIFICATION
890 SnDisplay *snDisplay;
891 SnLauncheeContext *snContext;
892
893 snDisplay = sn_display_new (dpy, NULL, NULL);
894 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
895
896 /* Tell the window manager that this window is part of the startup context */
897 if (snContext)
898 sn_launchee_context_setup_window (snContext, parent);
899#endif
900
657 XMapWindow (dpy, vt); 901 XMapWindow (dpy, vt);
658 XMapWindow (dpy, parent[0]); 902 XMapWindow (dpy, parent);
903
904#if HAVE_STARTUP_NOTIFICATION
905 if (snContext)
906 {
907 /* Mark the startup process as complete */
908 sn_launchee_context_complete (snContext);
909
910 sn_launchee_context_unref (snContext);
911 }
912
913 sn_display_unref (snDisplay);
914#endif
659 915
660 refresh_check (); 916 refresh_check ();
661} 917}
662 918
663/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
664void 920void
665rxvt_term::init_env () 921rxvt_term::init_env ()
666{ 922{
667 int i;
668 char *val; 923 char *val;
924 char *env_display;
925 char *env_windowid;
926 char *env_colorfgbg;
927 char *env_term;
669 928
670#ifdef DISPLAY_IS_IP 929#ifdef DISPLAY_IS_IP
671 /* Fixup display_name for export over pty to any interested terminal 930 /* 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 931 * 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 932 * (for the first non-loopback interface) that we get from
… …
686 val = XDisplayString (dpy); 945 val = XDisplayString (dpy);
687 946
688 if (rs[Rs_display_name] == NULL) 947 if (rs[Rs_display_name] == NULL)
689 rs[Rs_display_name] = val; /* use broken `:0' value */ 948 rs[Rs_display_name] = val; /* use broken `:0' value */
690 949
691 i = strlen (val);
692 env_display = (char *)rxvt_malloc (i + 9); 950 env_display = (char *)rxvt_malloc (strlen (val) + 9);
693 951
694 sprintf (env_display, "DISPLAY=%s", val); 952 sprintf (env_display, "DISPLAY=%s", val);
695 953
954 env_windowid = (char *)rxvt_malloc (21);
696 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 955 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
697 956
698 /* add entries to the environment: 957 /* add entries to the environment:
699 * @ DISPLAY: in case we started with -display 958 * @ DISPLAY: in case we started with -display
700 * @ WINDOWID: X window id number of the window 959 * @ WINDOWID: X window id number of the window
701 * @ COLORTERM: terminal sub-name and also indicates its color 960 * @ COLORTERM: terminal sub-name and also indicates its color
… …
704 * @ COLORFGBG: fg;bg color codes 963 * @ COLORFGBG: fg;bg color codes
705 */ 964 */
706 putenv (env_display); 965 putenv (env_display);
707 putenv (env_windowid); 966 putenv (env_windowid);
708 967
709 if (env_colorfgbg) 968 env_colorfgbg = get_colorfgbg ();
710 putenv (env_colorfgbg); 969 putenv (env_colorfgbg);
711 970
712#ifdef RXVT_TERMINFO 971#ifdef RXVT_TERMINFO
713 putenv ("TERMINFO=" RXVT_TERMINFO); 972 putenv ("TERMINFO=" RXVT_TERMINFO);
714#endif 973#endif
715 974
… …
734 unsetenv ("TERMCAP"); /* terminfo should be okay */ 993 unsetenv ("TERMCAP"); /* terminfo should be okay */
735#endif /* HAVE_UNSETENV */ 994#endif /* HAVE_UNSETENV */
736} 995}
737 996
738/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
739/*
740 * This is more or less stolen straight from XFree86 xterm.
741 * This should support all European type languages.
742 */
743void 998void
744rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
745{ 1000{
746 set_environ (envv); 1001 set_environ (env);
747 1002
748#if HAVE_XSETLOCALE || HAVE_SETLOCALE
749 free (this->locale); 1003 free (this->locale);
750 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
751 1005
752 if (!this->locale) 1006 if (!this->locale)
753 { 1007 {
… …
764 1018
765 1019
766 this->locale = strdup (this->locale); 1020 this->locale = strdup (this->locale);
767 SET_LOCALE (this->locale); 1021 SET_LOCALE (this->locale);
768 mbstate.reset (); 1022 mbstate.reset ();
769#endif
770 1023
771#if HAVE_NL_LANGINFO 1024#if HAVE_NL_LANGINFO
772 char *codeset = strdup (nl_langinfo (CODESET)); 1025 char *codeset = nl_langinfo (CODESET);
773 // /^UTF.?8/i 1026 // /^UTF.?8/i
774 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1027 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
775 && (codeset[1] == 'T' || codeset[1] == 't') 1028 && (codeset[1] == 'T' || codeset[1] == 't')
776 && (codeset[2] == 'F' || codeset[2] == 'f') 1029 && (codeset[2] == 'F' || codeset[2] == 'f')
777 && (codeset[3] == '8' || codeset[4] == '8'); 1030 && (codeset[3] == '8' || codeset[4] == '8');
778 free (codeset);
779#else 1031#else
780 enc_utf8 = 0; 1032 enc_utf8 = 0;
781#endif 1033#endif
782} 1034}
783 1035
784void 1036void
785rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
786{ 1038{
787 set_environ (envv); 1039 set_environ (env);
788 1040
789#ifdef USE_XIM 1041#if USE_XIM
790 if (!locale) 1042 if (!locale)
791 rxvt_warn ("setting locale failed, working without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
792 else 1044 else
793 { 1045 {
794 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1046 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
795 1047
796 if (!XSupportsLocale ()) 1048 if (!XSupportsLocale ())
797 { 1049 {
798 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1050 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
799 return; 1051 return;
800 } 1052 }
801 1053
802 im_ev.start (display); 1054 im_ev.start (display);
803 1055
… …
844 run_command (argv); 1096 run_command (argv);
845} 1097}
846 1098
847/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
848void 1100void
849rxvt_term::get_colours () 1101rxvt_term::get_colors ()
850{ 1102{
851 int i; 1103 int i;
852 1104
853#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
854 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
855#endif 1107#endif
856 1108
857 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
858 {
859 const char *name = rs[Rs_color + i]; 1110 if (const char *name = rs[Rs_color + i])
860
861 if (!name)
862 continue;
863
864 rxvt_color xcol;
865
866 if (!set_color (xcol, name)) 1111 set_color (pix_colors [i], name);
867 {
868#ifndef XTERM_REVERSE_VIDEO
869 if (i < 2 && option (Opt_reverseVideo))
870 name = def_colorName [1 - i];
871 else
872#endif
873 name = def_colorName [i];
874
875 if (!name)
876 continue;
877
878 if (!set_color (xcol, name))
879 {
880 switch (i)
881 {
882 case Color_fg:
883 case Color_bg:
884 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
885 name = "";
886 break;
887#ifndef NO_CURSORCOLOR
888 case Color_cursor2:
889#endif
890 case Color_pointer_fg:
891 name = rs[Rs_color + Color_fg];
892 xcol.set (this, name);
893 break;
894 default:
895 name = rs[Rs_color + Color_bg];
896 xcol.set (this, name);
897 break;
898 }
899 }
900 }
901
902 pix_colors[i] = xcol;
903 rs[Rs_color + i] = name;
904 }
905
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 1112
913 /* 1113 /*
914 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
915 * 1115 *
916 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
917 * from the fvwm window manager. 1117 * from the fvwm window manager.
918 */ 1118 */
919#ifdef RXVT_SCROLLBAR 1119#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]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
930 1121
931 rgba cscroll; 1122 rgba cscroll;
932 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
933 1124
934 /* topShadowColor */ 1125 /* topShadowColor */
935 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
936 rgba ( 1127 rgba (
937 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1128 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), 1129 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), 1130 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
940 cscroll.a) 1131 cscroll.a)
941 )) 1132 ))
942 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
943 }
944#endif 1134#endif
945 1135
946#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
947 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
948 update_fade_color (i); 1138 update_fade_color (i, true);
949#endif 1139#endif
950} 1140}
951 1141
952/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
953/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
954void 1144void
955rxvt_term::color_aliases (int idx) 1145rxvt_term::color_aliases (int idx)
956{ 1146{
957 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1147 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
958 { 1148 {
959 int i = atoi (rs[Rs_color + idx]); 1149 int i = atoi (rs[Rs_color + idx]);
960 1150
961 if (i >= 8 && i <= 15) 1151 if (i >= 8 && i <= 15)
962 /* bright colors */ 1152 /* bright colors */
… …
1002 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1003 { 1193 {
1004 if (kc[k] == 0) 1194 if (kc[k] == 0)
1005 break; 1195 break;
1006 1196
1007 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1008 { 1198 {
1009 case XK_Num_Lock: 1199 case XK_Num_Lock:
1010 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1011 continue; 1201 continue;
1012 1202
… …
1054 1244
1055 if (i) 1245 if (i)
1056 ModMetaMask = modmasks[i - 1]; 1246 ModMetaMask = modmasks[i - 1];
1057} 1247}
1058 1248
1249void
1250rxvt_term::set_icon (const char *file)
1251{
1252#if HAVE_PIXBUF && ENABLE_EWMH
1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1254 if (!pixbuf)
1255 {
1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1257 return;
1258 }
1259
1260 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1261 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1262
1263 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1264 {
1265 rxvt_warn ("Icon image too big, continuing without.\n");
1266 g_object_unref (pixbuf);
1267 return;
1268 }
1269
1270 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1271 {
1272 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1273 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1274 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1275
1276 buffer [0] = w;
1277 buffer [1] = h;
1278 for (int i = 0; i < h; i++)
1279 {
1280 for (int j = 0; j < w; j++)
1281 {
1282 unsigned char *pixel = row + j * channels;
1283 long value;
1284
1285 if (channels == 4)
1286 value = pixel[3];
1287 else
1288 value = (unsigned char)0x00ff;
1289
1290 value = (value << 8) + pixel[0];
1291 value = (value << 8) + pixel[1];
1292 value = (value << 8) + pixel[2];
1293 buffer[(i * w + j) + 2] = value;
1294 }
1295
1296 row += rowstride;
1297 }
1298
1299 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1300 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1301 free (buffer);
1302 }
1303 else
1304 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1305
1306 g_object_unref (pixbuf);
1307#endif
1308}
1309
1059/*----------------------------------------------------------------------*/ 1310/*----------------------------------------------------------------------*/
1060/* rxvt_Create_Windows () - Open and map the window */ 1311/* Open and map the window */
1061void 1312void
1062rxvt_term::create_windows (int argc, const char *const *argv) 1313rxvt_term::create_windows (int argc, const char *const *argv)
1063{ 1314{
1064 XClassHint classHint; 1315 XClassHint classHint;
1065 XWMHints wmHint; 1316 XWMHints wmHint;
… …
1071 Window top, parent; 1322 Window top, parent;
1072 1323
1073 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1074 1325
1075 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1076 get_colours (); 1327 get_colors ();
1077 1328
1078 if (!set_fonts ()) 1329 if (!set_fonts ())
1079 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1330 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1080 1331
1081 parent = display->root; 1332 parent = display->root;
… …
1111 } 1362 }
1112#endif 1363#endif
1113 1364
1114 window_calc (0, 0); 1365 window_calc (0, 0);
1115 1366
1116 /* sub-window placement & size in rxvt_resize_subwindows () */ 1367 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1117 attributes.background_pixel = pix_colors_focused [Color_border]; 1368 attributes.background_pixel = pix_colors_focused [Color_border];
1118 attributes.border_pixel = pix_colors_focused [Color_border]; 1369 attributes.border_pixel = pix_colors_focused [Color_border];
1119 attributes.colormap = cmap; 1370 attributes.colormap = cmap;
1120 1371
1121 top = XCreateWindow (dpy, parent, 1372 top = XCreateWindow (dpy, parent,
… …
1124 ext_bwidth, 1375 ext_bwidth,
1125 depth, InputOutput, visual, 1376 depth, InputOutput, visual,
1126 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1377 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1127 &attributes); 1378 &attributes);
1128 1379
1129 this->parent[0] = top; 1380 this->parent = top;
1130
1131 old_width = szHint.width;
1132 old_height = szHint.height;
1133 1381
1134 set_title (rs [Rs_title]); 1382 set_title (rs [Rs_title]);
1135 set_icon_name (rs [Rs_iconName]); 1383 set_icon_name (rs [Rs_iconName]);
1136 1384
1137 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1138 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1139 1387
1140 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1141 wmHint.input = True; 1389 wmHint.input = True;
1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1143 wmHint.window_group = top; 1393 wmHint.window_group = top;
1144 1394
1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1146 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1147#if ENABLE_EWMH 1397#if ENABLE_EWMH
1148# ifdef HAVE_AFTERIMAGE
1149 /* 1398 /*
1150 * set up icon hint 1399 * set up icon hint
1151 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1400 * rs [Rs_iconfile] is path to icon
1152 */ 1401 */
1153 1402
1154 if (rs [Rs_iconfile]) 1403 if (rs [Rs_iconfile])
1155 { 1404 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 1405#endif
1197 1406
1198#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
1199 if (mwmhints.flags) 1408 if (mwmhints.flags)
1200 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1409 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1206#if ENABLE_EWMH 1415#if ENABLE_EWMH
1207 xa[XA_NET_WM_PING], 1416 xa[XA_NET_WM_PING],
1208#endif 1417#endif
1209 }; 1418 };
1210 1419
1211 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1420 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1212 1421
1213#if ENABLE_FRILLS 1422#if ENABLE_FRILLS
1214 if (rs[Rs_transient_for]) 1423 if (rs[Rs_transient_for])
1215 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1424 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1216#endif 1425#endif
… …
1234 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1235 1444
1236 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1237 1446
1238 /* vt cursor: Black-on-White is standard, but this is more popular */ 1447 /* vt cursor: Black-on-White is standard, but this is more popular */
1448 unsigned int shape = XC_xterm;
1449
1450#ifdef HAVE_XMU
1451 if (rs[Rs_pointerShape])
1452 {
1453 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1454 if (stmp >= 0)
1455 shape = stmp;
1456 }
1457#endif
1458
1239 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1240 1460
1241 /* the vt window */ 1461 /* the vt window */
1242 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1243 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1244 width, height, 1464 vt_width, vt_height,
1245 0, 1465 0,
1246 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1247 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1248 1468
1249 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1276 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1277 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1278#endif 1498#endif
1279 1499
1280 pointer_unblank (); 1500 pointer_unblank ();
1281 scr_recolour (); 1501 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} 1502}
1445 1503
1446/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1447/* 1505/*
1448 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the
… …
1460 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1461 { 1519 {
1462 if (getfd_hook) 1520 if (getfd_hook)
1463 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1464 1522
1465 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1466 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1467 } 1525 }
1468 } 1526 }
1469 else 1527 else
1470#endif 1528#endif
1471 if (!pty->get ()) 1529 if (!pty->get ())
1472 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1473 1531
1474 int er; 1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1533
1534 struct termios tio = def_tio;
1475 1535
1476#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1477 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1478 er = rs[Rs_backspace_key][0]; 1538 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1479 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1539 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1480 er = '\177'; /* the initial state anyway */ 1540 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1481 else
1482#endif 1541#endif
1483 er = -1;
1484 1542
1485 rxvt_get_ttymode (&tio, er);
1486 /* init terminal attributes */ 1543 /* init terminal attributes */
1487 cfsetospeed (&tio, BAUDRATE); 1544 cfsetospeed (&tio, BAUDRATE);
1488 cfsetispeed (&tio, BAUDRATE); 1545 cfsetispeed (&tio, BAUDRATE);
1489 tcsetattr (pty->tty, TCSANOW, &tio); 1546 tcsetattr (pty->tty, TCSANOW, &tio);
1490 pty->set_utf8_mode (enc_utf8); 1547 pty->set_utf8_mode (enc_utf8);
… …
1530 1587
1531 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1532 1589
1533 default: 1590 default:
1534 if (!option (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1535 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1536 1600
1537 pty->close_tty (); 1601 pty->close_tty ();
1538 1602
1539 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1540 1604
… …
1565#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1566 int fd; 1630 int fd;
1567 1631
1568 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1569 if (fd >= 0) 1633 if (fd >= 0)
1570 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1571 close (fd); 1636 close (fd);
1637 }
1572#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1573 } 1639 }
1574 1640
1575 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1576 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);
1577 signal (SIGQUIT, SIG_DFL); 1643 signal (SIGQUIT, SIG_DFL);
1578 signal (SIGCHLD, SIG_DFL); 1644 signal (SIGCHLD, SIG_DFL);
1579 signal (SIGHUP, SIG_DFL); 1645 signal (SIGHUP, SIG_DFL);
1580 signal (SIGPIPE, SIG_DFL); 1646 signal (SIGPIPE, SIG_DFL);
1581 /* 1647 /*
1582 * mimick login's behavior by disabling the job control signals 1648 * mimic login's behavior by disabling the job control signals
1583 * a shell that wants them can turn them back on 1649 * a shell that wants them can turn them back on
1584 */ 1650 */
1585#ifdef SIGTSTP 1651#ifdef SIGTSTP
1586 signal (SIGTSTP, SIG_IGN); 1652 signal (SIGTSTP, SIG_IGN);
1587 signal (SIGTTIN, SIG_IGN); 1653 signal (SIGTTIN, SIG_IGN);

Diff Legend

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