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.308 by sf-exg, Sun Dec 18 02:14:59 2011 UTC vs.
Revision 1.337 by sf-exg, Fri Sep 5 19:02:53 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
58#endif 56#endif
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
521#endif 519#endif
522 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
525#endif 523#endif
526#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
527 NULL, 525 NULL,
528#endif 526#endif
529#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 528 "rgb:00/00/00",
531#endif 529#endif
… …
590 xa = display->xa; 588 xa = display->xa;
591 589
592 set (display); 590 set (display);
593 extract_resources (); 591 extract_resources ();
594 592
595#if XFT 593#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
597 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
598#endif 598#endif
599 599
600 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
602 rs [i] = 0; 602 rs [i] = 0;
… …
612 rxvt_perl.init (this); 612 rxvt_perl.init (this);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 614 }
615#endif 615#endif
616 616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources (); 617 extract_keysym_resources ();
620 618
621 /* 619 /*
622 * set any defaults not already set 620 * set any defaults not already set
623 */ 621 */
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 658 pointerBlankDelay = i;
661 else 659 else
662 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
663#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 669
665 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 671 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
668 673
… …
793 if (option (Opt_scrollBar)) 798 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 799 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 800
796 pty = ptytty::create (); 801 pty = ptytty::create ();
797 802
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
807
808 create_windows (argc, argv); 803 create_windows (argc, argv);
809 804
810 init_xlocale (); 805 init_xlocale ();
811 806
812 scr_poweron (); // initialize screen 807 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
816#endif 811#endif
817 812
818 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
815
820#ifdef HAVE_BG_PIXMAP 816#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 817 bg_init ();
823
824#ifdef ENABLE_TRANSPARENCY
825 if (option (Opt_transparent))
826 {
827 bg_set_transparent ();
828
829 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]);
831
832 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]);
834
835 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]);
837
838 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root);
841 }
842#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 if (bg_set_file (rs[Rs_backgroundPixmap]))
847 if (!bg_window_position_sensitive ())
848 update_background ();
849#endif
850 }
851#endif 818#endif
852 819
853#if ENABLE_PERL 820#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 821 rootwin_ev.start (display, display->root);
855#endif 822#endif
856 823
857 set_colorfgbg (); 824 init_done = 1;
858 825
859 init_command (cmd_argv); 826 init_command (cmd_argv);
860 827
861 if (pty->pty >= 0) 828 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 829 pty_ev.start (pty->pty, ev::READ);
… …
906/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
907void 874void
908rxvt_term::init_env () 875rxvt_term::init_env ()
909{ 876{
910 char *val; 877 char *val;
878 char *env_display;
879 char *env_windowid;
880 char *env_colorfgbg;
881 char *env_term;
911 882
912#ifdef DISPLAY_IS_IP 883#ifdef DISPLAY_IS_IP
913 /* Fixup display_name for export over pty to any interested terminal 884 /* Fixup display_name for export over pty to any interested terminal
914 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 885 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
915 * (for the first non-loopback interface) that we get from 886 * (for the first non-loopback interface) that we get from
… …
932 903
933 env_display = (char *)rxvt_malloc (strlen (val) + 9); 904 env_display = (char *)rxvt_malloc (strlen (val) + 9);
934 905
935 sprintf (env_display, "DISPLAY=%s", val); 906 sprintf (env_display, "DISPLAY=%s", val);
936 907
908 env_windowid = (char *)rxvt_malloc (21);
937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 909 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
938 910
939 /* add entries to the environment: 911 /* add entries to the environment:
940 * @ DISPLAY: in case we started with -display 912 * @ DISPLAY: in case we started with -display
941 * @ WINDOWID: X window id number of the window 913 * @ WINDOWID: X window id number of the window
… …
945 * @ COLORFGBG: fg;bg color codes 917 * @ COLORFGBG: fg;bg color codes
946 */ 918 */
947 putenv (env_display); 919 putenv (env_display);
948 putenv (env_windowid); 920 putenv (env_windowid);
949 921
950 if (env_colorfgbg) 922 env_colorfgbg = get_colorfgbg ();
951 putenv (env_colorfgbg); 923 putenv (env_colorfgbg);
952 924
953#ifdef RXVT_TERMINFO 925#ifdef RXVT_TERMINFO
954 putenv ("TERMINFO=" RXVT_TERMINFO); 926 putenv ("TERMINFO=" RXVT_TERMINFO);
955#endif 927#endif
956 928
… …
980void 952void
981rxvt_term::set_locale (const char *locale) 953rxvt_term::set_locale (const char *locale)
982{ 954{
983 set_environ (envv); 955 set_environ (envv);
984 956
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 957 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 958 this->locale = setlocale (LC_CTYPE, locale);
988 959
989 if (!this->locale) 960 if (!this->locale)
990 { 961 {
… …
1001 972
1002 973
1003 this->locale = strdup (this->locale); 974 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 975 SET_LOCALE (this->locale);
1005 mbstate.reset (); 976 mbstate.reset ();
1006#endif
1007 977
1008#if HAVE_NL_LANGINFO 978#if HAVE_NL_LANGINFO
1009 char *codeset = nl_langinfo (CODESET); 979 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 980 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 981 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1020void 990void
1021rxvt_term::init_xlocale () 991rxvt_term::init_xlocale ()
1022{ 992{
1023 set_environ (envv); 993 set_environ (envv);
1024 994
1025#ifdef USE_XIM 995#if USE_XIM
1026 if (!locale) 996 if (!locale)
1027 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 997 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1028 else 998 else
1029 { 999 {
1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1188/*----------------------------------------------------------------------*/ 1158/*----------------------------------------------------------------------*/
1189/* color aliases, fg/bg bright-bold */ 1159/* color aliases, fg/bg bright-bold */
1190void 1160void
1191rxvt_term::color_aliases (int idx) 1161rxvt_term::color_aliases (int idx)
1192{ 1162{
1193 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1194 { 1164 {
1195 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
1196 1166
1197 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
1198 /* bright colors */ 1168 /* bright colors */
… …
1238 for (j = map->max_keypermod; j--; k++) 1208 for (j = map->max_keypermod; j--; k++)
1239 { 1209 {
1240 if (kc[k] == 0) 1210 if (kc[k] == 0)
1241 break; 1211 break;
1242 1212
1243 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1213 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1244 { 1214 {
1245 case XK_Num_Lock: 1215 case XK_Num_Lock:
1246 ModNumLockMask = modmasks[i - 1]; 1216 ModNumLockMask = modmasks[i - 1];
1247 continue; 1217 continue;
1248 1218
… …
1293} 1263}
1294 1264
1295void 1265void
1296rxvt_term::set_icon (const char *file) 1266rxvt_term::set_icon (const char *file)
1297{ 1267{
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 1268#if HAVE_PIXBUF
1350 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf) 1270 if (!pixbuf)
1352 { 1271 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1272 rxvt_warn ("Loading image icon failed, continuing without.\n");
1354 return; 1273 return;
… …
1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1393 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1475 &attributes); 1394 &attributes);
1476 1395
1477 this->parent = top; 1396 this->parent = top;
1478 1397
1479 old_width = szHint.width;
1480 old_height = szHint.height;
1481
1482 set_title (rs [Rs_title]); 1398 set_title (rs [Rs_title]);
1483 set_icon_name (rs [Rs_iconName]); 1399 set_icon_name (rs [Rs_iconName]);
1484 1400
1485 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1487 1403
1488 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1489 wmHint.input = True; 1405 wmHint.input = True;
1490 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1491 wmHint.window_group = top; 1409 wmHint.window_group = top;
1492 1410
1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1494 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1495#if ENABLE_EWMH 1413#if ENABLE_EWMH
… …
1497 * set up icon hint 1415 * set up icon hint
1498 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1499 */ 1417 */
1500 1418
1501 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1502 {
1503 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1504 }
1505#endif 1421#endif
1506 1422
1507#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1508 if (mwmhints.flags) 1424 if (mwmhints.flags)
1509 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1549 1465
1550 /* the vt window */ 1466 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1553 width, height, 1469 vt_width, vt_height,
1554 0, 1470 0,
1555 pix_colors_focused[Color_fg], 1471 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1472 pix_colors_focused[Color_bg]);
1557 1473
1558 attributes.bit_gravity = NorthWestGravity; 1474 attributes.bit_gravity = NorthWestGravity;
… …
1607 if (pty->pty >= 0) 1523 if (pty->pty >= 0)
1608 { 1524 {
1609 if (getfd_hook) 1525 if (getfd_hook)
1610 pty->pty = (*getfd_hook) (pty->pty); 1526 pty->pty = (*getfd_hook) (pty->pty);
1611 1527
1612 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1528 if (pty->pty < 0)
1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1529 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1614 } 1530 }
1615 } 1531 }
1616 else 1532 else
1617#endif 1533#endif
1618 if (!pty->get ()) 1534 if (!pty->get ())
1619 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1536
1537 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1620 1538
1621 struct termios tio = def_tio; 1539 struct termios tio = def_tio;
1622 1540
1623#ifndef NO_BACKSPACE_KEY 1541#ifndef NO_BACKSPACE_KEY
1624 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1542 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1674 1592
1675 _exit (EXIT_FAILURE); 1593 _exit (EXIT_FAILURE);
1676 1594
1677 default: 1595 default:
1678 if (!option (Opt_utmpInhibit)) 1596 if (!option (Opt_utmpInhibit))
1597 {
1598#ifdef LOG_ONLY_ON_LOGIN
1599 bool login_shell = option (Opt_loginShell);
1600#else
1601 bool login_shell = true;
1602#endif
1679 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1603 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1604 }
1680 1605
1681 pty->close_tty (); 1606 pty->close_tty ();
1682 1607
1683 child_ev.start (cmd_pid); 1608 child_ev.start (cmd_pid);
1684 1609
… …
1709#elif defined (SRIOCSREDIR) 1634#elif defined (SRIOCSREDIR)
1710 int fd; 1635 int fd;
1711 1636
1712 fd = open (CONSOLE, O_WRONLY, 0); 1637 fd = open (CONSOLE, O_WRONLY, 0);
1713 if (fd >= 0) 1638 if (fd >= 0)
1714 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1639 {
1640 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1715 close (fd); 1641 close (fd);
1642 }
1716#endif /* SRIOCSREDIR */ 1643#endif /* SRIOCSREDIR */
1717 } 1644 }
1718 1645
1719 /* reset signals and spin off the command interpreter */ 1646 /* reset signals and spin off the command interpreter */
1720 signal (SIGINT, SIG_DFL); 1647 signal (SIGINT, SIG_DFL);

Diff Legend

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