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.334 by sf-exg, Sat Aug 16 10:51:23 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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;
… …
521#endif 519#endif
522 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
525#endif 523#endif
526#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
527 NULL, 525 NULL,
528#endif 526#endif
529#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 528 "rgb:00/00/00",
531#endif 529#endif
… …
590 xa = display->xa; 588 xa = display->xa;
591 589
592 set (display); 590 set (display);
593 extract_resources (); 591 extract_resources ();
594 592
595#if XFT 593#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
597 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
598#endif 598#endif
599 599
600 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
602 rs [i] = 0; 602 rs [i] = 0;
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 660 pointerBlankDelay = i;
661 else 661 else
662 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
663#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
664 669
665 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 671 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
668 673
… …
793 if (option (Opt_scrollBar)) 798 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 799 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 800
796 pty = ptytty::create (); 801 pty = ptytty::create ();
797 802
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
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
807
808 create_windows (argc, argv); 803 create_windows (argc, argv);
809 804
810 init_xlocale (); 805 init_xlocale ();
811 806
812 scr_poweron (); // initialize screen 807 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
816#endif 811#endif
817 812
818 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
815
820#ifdef HAVE_BG_PIXMAP 816#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 817 bg_init ();
823
824#ifdef ENABLE_TRANSPARENCY
825 if (option (Opt_transparent))
826 {
827 bg_set_transparent ();
828
829 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]);
831
832 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]);
834
835 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]);
837
838 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root);
841 }
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
850 }
851#endif 818#endif
852 819
853#if ENABLE_PERL 820#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 821 rootwin_ev.start (display, display->root);
855#endif 822#endif
856 823
857 set_colorfgbg (); 824 init_done = 1;
858 825
859 init_command (cmd_argv); 826 init_command (cmd_argv);
860 827
861 if (pty->pty >= 0) 828 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 829 pty_ev.start (pty->pty, ev::READ);
… …
907void 874void
908rxvt_term::init_env () 875rxvt_term::init_env ()
909{ 876{
910 char *val; 877 char *val;
911 char *env_display; 878 char *env_display;
879 char *env_windowid;
880 char *env_colorfgbg;
912 char *env_term; 881 char *env_term;
913 882
914#ifdef DISPLAY_IS_IP 883#ifdef DISPLAY_IS_IP
915 /* Fixup display_name for export over pty to any interested terminal 884 /* 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 885 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
934 903
935 env_display = (char *)rxvt_malloc (strlen (val) + 9); 904 env_display = (char *)rxvt_malloc (strlen (val) + 9);
936 905
937 sprintf (env_display, "DISPLAY=%s", val); 906 sprintf (env_display, "DISPLAY=%s", val);
938 907
908 env_windowid = (char *)rxvt_malloc (21);
939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 909 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
940 910
941 /* add entries to the environment: 911 /* add entries to the environment:
942 * @ DISPLAY: in case we started with -display 912 * @ DISPLAY: in case we started with -display
943 * @ WINDOWID: X window id number of the window 913 * @ WINDOWID: X window id number of the window
… …
947 * @ COLORFGBG: fg;bg color codes 917 * @ COLORFGBG: fg;bg color codes
948 */ 918 */
949 putenv (env_display); 919 putenv (env_display);
950 putenv (env_windowid); 920 putenv (env_windowid);
951 921
952 if (env_colorfgbg) 922 env_colorfgbg = get_colorfgbg ();
953 putenv (env_colorfgbg); 923 putenv (env_colorfgbg);
954 924
955#ifdef RXVT_TERMINFO 925#ifdef RXVT_TERMINFO
956 putenv ("TERMINFO=" RXVT_TERMINFO); 926 putenv ("TERMINFO=" RXVT_TERMINFO);
957#endif 927#endif
958 928
… …
982void 952void
983rxvt_term::set_locale (const char *locale) 953rxvt_term::set_locale (const char *locale)
984{ 954{
985 set_environ (envv); 955 set_environ (envv);
986 956
987#if HAVE_XSETLOCALE || HAVE_SETLOCALE
988 free (this->locale); 957 free (this->locale);
989 this->locale = setlocale (LC_CTYPE, locale); 958 this->locale = setlocale (LC_CTYPE, locale);
990 959
991 if (!this->locale) 960 if (!this->locale)
992 { 961 {
… …
1003 972
1004 973
1005 this->locale = strdup (this->locale); 974 this->locale = strdup (this->locale);
1006 SET_LOCALE (this->locale); 975 SET_LOCALE (this->locale);
1007 mbstate.reset (); 976 mbstate.reset ();
1008#endif
1009 977
1010#if HAVE_NL_LANGINFO 978#if HAVE_NL_LANGINFO
1011 char *codeset = nl_langinfo (CODESET); 979 char *codeset = nl_langinfo (CODESET);
1012 // /^UTF.?8/i 980 // /^UTF.?8/i
1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 981 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1022void 990void
1023rxvt_term::init_xlocale () 991rxvt_term::init_xlocale ()
1024{ 992{
1025 set_environ (envv); 993 set_environ (envv);
1026 994
1027#ifdef USE_XIM 995#if USE_XIM
1028 if (!locale) 996 if (!locale)
1029 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 997 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1030 else 998 else
1031 { 999 {
1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1190/*----------------------------------------------------------------------*/ 1158/*----------------------------------------------------------------------*/
1191/* color aliases, fg/bg bright-bold */ 1159/* color aliases, fg/bg bright-bold */
1192void 1160void
1193rxvt_term::color_aliases (int idx) 1161rxvt_term::color_aliases (int idx)
1194{ 1162{
1195 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1196 { 1164 {
1197 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
1198 1166
1199 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
1200 /* bright colors */ 1168 /* bright colors */
… …
1295} 1263}
1296 1264
1297void 1265void
1298rxvt_term::set_icon (const char *file) 1266rxvt_term::set_icon (const char *file)
1299{ 1267{
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 1268#if HAVE_PIXBUF
1352 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf) 1270 if (!pixbuf)
1354 { 1271 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1272 rxvt_warn ("Loading image icon failed, continuing without.\n");
1356 return; 1273 return;
… …
1484 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1486 1403
1487 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1488 wmHint.input = True; 1405 wmHint.input = True;
1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1490 wmHint.window_group = top; 1409 wmHint.window_group = top;
1491 1410
1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1493 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH 1413#if ENABLE_EWMH
… …
1496 * set up icon hint 1415 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1498 */ 1417 */
1499 1418
1500 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif 1421#endif
1505 1422
1506#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1507 if (mwmhints.flags) 1424 if (mwmhints.flags)
1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1548 1465
1549 /* the vt window */ 1466 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1552 width, height, 1469 vt_width, vt_height,
1553 0, 1470 0,
1554 pix_colors_focused[Color_fg], 1471 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1472 pix_colors_focused[Color_bg]);
1556 1473
1557 attributes.bit_gravity = NorthWestGravity; 1474 attributes.bit_gravity = NorthWestGravity;

Diff Legend

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