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.338 by sf-exg, Mon Oct 6 11:11:19 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;
… …
612 rxvt_perl.init (this); 612 rxvt_perl.init (this);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 614 }
615#endif 615#endif
616 616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources (); 617 extract_keysym_resources ();
620 618
621 /* 619 /*
622 * set any defaults not already set 620 * set any defaults not already set
623 */ 621 */
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 658 pointerBlankDelay = i;
661 else 659 else
662 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
663#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
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
… …
741 envv->push_back (0); 746 envv->push_back (0);
742 747
743 this->argv = argv; 748 this->argv = argv;
744 this->envv = envv; 749 this->envv = envv;
745 750
751 env = new char *[this->envv->size ()];
752 for (int i = 0; i < this->envv->size (); i++)
753 env[i] = this->envv->at (i);
754
746 init2 (argv->size () - 1, argv->begin ()); 755 init2 (argv->size () - 1, argv->begin ());
747} 756}
748 757
749void 758void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 759rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 777void
769rxvt_term::init2 (int argc, const char *const *argv) 778rxvt_term::init2 (int argc, const char *const *argv)
770{ 779{
771 SET_R (this); 780 SET_R (this);
772 set_locale (""); 781 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 782 set_environ (env); // a few things in X do not call setlocale :(
774 783
775 init_vars (); 784 init_vars ();
776 785
777 const char **cmd_argv = init_resources (argc, argv); 786 const char **cmd_argv = init_resources (argc, argv);
778 787
… …
793 if (option (Opt_scrollBar)) 802 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 803 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 804
796 pty = ptytty::create (); 805 pty = ptytty::create ();
797 806
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); 807 create_windows (argc, argv);
809 808
810 init_xlocale (); 809 init_xlocale ();
811 810
812 scr_poweron (); // initialize screen 811 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 814 XSynchronize (dpy, True);
816#endif 815#endif
817 816
818 if (option (Opt_scrollBar)) 817 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 818 scrollBar.resize (); /* create and map scrollbar */
819
820#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 821 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 822#endif
852 823
853#if ENABLE_PERL 824#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
855#endif 826#endif
… …
983 954
984/*----------------------------------------------------------------------*/ 955/*----------------------------------------------------------------------*/
985void 956void
986rxvt_term::set_locale (const char *locale) 957rxvt_term::set_locale (const char *locale)
987{ 958{
988 set_environ (envv); 959 set_environ (env);
989 960
990#if HAVE_XSETLOCALE || HAVE_SETLOCALE
991 free (this->locale); 961 free (this->locale);
992 this->locale = setlocale (LC_CTYPE, locale); 962 this->locale = setlocale (LC_CTYPE, locale);
993 963
994 if (!this->locale) 964 if (!this->locale)
995 { 965 {
… …
1006 976
1007 977
1008 this->locale = strdup (this->locale); 978 this->locale = strdup (this->locale);
1009 SET_LOCALE (this->locale); 979 SET_LOCALE (this->locale);
1010 mbstate.reset (); 980 mbstate.reset ();
1011#endif
1012 981
1013#if HAVE_NL_LANGINFO 982#if HAVE_NL_LANGINFO
1014 char *codeset = nl_langinfo (CODESET); 983 char *codeset = nl_langinfo (CODESET);
1015 // /^UTF.?8/i 984 // /^UTF.?8/i
1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 985 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1023} 992}
1024 993
1025void 994void
1026rxvt_term::init_xlocale () 995rxvt_term::init_xlocale ()
1027{ 996{
1028 set_environ (envv); 997 set_environ (env);
1029 998
1030#ifdef USE_XIM 999#if USE_XIM
1031 if (!locale) 1000 if (!locale)
1032 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1001 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1033 else 1002 else
1034 { 1003 {
1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1004 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1193/*----------------------------------------------------------------------*/ 1162/*----------------------------------------------------------------------*/
1194/* color aliases, fg/bg bright-bold */ 1163/* color aliases, fg/bg bright-bold */
1195void 1164void
1196rxvt_term::color_aliases (int idx) 1165rxvt_term::color_aliases (int idx)
1197{ 1166{
1198 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1167 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1199 { 1168 {
1200 int i = atoi (rs[Rs_color + idx]); 1169 int i = atoi (rs[Rs_color + idx]);
1201 1170
1202 if (i >= 8 && i <= 15) 1171 if (i >= 8 && i <= 15)
1203 /* bright colors */ 1172 /* bright colors */
… …
1243 for (j = map->max_keypermod; j--; k++) 1212 for (j = map->max_keypermod; j--; k++)
1244 { 1213 {
1245 if (kc[k] == 0) 1214 if (kc[k] == 0)
1246 break; 1215 break;
1247 1216
1248 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1217 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1249 { 1218 {
1250 case XK_Num_Lock: 1219 case XK_Num_Lock:
1251 ModNumLockMask = modmasks[i - 1]; 1220 ModNumLockMask = modmasks[i - 1];
1252 continue; 1221 continue;
1253 1222
… …
1298} 1267}
1299 1268
1300void 1269void
1301rxvt_term::set_icon (const char *file) 1270rxvt_term::set_icon (const char *file)
1302{ 1271{
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 1272#if HAVE_PIXBUF
1355 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1273 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1356 if (!pixbuf) 1274 if (!pixbuf)
1357 { 1275 {
1358 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1276 rxvt_warn ("Loading image icon failed, continuing without.\n");
1359 return; 1277 return;
… …
1487 classHint.res_name = (char *)rs[Rs_name]; 1405 classHint.res_name = (char *)rs[Rs_name];
1488 classHint.res_class = (char *)RESCLASS; 1406 classHint.res_class = (char *)RESCLASS;
1489 1407
1490 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1408 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1491 wmHint.input = True; 1409 wmHint.input = True;
1492 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1410 wmHint.initial_state = option (Opt_iconic) ? IconicState
1411 : option (Opt_dockapp) ? WithdrawnState
1412 : NormalState;
1493 wmHint.window_group = top; 1413 wmHint.window_group = top;
1494 1414
1495 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1415 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1496 &szHint, &wmHint, &classHint); 1416 &szHint, &wmHint, &classHint);
1497#if ENABLE_EWMH 1417#if ENABLE_EWMH
… …
1499 * set up icon hint 1419 * set up icon hint
1500 * rs [Rs_iconfile] is path to icon 1420 * rs [Rs_iconfile] is path to icon
1501 */ 1421 */
1502 1422
1503 if (rs [Rs_iconfile]) 1423 if (rs [Rs_iconfile])
1504 {
1505 set_icon (rs [Rs_iconfile]); 1424 set_icon (rs [Rs_iconfile]);
1506 }
1507#endif 1425#endif
1508 1426
1509#if ENABLE_FRILLS 1427#if ENABLE_FRILLS
1510 if (mwmhints.flags) 1428 if (mwmhints.flags)
1511 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1429 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1551 1469
1552 /* the vt window */ 1470 /* the vt window */
1553 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1554 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1555 width, height, 1473 vt_width, vt_height,
1556 0, 1474 0,
1557 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1558 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1559 1477
1560 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;

Diff Legend

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