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.309 by sf-exg, Tue Dec 20 02:52:39 2011 UTC vs.
Revision 1.325 by sf-exg, Thu May 31 05:53:46 2012 UTC

… …
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;
… …
793 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 793
796 pty = ptytty::create (); 794 pty = ptytty::create ();
797 795
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 796 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF 797#ifdef HAVE_PIXBUF
805 g_type_init (); 798 g_type_init ();
806#endif 799#endif
807 800
… …
825 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
826 { 819 {
827 bg_set_transparent (); 820 bg_set_transparent ();
828 821
829 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]); 823 root_effects.set_blur (rs [Rs_blurradius]);
831 824
832 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]); 826 root_effects.set_tint (pix_colors_focused [Color_tint]);
834 827
835 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]); 829 root_effects.set_shade (rs [Rs_shade]);
837 830
838 bg_set_root_pixmap (); 831 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
841 } 834 }
842#endif 835#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 } 836 }
851#endif 837#endif
852 838
853#if ENABLE_PERL 839#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
855#endif 841#endif
856 842
857 set_colorfgbg (); 843 init_done = 1;
858 844
859 init_command (cmd_argv); 845 init_command (cmd_argv);
860 846
861 if (pty->pty >= 0) 847 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 848 pty_ev.start (pty->pty, ev::READ);
… …
906/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
907void 893void
908rxvt_term::init_env () 894rxvt_term::init_env ()
909{ 895{
910 char *val; 896 char *val;
897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
900 char *env_term;
911 901
912#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
913 /* Fixup display_name for export over pty to any interested terminal 903 /* 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 904 * 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 905 * (for the first non-loopback interface) that we get from
… …
932 922
933 env_display = (char *)rxvt_malloc (strlen (val) + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
934 924
935 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
936 926
927 env_windowid = (char *)rxvt_malloc (21);
937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
938 929
939 /* add entries to the environment: 930 /* add entries to the environment:
940 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
941 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
… …
945 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
946 */ 937 */
947 putenv (env_display); 938 putenv (env_display);
948 putenv (env_windowid); 939 putenv (env_windowid);
949 940
950 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
951 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
952 943
953#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
954 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
955#endif 946#endif
956 947
… …
980void 971void
981rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
982{ 973{
983 set_environ (envv); 974 set_environ (envv);
984 975
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 976 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
988 978
989 if (!this->locale) 979 if (!this->locale)
990 { 980 {
… …
1001 991
1002 992
1003 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
1005 mbstate.reset (); 995 mbstate.reset ();
1006#endif
1007 996
1008#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
1009 char *codeset = nl_langinfo (CODESET); 998 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 999 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1188/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
1189/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
1190void 1179void
1191rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
1192{ 1181{
1193 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1194 { 1183 {
1195 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
1196 1185
1197 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
1198 /* bright colors */ 1187 /* bright colors */
… …
1293} 1282}
1294 1283
1295void 1284void
1296rxvt_term::set_icon (const char *file) 1285rxvt_term::set_icon (const char *file)
1297{ 1286{
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 1287#ifdef HAVE_PIXBUF
1350 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf) 1289 if (!pixbuf)
1352 { 1290 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1412 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1475 &attributes); 1413 &attributes);
1476 1414
1477 this->parent = top; 1415 this->parent = top;
1478 1416
1479 old_width = szHint.width;
1480 old_height = szHint.height;
1481
1482 set_title (rs [Rs_title]); 1417 set_title (rs [Rs_title]);
1483 set_icon_name (rs [Rs_iconName]); 1418 set_icon_name (rs [Rs_iconName]);
1484 1419
1485 classHint.res_name = (char *)rs[Rs_name]; 1420 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1421 classHint.res_class = (char *)RESCLASS;
… …
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1549 1484
1550 /* the vt window */ 1485 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1553 width, height, 1488 vt_width, vt_height,
1554 0, 1489 0,
1555 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1557 1492
1558 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
… …
1676 1611
1677 _exit (EXIT_FAILURE); 1612 _exit (EXIT_FAILURE);
1678 1613
1679 default: 1614 default:
1680 if (!option (Opt_utmpInhibit)) 1615 if (!option (Opt_utmpInhibit))
1616 {
1617#ifdef LOG_ONLY_ON_LOGIN
1618 bool login_shell = option (Opt_loginShell);
1619#else
1620 bool login_shell = true;
1621#endif
1681 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1622 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1623 }
1682 1624
1683 pty->close_tty (); 1625 pty->close_tty ();
1684 1626
1685 child_ev.start (cmd_pid); 1627 child_ev.start (cmd_pid);
1686 1628
… …
1711#elif defined (SRIOCSREDIR) 1653#elif defined (SRIOCSREDIR)
1712 int fd; 1654 int fd;
1713 1655
1714 fd = open (CONSOLE, O_WRONLY, 0); 1656 fd = open (CONSOLE, O_WRONLY, 0);
1715 if (fd >= 0) 1657 if (fd >= 0)
1716 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1658 {
1659 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1717 close (fd); 1660 close (fd);
1661 }
1718#endif /* SRIOCSREDIR */ 1662#endif /* SRIOCSREDIR */
1719 } 1663 }
1720 1664
1721 /* reset signals and spin off the command interpreter */ 1665 /* reset signals and spin off the command interpreter */
1722 signal (SIGINT, SIG_DFL); 1666 signal (SIGINT, SIG_DFL);

Diff Legend

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