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.314 by sf-exg, Mon Jan 9 15:30:17 2012 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);
… …
907void 900void
908rxvt_term::init_env () 901rxvt_term::init_env ()
909{ 902{
910 char *val; 903 char *val;
911 char *env_display; 904 char *env_display;
905 char *env_windowid;
906 char *env_colorfgbg;
912 char *env_term; 907 char *env_term;
913 908
914#ifdef DISPLAY_IS_IP 909#ifdef DISPLAY_IS_IP
915 /* Fixup display_name for export over pty to any interested terminal 910 /* Fixup display_name for export over pty to any interested terminal
916 * 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
… …
934 929
935 env_display = (char *)rxvt_malloc (strlen (val) + 9); 930 env_display = (char *)rxvt_malloc (strlen (val) + 9);
936 931
937 sprintf (env_display, "DISPLAY=%s", val); 932 sprintf (env_display, "DISPLAY=%s", val);
938 933
934 env_windowid = (char *)rxvt_malloc (21);
939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 935 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
940 936
941 /* add entries to the environment: 937 /* add entries to the environment:
942 * @ DISPLAY: in case we started with -display 938 * @ DISPLAY: in case we started with -display
943 * @ WINDOWID: X window id number of the window 939 * @ WINDOWID: X window id number of the window
… …
947 * @ COLORFGBG: fg;bg color codes 943 * @ COLORFGBG: fg;bg color codes
948 */ 944 */
949 putenv (env_display); 945 putenv (env_display);
950 putenv (env_windowid); 946 putenv (env_windowid);
951 947
952 if (env_colorfgbg) 948 env_colorfgbg = get_colorfgbg ();
953 putenv (env_colorfgbg); 949 putenv (env_colorfgbg);
954 950
955#ifdef RXVT_TERMINFO 951#ifdef RXVT_TERMINFO
956 putenv ("TERMINFO=" RXVT_TERMINFO); 952 putenv ("TERMINFO=" RXVT_TERMINFO);
957#endif 953#endif
958 954
… …
982void 978void
983rxvt_term::set_locale (const char *locale) 979rxvt_term::set_locale (const char *locale)
984{ 980{
985 set_environ (envv); 981 set_environ (envv);
986 982
987#if HAVE_XSETLOCALE || HAVE_SETLOCALE
988 free (this->locale); 983 free (this->locale);
989 this->locale = setlocale (LC_CTYPE, locale); 984 this->locale = setlocale (LC_CTYPE, locale);
990 985
991 if (!this->locale) 986 if (!this->locale)
992 { 987 {
… …
1003 998
1004 999
1005 this->locale = strdup (this->locale); 1000 this->locale = strdup (this->locale);
1006 SET_LOCALE (this->locale); 1001 SET_LOCALE (this->locale);
1007 mbstate.reset (); 1002 mbstate.reset ();
1008#endif
1009 1003
1010#if HAVE_NL_LANGINFO 1004#if HAVE_NL_LANGINFO
1011 char *codeset = nl_langinfo (CODESET); 1005 char *codeset = nl_langinfo (CODESET);
1012 // /^UTF.?8/i 1006 // /^UTF.?8/i
1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1007 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1190/*----------------------------------------------------------------------*/ 1184/*----------------------------------------------------------------------*/
1191/* color aliases, fg/bg bright-bold */ 1185/* color aliases, fg/bg bright-bold */
1192void 1186void
1193rxvt_term::color_aliases (int idx) 1187rxvt_term::color_aliases (int idx)
1194{ 1188{
1195 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1189 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1196 { 1190 {
1197 int i = atoi (rs[Rs_color + idx]); 1191 int i = atoi (rs[Rs_color + idx]);
1198 1192
1199 if (i >= 8 && i <= 15) 1193 if (i >= 8 && i <= 15)
1200 /* bright colors */ 1194 /* bright colors */
… …
1295} 1289}
1296 1290
1297void 1291void
1298rxvt_term::set_icon (const char *file) 1292rxvt_term::set_icon (const char *file)
1299{ 1293{
1300#ifdef HAVE_AFTERIMAGE
1301 init_asv ();
1302
1303 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1304 if (!im)
1305 {
1306 rxvt_warn ("Loading image icon failed, continuing without.\n");
1307 return;
1308 }
1309
1310 unsigned int w = im->width;
1311 unsigned int h = im->height;
1312
1313 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1314 {
1315 rxvt_warn ("Icon image too big, continuing without.\n");
1316 destroy_asimage (&im);
1317 return;
1318 }
1319
1320 ASImage *result = scale_asimage (asv, im,
1321 w, h, ASA_ARGB32,
1322 100, ASIMAGE_QUALITY_DEFAULT);
1323 destroy_asimage (&im);
1324
1325 if (!result)
1326 {
1327 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1328 return;
1329 }
1330
1331 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1332 if (buffer)
1333 {
1334 ARGB32 *asbuf = result->alt.argb32;
1335 buffer [0] = w;
1336 buffer [1] = h;
1337
1338 for (unsigned int i = 0; i < w * h; ++i)
1339 buffer [i + 2] = asbuf [i];
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 destroy_asimage (&result);
1349#endif
1350
1351#ifdef HAVE_PIXBUF 1294#ifdef HAVE_PIXBUF
1352 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf) 1296 if (!pixbuf)
1354 { 1297 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1298 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1490 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1548 1491
1549 /* the vt window */ 1492 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1493 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1494 window_vt_x, window_vt_y,
1552 width, height, 1495 vt_width, vt_height,
1553 0, 1496 0,
1554 pix_colors_focused[Color_fg], 1497 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1498 pix_colors_focused[Color_bg]);
1556 1499
1557 attributes.bit_gravity = NorthWestGravity; 1500 attributes.bit_gravity = NorthWestGravity;

Diff Legend

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