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.265 by root, Sun May 23 00:02:52 2010 UTC vs.
Revision 1.312 by sf-exg, Tue Dec 27 11:09:31 2011 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
558 set_option (Opt_iso14755); 563 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 565 set_option (Opt_buffered);
561} 566}
562 567
563static void
564init_secondary ()
565{
566 int i;
567
568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
569 {
570 dup2 (STDERR_FILENO, STDIN_FILENO);
571 }
572 else if (i != STDIN_FILENO)
573 {
574 dup2 (i, STDIN_FILENO);
575 close (i);
576 }
577
578 dup2 (STDERR_FILENO, STDOUT_FILENO);
579}
580
581/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
582const char ** 569const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
584{ 571{
585 int i, r_argc; 572 int i;
586 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
587
588 /*
589 * Look for -e option. Find => split and make cmd_argv[] of command args
590 */
591 for (r_argc = 0; r_argc < argc; r_argc++)
592 if (!strcmp (argv[r_argc], "-e"))
593 break;
594
595 if (r_argc == argc)
596 cmd_argv = NULL;
597 else if (!argv[r_argc + 1])
598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599 else
600 {
601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
602
603 for (i = 0; i < argc - r_argc - 1; i++)
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605
606 cmd_argv[i] = NULL;
607 }
608
609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
610
611 for (i = 0; i < r_argc; i++)
612 r_argv[i] = (const char *)argv[i];
613
614 r_argv[i] = NULL;
615 574
616 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
617 576
618 /* 577 /*
619 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
620 */ 579 */
621 580
622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
624 583
625 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
626 585
627 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
632 588
633 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
634 xa = display->xa; 590 xa = display->xa;
635 591
636 set (display); 592 set (display);
… …
639#if XFT 595#if XFT
640 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
641 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
642#endif 598#endif
643 599
644 free (r_argv);
645
646 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
648 rs [i] = 0; 602 rs [i] = 0;
649 603
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
654
655#if ENABLE_PERL 604#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
658 607
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 611 {
663 rxvt_perl.init (this); 612 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 614 }
666#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 ();
667 620
668 /* 621 /*
669 * set any defaults not already set 622 * set any defaults not already set
670 */ 623 */
671 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
780 return cmd_argv; 733 return cmd_argv;
781} 734}
782 735
783/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
784void 737void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
786{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
787 this->envv = envv; 744 this->envv = envv;
788 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
789 SET_R (this); 771 SET_R (this);
790 set_locale (""); 772 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
792 774
793 init_vars (); 775 init_vars ();
794
795 init_secondary ();
796 776
797 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
798 778
799#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 780 keyboard->register_done ();
… …
809 if (chdir (path)) 789 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 } 791 }
812 792
813 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 795
816 pty = ptytty::create (); 796 pty = ptytty::create ();
797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
817 807
818 create_windows (argc, argv); 808 create_windows (argc, argv);
819 809
820 init_xlocale (); 810 init_xlocale ();
821 811
… …
827 817
828 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
831 { 821 {
832 bgPixmap.set_target (this); 822 bg_init ();
833 bgPixmap.invalidate ();
834 823
835#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
837 { 826 {
838 bgPixmap.set_transparent (); 827 bg_set_transparent ();
839 828
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
843#endif 831
844 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
846 834
847 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
849 837
850 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
853 } 841 }
854#endif 842#endif
855 843
856#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
871 update_background (); 848 update_background ();
872 }
873#endif 849#endif
874 } 850 }
875#endif 851#endif
876 852
877#if ENABLE_PERL 853#if ENABLE_PERL
… …
880 856
881 set_colorfgbg (); 857 set_colorfgbg ();
882 858
883 init_command (cmd_argv); 859 init_command (cmd_argv);
884 860
885 free (cmd_argv);
886
887 if (pty->pty >= 0) 861 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
889 863
890 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
891 865
892#if ENABLE_XEMBED 866#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
894 { 868 {
895 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
896 870
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 873 }
900#endif 874#endif
901 875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
902 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
904 902
905 refresh_check (); 903 refresh_check ();
906} 904}
907 905
908/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
909void 907void
910rxvt_term::init_env () 908rxvt_term::init_env ()
911{ 909{
912 int i;
913 char *val; 910 char *val;
914 911
915#ifdef DISPLAY_IS_IP 912#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 913 /* Fixup display_name for export over pty to any interested terminal
917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 914 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
931 val = XDisplayString (dpy); 928 val = XDisplayString (dpy);
932 929
933 if (rs[Rs_display_name] == NULL) 930 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 931 rs[Rs_display_name] = val; /* use broken `:0' value */
935 932
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 933 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 934
939 sprintf (env_display, "DISPLAY=%s", val); 935 sprintf (env_display, "DISPLAY=%s", val);
940 936
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 938
943 /* add entries to the environment: 939 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 940 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 941 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 942 * @ COLORTERM: terminal sub-name and also indicates its color
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 975 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 976#endif /* HAVE_UNSETENV */
981} 977}
982 978
983/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 980void
989rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
990{ 982{
991 set_environ (envv); 983 set_environ (envv);
992 984
… …
1012 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
1013 mbstate.reset (); 1005 mbstate.reset ();
1014#endif 1006#endif
1015 1007
1016#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 1009 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 1010 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 1012 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 1013 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 1014 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 1015#else
1025 enc_utf8 = 0; 1016 enc_utf8 = 0;
1026#endif 1017#endif
1027} 1018}
1028 1019
… …
1031{ 1022{
1032 set_environ (envv); 1023 set_environ (envv);
1033 1024
1034#ifdef USE_XIM 1025#ifdef USE_XIM
1035 if (!locale) 1026 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1027 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1028 else
1038 { 1029 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1031
1041 if (!XSupportsLocale ()) 1032 if (!XSupportsLocale ())
1042 { 1033 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1034 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1035 return;
1045 } 1036 }
1046 1037
1047 im_ev.start (display); 1038 im_ev.start (display);
1048 1039
… …
1299 1290
1300 if (i) 1291 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1292 ModMetaMask = modmasks[i - 1];
1302} 1293}
1303 1294
1295void
1296rxvt_term::set_icon (const char *file)
1297{
1298#ifdef HAVE_AFTERIMAGE
1299 init_asv ();
1300
1301 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1302 if (!im)
1303 {
1304 rxvt_warn ("Loading image icon failed, continuing without.\n");
1305 return;
1306 }
1307
1308 unsigned int w = im->width;
1309 unsigned int h = im->height;
1310
1311 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1312 {
1313 rxvt_warn ("Icon image too big, continuing without.\n");
1314 destroy_asimage (&im);
1315 return;
1316 }
1317
1318 ASImage *result = scale_asimage (asv, im,
1319 w, h, ASA_ARGB32,
1320 100, ASIMAGE_QUALITY_DEFAULT);
1321 destroy_asimage (&im);
1322
1323 if (!result)
1324 {
1325 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1326 return;
1327 }
1328
1329 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1330 if (buffer)
1331 {
1332 ARGB32 *asbuf = result->alt.argb32;
1333 buffer [0] = w;
1334 buffer [1] = h;
1335
1336 for (unsigned int i = 0; i < w * h; ++i)
1337 buffer [i + 2] = asbuf [i];
1338
1339 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1340 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1341 free (buffer);
1342 }
1343 else
1344 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1345
1346 destroy_asimage (&result);
1347#endif
1348
1349#ifdef HAVE_PIXBUF
1350 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf)
1352 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n");
1354 return;
1355 }
1356
1357 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1358 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1359
1360 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1361 {
1362 rxvt_warn ("Icon image too big, continuing without.\n");
1363 g_object_unref (pixbuf);
1364 return;
1365 }
1366
1367 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1368 {
1369 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1370 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1371 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1372
1373 buffer [0] = w;
1374 buffer [1] = h;
1375 for (int i = 0; i < h; i++)
1376 {
1377 for (int j = 0; j < w; j++)
1378 {
1379 unsigned char *pixel = row + j * channels;
1380 long value;
1381
1382 if (channels == 4)
1383 value = pixel[3];
1384 else
1385 value = (unsigned char)0x00ff;
1386
1387 value = (value << 8) + pixel[0];
1388 value = (value << 8) + pixel[1];
1389 value = (value << 8) + pixel[2];
1390 buffer[(i * w + j) + 2] = value;
1391 }
1392
1393 row += rowstride;
1394 }
1395
1396 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1397 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1398 free (buffer);
1399 }
1400 else
1401 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1402
1403 g_object_unref (pixbuf);
1404#endif
1405}
1406
1304/*----------------------------------------------------------------------*/ 1407/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1408/* Open and map the window */
1306void 1409void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1410rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1411{
1309 XClassHint classHint; 1412 XClassHint classHint;
1310 XWMHints wmHint; 1413 XWMHints wmHint;
… …
1356 } 1459 }
1357#endif 1460#endif
1358 1461
1359 window_calc (0, 0); 1462 window_calc (0, 0);
1360 1463
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1464 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1465 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1466 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1467 attributes.colormap = cmap;
1365 1468
1366 top = XCreateWindow (dpy, parent, 1469 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1472 ext_bwidth,
1370 depth, InputOutput, visual, 1473 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1475 &attributes);
1373 1476
1374 this->parent[0] = top; 1477 this->parent = top;
1375 1478
1376 old_width = szHint.width; 1479 old_width = szHint.width;
1377 old_height = szHint.height; 1480 old_height = szHint.height;
1378 1481
1379 set_title (rs [Rs_title]); 1482 set_title (rs [Rs_title]);
… …
1388 wmHint.window_group = top; 1491 wmHint.window_group = top;
1389 1492
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1494 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1495#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1496 /*
1395 * set up icon hint 1497 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1498 * rs [Rs_iconfile] is path to icon
1397 */ 1499 */
1398 1500
1399 if (rs [Rs_iconfile]) 1501 if (rs [Rs_iconfile])
1400 { 1502 {
1401 init_asv (); 1503 set_icon (rs [Rs_iconfile]);
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 } 1504 }
1440# endif
1441#endif 1505#endif
1442 1506
1443#if ENABLE_FRILLS 1507#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1508 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1509 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1515#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1516 xa[XA_NET_WM_PING],
1453#endif 1517#endif
1454 }; 1518 };
1455 1519
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1520 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1521
1458#if ENABLE_FRILLS 1522#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1523 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1524 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1525#endif
… …
1522 pix_colors = pix_colors_unfocused; 1586 pix_colors = pix_colors_unfocused;
1523#endif 1587#endif
1524 1588
1525 pointer_unblank (); 1589 pointer_unblank ();
1526 scr_recolour (); 1590 scr_recolour ();
1527}
1528
1529/* ------------------------------------------------------------------------- *
1530 * GET TTY CURRENT STATE *
1531 * ------------------------------------------------------------------------- */
1532void
1533rxvt_get_ttymode (struct termios *tio, int erase)
1534{
1535 /*
1536 * standard System V termios interface
1537 */
1538 if (tcgetattr (STDIN_FILENO, tio) < 0)
1539 {
1540 // return error - use system defaults,
1541 // where possible, and zero elsewhere
1542 memset (tio, 0, sizeof (struct termios));
1543
1544 tio->c_cc[VINTR] = CINTR;
1545 tio->c_cc[VQUIT] = CQUIT;
1546 tio->c_cc[VERASE] = CERASE;
1547#ifdef VERASE2
1548 tio->c_cc[VERASE2] = CERASE2;
1549#endif
1550 tio->c_cc[VKILL] = CKILL;
1551 tio->c_cc[VSTART] = CSTART;
1552 tio->c_cc[VSTOP] = CSTOP;
1553 tio->c_cc[VSUSP] = CSUSP;
1554# ifdef VDSUSP
1555 tio->c_cc[VDSUSP] = CDSUSP;
1556# endif
1557# ifdef VREPRINT
1558 tio->c_cc[VREPRINT] = CRPRNT;
1559# endif
1560# ifdef VDISCRD
1561 tio->c_cc[VDISCRD] = CFLUSH;
1562# endif
1563# ifdef VWERSE
1564 tio->c_cc[VWERSE] = CWERASE;
1565# endif
1566# ifdef VLNEXT
1567 tio->c_cc[VLNEXT] = CLNEXT;
1568# endif
1569 }
1570
1571 tio->c_cc[VEOF] = CEOF;
1572 tio->c_cc[VEOL] = VDISABLE;
1573# ifdef VEOL2
1574 tio->c_cc[VEOL2] = VDISABLE;
1575# endif
1576# ifdef VSWTC
1577 tio->c_cc[VSWTC] = VDISABLE;
1578# endif
1579# ifdef VSWTCH
1580 tio->c_cc[VSWTCH] = VDISABLE;
1581# endif
1582# if VMIN != VEOF
1583 tio->c_cc[VMIN] = 1;
1584# endif
1585# if VTIME != VEOL
1586 tio->c_cc[VTIME] = 0;
1587# endif
1588
1589 if (erase != -1)
1590 tio->c_cc[VERASE] = (char)erase;
1591
1592 /* input modes */
1593 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1594# ifdef IMAXBEL
1595 | IMAXBEL
1596# endif
1597 | IXON);
1598
1599 /* output modes */
1600 tio->c_oflag = (OPOST | ONLCR);
1601
1602 /* control modes */
1603 tio->c_cflag = (CS8 | CREAD);
1604
1605 /* line discipline modes */
1606 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1607# if defined (ECHOCTL) && defined (ECHOKE)
1608 | ECHOCTL | ECHOKE
1609# endif
1610 | ECHOE | ECHOK);
1611
1612 /*
1613 * Debugging
1614 */
1615#ifdef DEBUG_TTYMODE
1616 /* c_iflag bits */
1617 fprintf (stderr, "Input flags\n");
1618
1619 /* cpp token stringize doesn't work on all machines <sigh> */
1620# define FOO(flag,name) \
1621 if ((tio->c_iflag) & flag) \
1622 fprintf (stderr, "%s ", name)
1623
1624 /* c_iflag bits */
1625 FOO (IGNBRK, "IGNBRK");
1626 FOO (BRKINT, "BRKINT");
1627 FOO (IGNPAR, "IGNPAR");
1628 FOO (PARMRK, "PARMRK");
1629 FOO (INPCK, "INPCK");
1630 FOO (ISTRIP, "ISTRIP");
1631 FOO (INLCR, "INLCR");
1632 FOO (IGNCR, "IGNCR");
1633 FOO (ICRNL, "ICRNL");
1634 FOO (IXON, "IXON");
1635 FOO (IXOFF, "IXOFF");
1636# ifdef IUCLC
1637 FOO (IUCLC, "IUCLC");
1638# endif
1639# ifdef IXANY
1640 FOO (IXANY, "IXANY");
1641# endif
1642# ifdef IMAXBEL
1643 FOO (IMAXBEL, "IMAXBEL");
1644# endif
1645
1646 fprintf (stderr, "\n");
1647
1648# undef FOO
1649# define FOO(entry, name) \
1650 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1651
1652 FOO (VINTR, "VINTR");
1653 FOO (VQUIT, "VQUIT");
1654 FOO (VERASE, "VERASE");
1655 FOO (VKILL, "VKILL");
1656 FOO (VEOF, "VEOF");
1657 FOO (VEOL, "VEOL");
1658# ifdef VEOL2
1659 FOO (VEOL2, "VEOL2");
1660# endif
1661# ifdef VSWTC
1662 FOO (VSWTC, "VSWTC");
1663# endif
1664# ifdef VSWTCH
1665 FOO (VSWTCH, "VSWTCH");
1666# endif
1667 FOO (VSTART, "VSTART");
1668 FOO (VSTOP, "VSTOP");
1669 FOO (VSUSP, "VSUSP");
1670# ifdef VDSUSP
1671 FOO (VDSUSP, "VDSUSP");
1672# endif
1673# ifdef VREPRINT
1674 FOO (VREPRINT, "VREPRINT");
1675# endif
1676# ifdef VDISCRD
1677 FOO (VDISCRD, "VDISCRD");
1678# endif
1679# ifdef VWERSE
1680 FOO (VWERSE, "VWERSE");
1681# endif
1682# ifdef VLNEXT
1683 FOO (VLNEXT, "VLNEXT");
1684# endif
1685
1686 fprintf (stderr, "\n");
1687# undef FOO
1688#endif /* DEBUG_TTYMODE */
1689} 1591}
1690 1592
1691/*----------------------------------------------------------------------*/ 1593/*----------------------------------------------------------------------*/
1692/* 1594/*
1693 * Run the command in a subprocess and return a file descriptor for the 1595 * Run the command in a subprocess and return a file descriptor for the
… …
1705 if (pty->pty >= 0) 1607 if (pty->pty >= 0)
1706 { 1608 {
1707 if (getfd_hook) 1609 if (getfd_hook)
1708 pty->pty = (*getfd_hook) (pty->pty); 1610 pty->pty = (*getfd_hook) (pty->pty);
1709 1611
1710 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1612 if (pty->pty < 0)
1711 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1712 } 1614 }
1713 } 1615 }
1714 else 1616 else
1715#endif 1617#endif
1716 if (!pty->get ()) 1618 if (!pty->get ())
1717 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1619 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1718 1620
1719 int er; 1621 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1622
1623 struct termios tio = def_tio;
1720 1624
1721#ifndef NO_BACKSPACE_KEY 1625#ifndef NO_BACKSPACE_KEY
1722 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1626 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1723 er = rs[Rs_backspace_key][0]; 1627 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1724 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1628 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1725 er = '\177'; /* the initial state anyway */ 1629 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1726 else
1727#endif 1630#endif
1728 er = -1;
1729 1631
1730 rxvt_get_ttymode (&tio, er);
1731 /* init terminal attributes */ 1632 /* init terminal attributes */
1732 cfsetospeed (&tio, BAUDRATE); 1633 cfsetospeed (&tio, BAUDRATE);
1733 cfsetispeed (&tio, BAUDRATE); 1634 cfsetispeed (&tio, BAUDRATE);
1734 tcsetattr (pty->tty, TCSANOW, &tio); 1635 tcsetattr (pty->tty, TCSANOW, &tio);
1735 pty->set_utf8_mode (enc_utf8); 1636 pty->set_utf8_mode (enc_utf8);
… …
1775 1676
1776 _exit (EXIT_FAILURE); 1677 _exit (EXIT_FAILURE);
1777 1678
1778 default: 1679 default:
1779 if (!option (Opt_utmpInhibit)) 1680 if (!option (Opt_utmpInhibit))
1681 {
1682#ifdef LOG_ONLY_ON_LOGIN
1683 bool login_shell = option (Opt_loginShell);
1684#else
1685 bool login_shell = true;
1686#endif
1780 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1687 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1688 }
1781 1689
1782 pty->close_tty (); 1690 pty->close_tty ();
1783 1691
1784 child_ev.start (cmd_pid); 1692 child_ev.start (cmd_pid);
1785 1693
… …
1810#elif defined (SRIOCSREDIR) 1718#elif defined (SRIOCSREDIR)
1811 int fd; 1719 int fd;
1812 1720
1813 fd = open (CONSOLE, O_WRONLY, 0); 1721 fd = open (CONSOLE, O_WRONLY, 0);
1814 if (fd >= 0) 1722 if (fd >= 0)
1815 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1723 {
1724 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1816 close (fd); 1725 close (fd);
1726 }
1817#endif /* SRIOCSREDIR */ 1727#endif /* SRIOCSREDIR */
1818 } 1728 }
1819 1729
1820 /* reset signals and spin off the command interpreter */ 1730 /* reset signals and spin off the command interpreter */
1821 signal (SIGINT, SIG_DFL); 1731 signal (SIGINT, SIG_DFL);
1822 signal (SIGQUIT, SIG_DFL); 1732 signal (SIGQUIT, SIG_DFL);
1823 signal (SIGCHLD, SIG_DFL); 1733 signal (SIGCHLD, SIG_DFL);
1824 signal (SIGHUP, SIG_DFL); 1734 signal (SIGHUP, SIG_DFL);
1825 signal (SIGPIPE, SIG_DFL); 1735 signal (SIGPIPE, SIG_DFL);
1826 /* 1736 /*
1827 * mimick login's behavior by disabling the job control signals 1737 * mimic login's behavior by disabling the job control signals
1828 * a shell that wants them can turn them back on 1738 * a shell that wants them can turn them back on
1829 */ 1739 */
1830#ifdef SIGTSTP 1740#ifdef SIGTSTP
1831 signal (SIGTSTP, SIG_IGN); 1741 signal (SIGTSTP, SIG_IGN);
1832 signal (SIGTTIN, SIG_IGN); 1742 signal (SIGTTIN, SIG_IGN);

Diff Legend

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