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.316 by sf-exg, Mon Jan 9 15:45:45 2012 UTC vs.
Revision 1.324 by root, Mon May 28 16:40:03 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
… …
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
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 835#endif
850 } 836 }
851#endif 837#endif
852 838
853#if ENABLE_PERL 839#if ENABLE_PERL
… …
985void 971void
986rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
987{ 973{
988 set_environ (envv); 974 set_environ (envv);
989 975
990#if HAVE_XSETLOCALE || HAVE_SETLOCALE
991 free (this->locale); 976 free (this->locale);
992 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
993 978
994 if (!this->locale) 979 if (!this->locale)
995 { 980 {
… …
1006 991
1007 992
1008 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
1009 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
1010 mbstate.reset (); 995 mbstate.reset ();
1011#endif
1012 996
1013#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
1014 char *codeset = nl_langinfo (CODESET); 998 char *codeset = nl_langinfo (CODESET);
1015 // /^UTF.?8/i 999 // /^UTF.?8/i
1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1193/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
1194/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
1195void 1179void
1196rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
1197{ 1181{
1198 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1199 { 1183 {
1200 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
1201 1185
1202 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
1203 /* bright colors */ 1187 /* bright colors */
… …
1298} 1282}
1299 1283
1300void 1284void
1301rxvt_term::set_icon (const char *file) 1285rxvt_term::set_icon (const char *file)
1302{ 1286{
1303#ifdef HAVE_AFTERIMAGE
1304 init_asv ();
1305
1306 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1307 if (!im)
1308 {
1309 rxvt_warn ("Loading image icon failed, continuing without.\n");
1310 return;
1311 }
1312
1313 unsigned int w = im->width;
1314 unsigned int h = im->height;
1315
1316 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1317 {
1318 rxvt_warn ("Icon image too big, continuing without.\n");
1319 destroy_asimage (&im);
1320 return;
1321 }
1322
1323 ASImage *result = scale_asimage (asv, im,
1324 w, h, ASA_ARGB32,
1325 100, ASIMAGE_QUALITY_DEFAULT);
1326 destroy_asimage (&im);
1327
1328 if (!result)
1329 {
1330 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1331 return;
1332 }
1333
1334 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1335 if (buffer)
1336 {
1337 ARGB32 *asbuf = result->alt.argb32;
1338 buffer [0] = w;
1339 buffer [1] = h;
1340
1341 for (unsigned int i = 0; i < w * h; ++i)
1342 buffer [i + 2] = asbuf [i];
1343
1344 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1345 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1346 free (buffer);
1347 }
1348 else
1349 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1350
1351 destroy_asimage (&result);
1352#endif
1353
1354#ifdef HAVE_PIXBUF 1287#ifdef HAVE_PIXBUF
1355 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1356 if (!pixbuf) 1289 if (!pixbuf)
1357 { 1290 {
1358 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1551 1484
1552 /* the vt window */ 1485 /* the vt window */
1553 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1554 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1555 width, height, 1488 vt_width, vt_height,
1556 0, 1489 0,
1557 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1558 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1559 1492
1560 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;

Diff Legend

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