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.335 by sf-exg, Thu Aug 21 15:58:29 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;
669
670 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 671
665 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 673 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
668 675
… …
793 if (option (Opt_scrollBar)) 800 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 801 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 802
796 pty = ptytty::create (); 803 pty = ptytty::create ();
797 804
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); 805 create_windows (argc, argv);
809 806
810 init_xlocale (); 807 init_xlocale ();
811 808
812 scr_poweron (); // initialize screen 809 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 812 XSynchronize (dpy, True);
816#endif 813#endif
817 814
818 if (option (Opt_scrollBar)) 815 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 816 scrollBar.resize (); /* create and map scrollbar */
817
820#ifdef HAVE_BG_PIXMAP 818#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 819 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 820#endif
852 821
853#if ENABLE_PERL 822#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 823 rootwin_ev.start (display, display->root);
855#endif 824#endif
856 825
857 set_colorfgbg ();
858 init_done = 1; 826 init_done = 1;
859 827
860 init_command (cmd_argv); 828 init_command (cmd_argv);
861 829
862 if (pty->pty >= 0) 830 if (pty->pty >= 0)
… …
908void 876void
909rxvt_term::init_env () 877rxvt_term::init_env ()
910{ 878{
911 char *val; 879 char *val;
912 char *env_display; 880 char *env_display;
881 char *env_windowid;
882 char *env_colorfgbg;
913 char *env_term; 883 char *env_term;
914 884
915#ifdef DISPLAY_IS_IP 885#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 886 /* 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 887 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
935 905
936 env_display = (char *)rxvt_malloc (strlen (val) + 9); 906 env_display = (char *)rxvt_malloc (strlen (val) + 9);
937 907
938 sprintf (env_display, "DISPLAY=%s", val); 908 sprintf (env_display, "DISPLAY=%s", val);
939 909
910 env_windowid = (char *)rxvt_malloc (21);
940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 911 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
941 912
942 /* add entries to the environment: 913 /* add entries to the environment:
943 * @ DISPLAY: in case we started with -display 914 * @ DISPLAY: in case we started with -display
944 * @ WINDOWID: X window id number of the window 915 * @ WINDOWID: X window id number of the window
… …
948 * @ COLORFGBG: fg;bg color codes 919 * @ COLORFGBG: fg;bg color codes
949 */ 920 */
950 putenv (env_display); 921 putenv (env_display);
951 putenv (env_windowid); 922 putenv (env_windowid);
952 923
953 if (env_colorfgbg) 924 env_colorfgbg = get_colorfgbg ();
954 putenv (env_colorfgbg); 925 putenv (env_colorfgbg);
955 926
956#ifdef RXVT_TERMINFO 927#ifdef RXVT_TERMINFO
957 putenv ("TERMINFO=" RXVT_TERMINFO); 928 putenv ("TERMINFO=" RXVT_TERMINFO);
958#endif 929#endif
959 930
… …
983void 954void
984rxvt_term::set_locale (const char *locale) 955rxvt_term::set_locale (const char *locale)
985{ 956{
986 set_environ (envv); 957 set_environ (envv);
987 958
988#if HAVE_XSETLOCALE || HAVE_SETLOCALE
989 free (this->locale); 959 free (this->locale);
990 this->locale = setlocale (LC_CTYPE, locale); 960 this->locale = setlocale (LC_CTYPE, locale);
991 961
992 if (!this->locale) 962 if (!this->locale)
993 { 963 {
… …
1004 974
1005 975
1006 this->locale = strdup (this->locale); 976 this->locale = strdup (this->locale);
1007 SET_LOCALE (this->locale); 977 SET_LOCALE (this->locale);
1008 mbstate.reset (); 978 mbstate.reset ();
1009#endif
1010 979
1011#if HAVE_NL_LANGINFO 980#if HAVE_NL_LANGINFO
1012 char *codeset = nl_langinfo (CODESET); 981 char *codeset = nl_langinfo (CODESET);
1013 // /^UTF.?8/i 982 // /^UTF.?8/i
1014 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 983 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1023void 992void
1024rxvt_term::init_xlocale () 993rxvt_term::init_xlocale ()
1025{ 994{
1026 set_environ (envv); 995 set_environ (envv);
1027 996
1028#ifdef USE_XIM 997#if USE_XIM
1029 if (!locale) 998 if (!locale)
1030 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 999 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1031 else 1000 else
1032 { 1001 {
1033 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1002 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1191/*----------------------------------------------------------------------*/ 1160/*----------------------------------------------------------------------*/
1192/* color aliases, fg/bg bright-bold */ 1161/* color aliases, fg/bg bright-bold */
1193void 1162void
1194rxvt_term::color_aliases (int idx) 1163rxvt_term::color_aliases (int idx)
1195{ 1164{
1196 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1165 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1197 { 1166 {
1198 int i = atoi (rs[Rs_color + idx]); 1167 int i = atoi (rs[Rs_color + idx]);
1199 1168
1200 if (i >= 8 && i <= 15) 1169 if (i >= 8 && i <= 15)
1201 /* bright colors */ 1170 /* bright colors */
… …
1296} 1265}
1297 1266
1298void 1267void
1299rxvt_term::set_icon (const char *file) 1268rxvt_term::set_icon (const char *file)
1300{ 1269{
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 1270#if HAVE_PIXBUF
1353 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1271 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1354 if (!pixbuf) 1272 if (!pixbuf)
1355 { 1273 {
1356 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1274 rxvt_warn ("Loading image icon failed, continuing without.\n");
1357 return; 1275 return;
… …
1485 classHint.res_name = (char *)rs[Rs_name]; 1403 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1404 classHint.res_class = (char *)RESCLASS;
1487 1405
1488 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1406 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1489 wmHint.input = True; 1407 wmHint.input = True;
1490 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1408 wmHint.initial_state = option (Opt_iconic) ? IconicState
1409 : option (Opt_dockapp) ? WithdrawnState
1410 : NormalState;
1491 wmHint.window_group = top; 1411 wmHint.window_group = top;
1492 1412
1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1413 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1494 &szHint, &wmHint, &classHint); 1414 &szHint, &wmHint, &classHint);
1495#if ENABLE_EWMH 1415#if ENABLE_EWMH
… …
1497 * set up icon hint 1417 * set up icon hint
1498 * rs [Rs_iconfile] is path to icon 1418 * rs [Rs_iconfile] is path to icon
1499 */ 1419 */
1500 1420
1501 if (rs [Rs_iconfile]) 1421 if (rs [Rs_iconfile])
1502 {
1503 set_icon (rs [Rs_iconfile]); 1422 set_icon (rs [Rs_iconfile]);
1504 }
1505#endif 1423#endif
1506 1424
1507#if ENABLE_FRILLS 1425#if ENABLE_FRILLS
1508 if (mwmhints.flags) 1426 if (mwmhints.flags)
1509 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1427 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1466 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1549 1467
1550 /* the vt window */ 1468 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1469 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1470 window_vt_x, window_vt_y,
1553 width, height, 1471 vt_width, vt_height,
1554 0, 1472 0,
1555 pix_colors_focused[Color_fg], 1473 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1474 pix_colors_focused[Color_bg]);
1557 1475
1558 attributes.bit_gravity = NorthWestGravity; 1476 attributes.bit_gravity = NorthWestGravity;

Diff Legend

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