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.321 by sf-exg, Sat Feb 4 21:47:06 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
… …
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
… …
852 845
853#if ENABLE_PERL 846#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 847 rootwin_ev.start (display, display->root);
855#endif 848#endif
856 849
857 set_colorfgbg (); 850 init_done = 1;
858 851
859 init_command (cmd_argv); 852 init_command (cmd_argv);
860 853
861 if (pty->pty >= 0) 854 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 855 pty_ev.start (pty->pty, ev::READ);
… …
906/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
907void 900void
908rxvt_term::init_env () 901rxvt_term::init_env ()
909{ 902{
910 char *val; 903 char *val;
904 char *env_display;
905 char *env_windowid;
906 char *env_colorfgbg;
907 char *env_term;
911 908
912#ifdef DISPLAY_IS_IP 909#ifdef DISPLAY_IS_IP
913 /* Fixup display_name for export over pty to any interested terminal 910 /* 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 911 * 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 912 * (for the first non-loopback interface) that we get from
… …
932 929
933 env_display = (char *)rxvt_malloc (strlen (val) + 9); 930 env_display = (char *)rxvt_malloc (strlen (val) + 9);
934 931
935 sprintf (env_display, "DISPLAY=%s", val); 932 sprintf (env_display, "DISPLAY=%s", val);
936 933
934 env_windowid = (char *)rxvt_malloc (21);
937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 935 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
938 936
939 /* add entries to the environment: 937 /* add entries to the environment:
940 * @ DISPLAY: in case we started with -display 938 * @ DISPLAY: in case we started with -display
941 * @ WINDOWID: X window id number of the window 939 * @ WINDOWID: X window id number of the window
… …
945 * @ COLORFGBG: fg;bg color codes 943 * @ COLORFGBG: fg;bg color codes
946 */ 944 */
947 putenv (env_display); 945 putenv (env_display);
948 putenv (env_windowid); 946 putenv (env_windowid);
949 947
950 if (env_colorfgbg) 948 env_colorfgbg = get_colorfgbg ();
951 putenv (env_colorfgbg); 949 putenv (env_colorfgbg);
952 950
953#ifdef RXVT_TERMINFO 951#ifdef RXVT_TERMINFO
954 putenv ("TERMINFO=" RXVT_TERMINFO); 952 putenv ("TERMINFO=" RXVT_TERMINFO);
955#endif 953#endif
956 954
… …
980void 978void
981rxvt_term::set_locale (const char *locale) 979rxvt_term::set_locale (const char *locale)
982{ 980{
983 set_environ (envv); 981 set_environ (envv);
984 982
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 983 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 984 this->locale = setlocale (LC_CTYPE, locale);
988 985
989 if (!this->locale) 986 if (!this->locale)
990 { 987 {
… …
1001 998
1002 999
1003 this->locale = strdup (this->locale); 1000 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 1001 SET_LOCALE (this->locale);
1005 mbstate.reset (); 1002 mbstate.reset ();
1006#endif
1007 1003
1008#if HAVE_NL_LANGINFO 1004#if HAVE_NL_LANGINFO
1009 char *codeset = nl_langinfo (CODESET); 1005 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 1006 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1007 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1188/*----------------------------------------------------------------------*/ 1184/*----------------------------------------------------------------------*/
1189/* color aliases, fg/bg bright-bold */ 1185/* color aliases, fg/bg bright-bold */
1190void 1186void
1191rxvt_term::color_aliases (int idx) 1187rxvt_term::color_aliases (int idx)
1192{ 1188{
1193 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1189 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1194 { 1190 {
1195 int i = atoi (rs[Rs_color + idx]); 1191 int i = atoi (rs[Rs_color + idx]);
1196 1192
1197 if (i >= 8 && i <= 15) 1193 if (i >= 8 && i <= 15)
1198 /* bright colors */ 1194 /* bright colors */
… …
1293} 1289}
1294 1290
1295void 1291void
1296rxvt_term::set_icon (const char *file) 1292rxvt_term::set_icon (const char *file)
1297{ 1293{
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 1294#ifdef HAVE_PIXBUF
1350 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf) 1296 if (!pixbuf)
1352 { 1297 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1298 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1419 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1475 &attributes); 1420 &attributes);
1476 1421
1477 this->parent = top; 1422 this->parent = top;
1478 1423
1479 old_width = szHint.width;
1480 old_height = szHint.height;
1481
1482 set_title (rs [Rs_title]); 1424 set_title (rs [Rs_title]);
1483 set_icon_name (rs [Rs_iconName]); 1425 set_icon_name (rs [Rs_iconName]);
1484 1426
1485 classHint.res_name = (char *)rs[Rs_name]; 1427 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1428 classHint.res_class = (char *)RESCLASS;
… …
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1490 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1549 1491
1550 /* the vt window */ 1492 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1493 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1494 window_vt_x, window_vt_y,
1553 width, height, 1495 vt_width, vt_height,
1554 0, 1496 0,
1555 pix_colors_focused[Color_fg], 1497 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1498 pix_colors_focused[Color_bg]);
1557 1499
1558 attributes.bit_gravity = NorthWestGravity; 1500 attributes.bit_gravity = NorthWestGravity;
… …
1607 if (pty->pty >= 0) 1549 if (pty->pty >= 0)
1608 { 1550 {
1609 if (getfd_hook) 1551 if (getfd_hook)
1610 pty->pty = (*getfd_hook) (pty->pty); 1552 pty->pty = (*getfd_hook) (pty->pty);
1611 1553
1612 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1554 if (pty->pty < 0)
1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1555 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1614 } 1556 }
1615 } 1557 }
1616 else 1558 else
1617#endif 1559#endif
1618 if (!pty->get ()) 1560 if (!pty->get ())
1619 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1561 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1562
1563 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1620 1564
1621 struct termios tio = def_tio; 1565 struct termios tio = def_tio;
1622 1566
1623#ifndef NO_BACKSPACE_KEY 1567#ifndef NO_BACKSPACE_KEY
1624 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1568 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1674 1618
1675 _exit (EXIT_FAILURE); 1619 _exit (EXIT_FAILURE);
1676 1620
1677 default: 1621 default:
1678 if (!option (Opt_utmpInhibit)) 1622 if (!option (Opt_utmpInhibit))
1623 {
1624#ifdef LOG_ONLY_ON_LOGIN
1625 bool login_shell = option (Opt_loginShell);
1626#else
1627 bool login_shell = true;
1628#endif
1679 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1629 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1630 }
1680 1631
1681 pty->close_tty (); 1632 pty->close_tty ();
1682 1633
1683 child_ev.start (cmd_pid); 1634 child_ev.start (cmd_pid);
1684 1635
… …
1709#elif defined (SRIOCSREDIR) 1660#elif defined (SRIOCSREDIR)
1710 int fd; 1661 int fd;
1711 1662
1712 fd = open (CONSOLE, O_WRONLY, 0); 1663 fd = open (CONSOLE, O_WRONLY, 0);
1713 if (fd >= 0) 1664 if (fd >= 0)
1714 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1665 {
1666 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1715 close (fd); 1667 close (fd);
1668 }
1716#endif /* SRIOCSREDIR */ 1669#endif /* SRIOCSREDIR */
1717 } 1670 }
1718 1671
1719 /* reset signals and spin off the command interpreter */ 1672 /* reset signals and spin off the command interpreter */
1720 signal (SIGINT, SIG_DFL); 1673 signal (SIGINT, SIG_DFL);

Diff Legend

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