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.304 by sf-exg, Tue Dec 6 10:27:15 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, r_argc;
586 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
587 574
588 /* 575 /*
589 * Look for -e option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
590 */ 577 */
591 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
… …
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605 592
606 cmd_argv[i] = NULL; 593 cmd_argv[i] = NULL;
607 } 594 }
608 595
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
616 rs[Rs_name] = rxvt_basename (argv[0]); 596 rs[Rs_name] = rxvt_basename (argv[0]);
617 597
618 /* 598 /*
619 * Open display, get options/resources and create the window 599 * Open display, get options/resources and create the window
620 */ 600 */
621 601
622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623 rs[Rs_display_name] = ":0"; 603 rs[Rs_display_name] = ":0";
624 604
625 get_options (r_argc, r_argv); 605 get_options (r_argc, argv);
626 606
627 if (!(display = displays.get (rs[Rs_display_name]))) 607 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]); 608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
632 609
633 // using a local pointer decreases code size a lot 610 // using a local pointer decreases code size a lot
634 xa = display->xa; 611 xa = display->xa;
635 612
636 set (display); 613 set (display);
… …
639#if XFT 616#if XFT
640 if (rs[Rs_depth]) 617 if (rs[Rs_depth])
641 select_visual (strtol (rs[Rs_depth], 0, 0)); 618 select_visual (strtol (rs[Rs_depth], 0, 0));
642#endif 619#endif
643 620
644 free (r_argv);
645
646 for (int i = NUM_RESOURCES; i--; ) 621 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 622 if (rs [i] == resval_undef)
648 rs [i] = 0; 623 rs [i] = 0;
649 624
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 625#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 626 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 627 rs[Rs_perl_ext_1] = "default";
658 628
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 629 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 632 {
663 rxvt_perl.init (this); 633 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 634 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 635 }
666#endif 636#endif
637
638 // must be called after initialising the perl interpreter as it
639 // may invoke the `on_register_command' hook
640 extract_keysym_resources ();
667 641
668 /* 642 /*
669 * set any defaults not already set 643 * set any defaults not already set
670 */ 644 */
671 if (cmd_argv && cmd_argv[0]) 645 if (cmd_argv && cmd_argv[0])
… …
790 set_locale (""); 764 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 765 set_environ (envv); // a few things in X do not call setlocale :(
792 766
793 init_vars (); 767 init_vars ();
794 768
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv); 769 const char **cmd_argv = init_resources (argc, argv);
798 770
799#ifdef KEYSYM_RESOURCE 771#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 772 keyboard->register_done ();
801#endif 773#endif
… …
809 if (chdir (path)) 781 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 782 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 } 783 }
812 784
813 if (option (Opt_scrollBar)) 785 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 786 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 787
816 pty = ptytty::create (); 788 pty = ptytty::create ();
789
790#ifdef HAVE_AFTERIMAGE
791 set_application_name ((char *)rs[Rs_name]);
792 set_output_threshold (OUTPUT_LEVEL_WARNING);
793#endif
794
795 // must be called before create_windows, because the latter may call set_icon
796#ifdef HAVE_PIXBUF
797 g_type_init ();
798#endif
817 799
818 create_windows (argc, argv); 800 create_windows (argc, argv);
819 801
820 init_xlocale (); 802 init_xlocale ();
821 803
… …
827 809
828 if (option (Opt_scrollBar)) 810 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 811 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP 812#ifdef HAVE_BG_PIXMAP
831 { 813 {
832 bgPixmap.set_target (this); 814 bg_init ();
833 bgPixmap.invalidate ();
834 815
835#ifdef ENABLE_TRANSPARENCY 816#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent)) 817 if (option (Opt_transparent))
837 { 818 {
838 bgPixmap.set_transparent (); 819 bg_set_transparent ();
839 820
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius]) 821 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 822 bg_set_blur (rs [Rs_blurradius]);
843#endif 823
844 if (ISSET_PIXCOLOR (Color_tint)) 824 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 825 bg_set_tint (pix_colors_focused [Color_tint]);
846 826
847 if (rs [Rs_shade]) 827 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]); 828 bg_set_shade (rs [Rs_shade]);
849 829
850 bgPixmap.set_root_pixmap (); 830 bg_set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask); 831 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root); 832 rootwin_ev.start (display, display->root);
853 } 833 }
854#endif 834#endif
855 835
856#ifdef BG_IMAGE_FROM_FILE 836#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap]) 837 if (rs[Rs_backgroundPixmap])
858 { 838 {
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])) 839 if (bg_set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ()) 840 if (!bg_window_position_sensitive ())
871 update_background (); 841 update_background ();
872 } 842 }
873#endif 843#endif
874 } 844 }
875#endif 845#endif
… …
892#if ENABLE_XEMBED 862#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 863 if (rs[Rs_embed])
894 { 864 {
895 long info[2] = { 0, XEMBED_MAPPED }; 865 long info[2] = { 0, XEMBED_MAPPED };
896 866
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 867 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 868 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 869 }
900#endif 870#endif
901 871
872#if HAVE_STARTUP_NOTIFICATION
873 SnDisplay *snDisplay;
874 SnLauncheeContext *snContext;
875
876 snDisplay = sn_display_new (dpy, NULL, NULL);
877 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
878
879 /* Tell the window manager that this window is part of the startup context */
880 if (snContext)
881 sn_launchee_context_setup_window (snContext, parent);
882#endif
883
902 XMapWindow (dpy, vt); 884 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 885 XMapWindow (dpy, parent);
886
887#if HAVE_STARTUP_NOTIFICATION
888 if (snContext)
889 {
890 /* Mark the startup process as complete */
891 sn_launchee_context_complete (snContext);
892
893 sn_launchee_context_unref (snContext);
894 }
895
896 sn_display_unref (snDisplay);
897#endif
904 898
905 refresh_check (); 899 refresh_check ();
906} 900}
907 901
908/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
909void 903void
910rxvt_term::init_env () 904rxvt_term::init_env ()
911{ 905{
912 int i;
913 char *val; 906 char *val;
914 907
915#ifdef DISPLAY_IS_IP 908#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 909 /* 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 910 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
931 val = XDisplayString (dpy); 924 val = XDisplayString (dpy);
932 925
933 if (rs[Rs_display_name] == NULL) 926 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 927 rs[Rs_display_name] = val; /* use broken `:0' value */
935 928
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 929 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 930
939 sprintf (env_display, "DISPLAY=%s", val); 931 sprintf (env_display, "DISPLAY=%s", val);
940 932
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 933 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 934
943 /* add entries to the environment: 935 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 936 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 937 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 938 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1299 1291
1300 if (i) 1292 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1293 ModMetaMask = modmasks[i - 1];
1302} 1294}
1303 1295
1296void
1297rxvt_term::set_icon (const char *file)
1298{
1299#ifdef HAVE_AFTERIMAGE
1300 init_asv ();
1301
1302 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1303 if (!im)
1304 {
1305 rxvt_warn ("Loading image icon failed, continuing without.\n");
1306 return;
1307 }
1308
1309 unsigned int w = im->width;
1310 unsigned int h = im->height;
1311
1312 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1313 {
1314 rxvt_warn ("Icon image too big, continuing without.\n");
1315 destroy_asimage (&im);
1316 return;
1317 }
1318
1319 ASImage *result = scale_asimage (asv, im,
1320 w, h, ASA_ARGB32,
1321 100, ASIMAGE_QUALITY_DEFAULT);
1322 destroy_asimage (&im);
1323
1324 if (!result)
1325 {
1326 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1327 return;
1328 }
1329
1330 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1331 if (buffer)
1332 {
1333 ARGB32 *asbuf = result->alt.argb32;
1334 buffer [0] = w;
1335 buffer [1] = h;
1336
1337 for (unsigned int i = 0; i < w * h; ++i)
1338 buffer [i + 2] = asbuf [i];
1339
1340 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1341 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1342 free (buffer);
1343 }
1344 else
1345 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1346
1347 destroy_asimage (&result);
1348#endif
1349
1350#ifdef HAVE_PIXBUF
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf)
1353 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n");
1355 return;
1356 }
1357
1358 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1359 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1360
1361 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1362 {
1363 rxvt_warn ("Icon image too big, continuing without.\n");
1364 g_object_unref (pixbuf);
1365 return;
1366 }
1367
1368 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1369 {
1370 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1371 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1372 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1373
1374 buffer [0] = w;
1375 buffer [1] = h;
1376 for (int i = 0; i < h; i++)
1377 {
1378 for (int j = 0; j < w; j++)
1379 {
1380 unsigned char *pixel = row + j * channels;
1381 long value;
1382
1383 if (channels == 4)
1384 value = pixel[3];
1385 else
1386 value = (unsigned char)0x00ff;
1387
1388 value = (value << 8) + pixel[0];
1389 value = (value << 8) + pixel[1];
1390 value = (value << 8) + pixel[2];
1391 buffer[(i * w + j) + 2] = value;
1392 }
1393
1394 row += rowstride;
1395 }
1396
1397 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1398 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1399 free (buffer);
1400 }
1401 else
1402 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1403
1404 g_object_unref (pixbuf);
1405#endif
1406}
1407
1304/*----------------------------------------------------------------------*/ 1408/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1409/* Open and map the window */
1306void 1410void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1411rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1412{
1309 XClassHint classHint; 1413 XClassHint classHint;
1310 XWMHints wmHint; 1414 XWMHints wmHint;
… …
1356 } 1460 }
1357#endif 1461#endif
1358 1462
1359 window_calc (0, 0); 1463 window_calc (0, 0);
1360 1464
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1465 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1466 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1467 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1468 attributes.colormap = cmap;
1365 1469
1366 top = XCreateWindow (dpy, parent, 1470 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1473 ext_bwidth,
1370 depth, InputOutput, visual, 1474 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1476 &attributes);
1373 1477
1374 this->parent[0] = top; 1478 this->parent = top;
1375 1479
1376 old_width = szHint.width; 1480 old_width = szHint.width;
1377 old_height = szHint.height; 1481 old_height = szHint.height;
1378 1482
1379 set_title (rs [Rs_title]); 1483 set_title (rs [Rs_title]);
… …
1388 wmHint.window_group = top; 1492 wmHint.window_group = top;
1389 1493
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1494 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1495 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1496#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1497 /*
1395 * set up icon hint 1498 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1499 * rs [Rs_iconfile] is path to icon
1397 */ 1500 */
1398 1501
1399 if (rs [Rs_iconfile]) 1502 if (rs [Rs_iconfile])
1400 { 1503 {
1401 init_asv (); 1504 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 } 1505 }
1440# endif
1441#endif 1506#endif
1442 1507
1443#if ENABLE_FRILLS 1508#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1509 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1510 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1516#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1517 xa[XA_NET_WM_PING],
1453#endif 1518#endif
1454 }; 1519 };
1455 1520
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1521 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1522
1458#if ENABLE_FRILLS 1523#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1524 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1525 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1526#endif
… …
1522 pix_colors = pix_colors_unfocused; 1587 pix_colors = pix_colors_unfocused;
1523#endif 1588#endif
1524 1589
1525 pointer_unblank (); 1590 pointer_unblank ();
1526 scr_recolour (); 1591 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} 1592}
1690 1593
1691/*----------------------------------------------------------------------*/ 1594/*----------------------------------------------------------------------*/
1692/* 1595/*
1693 * Run the command in a subprocess and return a file descriptor for the 1596 * Run the command in a subprocess and return a file descriptor for the
… …
1714 else 1617 else
1715#endif 1618#endif
1716 if (!pty->get ()) 1619 if (!pty->get ())
1717 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1620 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1718 1621
1719 int er; 1622 struct termios tio = def_tio;
1720 1623
1721#ifndef NO_BACKSPACE_KEY 1624#ifndef NO_BACKSPACE_KEY
1722 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1723 er = rs[Rs_backspace_key][0]; 1626 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1724 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1627 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1725 er = '\177'; /* the initial state anyway */ 1628 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1726 else
1727#endif 1629#endif
1728 er = -1;
1729 1630
1730 rxvt_get_ttymode (&tio, er);
1731 /* init terminal attributes */ 1631 /* init terminal attributes */
1732 cfsetospeed (&tio, BAUDRATE); 1632 cfsetospeed (&tio, BAUDRATE);
1733 cfsetispeed (&tio, BAUDRATE); 1633 cfsetispeed (&tio, BAUDRATE);
1734 tcsetattr (pty->tty, TCSANOW, &tio); 1634 tcsetattr (pty->tty, TCSANOW, &tio);
1735 pty->set_utf8_mode (enc_utf8); 1635 pty->set_utf8_mode (enc_utf8);
… …
1822 signal (SIGQUIT, SIG_DFL); 1722 signal (SIGQUIT, SIG_DFL);
1823 signal (SIGCHLD, SIG_DFL); 1723 signal (SIGCHLD, SIG_DFL);
1824 signal (SIGHUP, SIG_DFL); 1724 signal (SIGHUP, SIG_DFL);
1825 signal (SIGPIPE, SIG_DFL); 1725 signal (SIGPIPE, SIG_DFL);
1826 /* 1726 /*
1827 * mimick login's behavior by disabling the job control signals 1727 * mimic login's behavior by disabling the job control signals
1828 * a shell that wants them can turn them back on 1728 * a shell that wants them can turn them back on
1829 */ 1729 */
1830#ifdef SIGTSTP 1730#ifdef SIGTSTP
1831 signal (SIGTSTP, SIG_IGN); 1731 signal (SIGTSTP, SIG_IGN);
1832 signal (SIGTTIN, SIG_IGN); 1732 signal (SIGTTIN, SIG_IGN);

Diff Legend

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