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.315 by sf-exg, Mon Jan 9 15:34:56 2012 UTC vs.
Revision 1.323 by sf-exg, Fri May 25 08:27:47 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
… …
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 ();
858 init_done = 1; 843 init_done = 1;
859 844
860 init_command (cmd_argv); 845 init_command (cmd_argv);
861 846
862 if (pty->pty >= 0) 847 if (pty->pty >= 0)
… …
908void 893void
909rxvt_term::init_env () 894rxvt_term::init_env ()
910{ 895{
911 char *val; 896 char *val;
912 char *env_display; 897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
913 char *env_term; 900 char *env_term;
914 901
915#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 903 /* 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 904 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
935 922
936 env_display = (char *)rxvt_malloc (strlen (val) + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
937 924
938 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
939 926
927 env_windowid = (char *)rxvt_malloc (21);
940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
941 929
942 /* add entries to the environment: 930 /* add entries to the environment:
943 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
944 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
… …
948 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
949 */ 937 */
950 putenv (env_display); 938 putenv (env_display);
951 putenv (env_windowid); 939 putenv (env_windowid);
952 940
953 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
954 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
955 943
956#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
957 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
958#endif 946#endif
959 947
… …
983void 971void
984rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
985{ 973{
986 set_environ (envv); 974 set_environ (envv);
987 975
988#if HAVE_XSETLOCALE || HAVE_SETLOCALE
989 free (this->locale); 976 free (this->locale);
990 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
991 978
992 if (!this->locale) 979 if (!this->locale)
993 { 980 {
… …
1004 991
1005 992
1006 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
1007 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
1008 mbstate.reset (); 995 mbstate.reset ();
1009#endif
1010 996
1011#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
1012 char *codeset = nl_langinfo (CODESET); 998 char *codeset = nl_langinfo (CODESET);
1013 // /^UTF.?8/i 999 // /^UTF.?8/i
1014 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1191/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
1192/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
1193void 1179void
1194rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
1195{ 1181{
1196 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1197 { 1183 {
1198 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
1199 1185
1200 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
1201 /* bright colors */ 1187 /* bright colors */
… …
1296} 1282}
1297 1283
1298void 1284void
1299rxvt_term::set_icon (const char *file) 1285rxvt_term::set_icon (const char *file)
1300{ 1286{
1301#ifdef HAVE_AFTERIMAGE
1302 init_asv ();
1303
1304 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1305 if (!im)
1306 {
1307 rxvt_warn ("Loading image icon failed, continuing without.\n");
1308 return;
1309 }
1310
1311 unsigned int w = im->width;
1312 unsigned int h = im->height;
1313
1314 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1315 {
1316 rxvt_warn ("Icon image too big, continuing without.\n");
1317 destroy_asimage (&im);
1318 return;
1319 }
1320
1321 ASImage *result = scale_asimage (asv, im,
1322 w, h, ASA_ARGB32,
1323 100, ASIMAGE_QUALITY_DEFAULT);
1324 destroy_asimage (&im);
1325
1326 if (!result)
1327 {
1328 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1329 return;
1330 }
1331
1332 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1333 if (buffer)
1334 {
1335 ARGB32 *asbuf = result->alt.argb32;
1336 buffer [0] = w;
1337 buffer [1] = h;
1338
1339 for (unsigned int i = 0; i < w * h; ++i)
1340 buffer [i + 2] = asbuf [i];
1341
1342 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1343 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1344 free (buffer);
1345 }
1346 else
1347 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1348
1349 destroy_asimage (&result);
1350#endif
1351
1352#ifdef HAVE_PIXBUF 1287#ifdef HAVE_PIXBUF
1353 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1354 if (!pixbuf) 1289 if (!pixbuf)
1355 { 1290 {
1356 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
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;

Diff Legend

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