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.322 by sf-exg, Thu May 17 10:18:32 2012 UTC vs.
Revision 1.340 by root, Sat Dec 13 12:24:32 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
… …
76#include <netinet/in.h> 76#include <netinet/in.h>
77#include <arpa/inet.h> 77#include <arpa/inet.h>
78#include <net/if.h> 78#include <net/if.h>
79#include <net/if_arp.h> 79#include <net/if_arp.h>
80 80
81static char * 81static char * ecb_cold
82rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
83{ 83{
84 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
85 struct ifconf ifc; 85 struct ifconf ifc;
86 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
519#endif 519#endif
520 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
523#endif 523#endif
524#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
525 NULL, 525 NULL,
526#endif 526#endif
527#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 528 "rgb:00/00/00",
529#endif 529#endif
… …
588 xa = display->xa; 588 xa = display->xa;
589 589
590 set (display); 590 set (display);
591 extract_resources (); 591 extract_resources ();
592 592
593#if XFT 593#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
595 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));
596#endif 598#endif
597 599
598 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
600 rs [i] = 0; 602 rs [i] = 0;
… …
657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
658 pointerBlankDelay = i; 660 pointerBlankDelay = i;
659 else 661 else
660 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
661#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;
662 671
663 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
664 if (!saveLines) 673 if (!saveLines)
665 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
666 675
… …
739 envv->push_back (0); 748 envv->push_back (0);
740 749
741 this->argv = argv; 750 this->argv = argv;
742 this->envv = envv; 751 this->envv = envv;
743 752
753 env = new char *[this->envv->size ()];
754 for (int i = 0; i < this->envv->size (); i++)
755 env[i] = this->envv->at (i);
756
744 init2 (argv->size () - 1, argv->begin ()); 757 init2 (argv->size () - 1, argv->begin ());
745} 758}
746 759
747void 760void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 761rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
766void 779void
767rxvt_term::init2 (int argc, const char *const *argv) 780rxvt_term::init2 (int argc, const char *const *argv)
768{ 781{
769 SET_R (this); 782 SET_R (this);
770 set_locale (""); 783 set_locale ("");
771 set_environ (envv); // a few things in X do not call setlocale :( 784 set_environ (env); // a few things in X do not call setlocale :(
772 785
773 init_vars (); 786 init_vars ();
774 787
775 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
776 789
… …
791 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 806
794 pty = ptytty::create (); 807 pty = ptytty::create ();
795 808
796 // must be called before create_windows, because the latter may call set_icon
797#ifdef HAVE_PIXBUF
798 g_type_init ();
799#endif
800
801 create_windows (argc, argv); 809 create_windows (argc, argv);
802 810
803 init_xlocale (); 811 init_xlocale ();
804 812
805 scr_poweron (); // initialize screen 813 scr_poweron (); // initialize screen
… …
808 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
809#endif 817#endif
810 818
811 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
812 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
813#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
814 {
815 bg_init (); 823 bg_init ();
816
817#ifdef ENABLE_TRANSPARENCY
818 if (option (Opt_transparent))
819 {
820 bg_set_transparent ();
821
822 if (rs [Rs_blurradius])
823 bg_set_blur (rs [Rs_blurradius]);
824
825 if (ISSET_PIXCOLOR (Color_tint))
826 bg_set_tint (pix_colors_focused [Color_tint]);
827
828 if (rs [Rs_shade])
829 bg_set_shade (rs [Rs_shade]);
830
831 bg_set_root_pixmap ();
832 XSelectInput (dpy, display->root, PropertyChangeMask);
833 rootwin_ev.start (display, display->root);
834 }
835#endif
836
837#ifdef BG_IMAGE_FROM_FILE
838 if (rs[Rs_backgroundPixmap])
839 if (bg_image.set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842#endif
843 }
844#endif 824#endif
845 825
846#if ENABLE_PERL 826#if ENABLE_PERL
847 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
848#endif 828#endif
… …
976 956
977/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
978void 958void
979rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
980{ 960{
981 set_environ (envv); 961 set_environ (env);
982 962
983 free (this->locale); 963 free (this->locale);
984 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
985 965
986 if (!this->locale) 966 if (!this->locale)
… …
1014} 994}
1015 995
1016void 996void
1017rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1018{ 998{
1019 set_environ (envv); 999 set_environ (env);
1020 1000
1021#ifdef USE_XIM 1001#if USE_XIM
1022 if (!locale) 1002 if (!locale)
1023 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1024 else 1004 else
1025 { 1005 {
1026 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1076 run_command (argv); 1056 run_command (argv);
1077} 1057}
1078 1058
1079/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1080void 1060void
1081rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1082{ 1062{
1083 int i; 1063 int i;
1084 1064
1085#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1086 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1087#endif 1067#endif
1088 1068
1089 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1090 { 1070 {
1091 const char *name = rs[Rs_color + i]; 1071 const char *name = rs[Rs_color + i];
1092 1072
1093 if (!name) 1073 if (!name)
1094 continue; 1074 continue;
… …
1104#endif 1084#endif
1105 name = def_colorName [i]; 1085 name = def_colorName [i];
1106 1086
1107 if (!name) 1087 if (!name)
1108 continue; 1088 continue;
1089
1090 xcol.free (this);
1109 1091
1110 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
1111 { 1093 {
1112 switch (i) 1094 switch (i)
1113 { 1095 {
… …
1133 1115
1134 pix_colors[i] = xcol; 1116 pix_colors[i] = xcol;
1135 rs[Rs_color + i] = name; 1117 rs[Rs_color + i] = name;
1136 } 1118 }
1137 1119
1138 if (depth <= 2)
1139 {
1140 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1141 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1142 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1143 }
1144
1145 /* 1120 /*
1146 * get scrollBar shadow colors 1121 * get scrollBar shadow colors
1147 * 1122 *
1148 * The calculations of topShadow/bottomShadow values are adapted 1123 * The calculations of topShadow/bottomShadow values are adapted
1149 * from the fvwm window manager. 1124 * from the fvwm window manager.
1150 */ 1125 */
1151#ifdef RXVT_SCROLLBAR 1126#ifdef RXVT_SCROLLBAR
1152 if (depth <= 2)
1153 {
1154 /* Monochrome */
1155 alias_color (Color_scroll, Color_fg);
1156 alias_color (Color_topShadow, Color_bg);
1157 alias_color (Color_bottomShadow, Color_bg);
1158 }
1159 else
1160 {
1161 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1127 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1162 1128
1163 rgba cscroll; 1129 rgba cscroll;
1164 pix_colors [Color_scroll].get (cscroll); 1130 pix_colors [Color_scroll].get (cscroll);
1165 1131
1166 /* topShadowColor */ 1132 /* topShadowColor */
1167 if (!pix_colors[Color_topShadow].set (this, 1133 if (!pix_colors[Color_topShadow].set (this,
1168 rgba ( 1134 rgba (
1169 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1135 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1170 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1136 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1171 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1172 cscroll.a) 1138 cscroll.a)
1173 )) 1139 ))
1174 alias_color (Color_topShadow, Color_White); 1140 alias_color (Color_topShadow, Color_White);
1175 }
1176#endif 1141#endif
1177 1142
1178#ifdef OFF_FOCUS_FADING 1143#ifdef OFF_FOCUS_FADING
1179 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1144 for (i = 0; i < NRS_COLORS; i++)
1180 update_fade_color (i); 1145 update_fade_color (i, true);
1181#endif 1146#endif
1182} 1147}
1183 1148
1184/*----------------------------------------------------------------------*/ 1149/*----------------------------------------------------------------------*/
1185/* color aliases, fg/bg bright-bold */ 1150/* color aliases, fg/bg bright-bold */
… …
1234 for (j = map->max_keypermod; j--; k++) 1199 for (j = map->max_keypermod; j--; k++)
1235 { 1200 {
1236 if (kc[k] == 0) 1201 if (kc[k] == 0)
1237 break; 1202 break;
1238 1203
1239 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1204 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1240 { 1205 {
1241 case XK_Num_Lock: 1206 case XK_Num_Lock:
1242 ModNumLockMask = modmasks[i - 1]; 1207 ModNumLockMask = modmasks[i - 1];
1243 continue; 1208 continue;
1244 1209
… …
1289} 1254}
1290 1255
1291void 1256void
1292rxvt_term::set_icon (const char *file) 1257rxvt_term::set_icon (const char *file)
1293{ 1258{
1294#ifdef HAVE_PIXBUF 1259#if HAVE_PIXBUF
1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1260 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1296 if (!pixbuf) 1261 if (!pixbuf)
1297 { 1262 {
1298 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1263 rxvt_warn ("Loading image icon failed, continuing without.\n");
1299 return; 1264 return;
… …
1364 Window top, parent; 1329 Window top, parent;
1365 1330
1366 dLocal (Display *, dpy); 1331 dLocal (Display *, dpy);
1367 1332
1368 /* grab colors before netscape does */ 1333 /* grab colors before netscape does */
1369 get_colours (); 1334 get_colors ();
1370 1335
1371 if (!set_fonts ()) 1336 if (!set_fonts ())
1372 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1337 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1373 1338
1374 parent = display->root; 1339 parent = display->root;
… …
1427 classHint.res_name = (char *)rs[Rs_name]; 1392 classHint.res_name = (char *)rs[Rs_name];
1428 classHint.res_class = (char *)RESCLASS; 1393 classHint.res_class = (char *)RESCLASS;
1429 1394
1430 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1395 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1431 wmHint.input = True; 1396 wmHint.input = True;
1432 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1397 wmHint.initial_state = option (Opt_iconic) ? IconicState
1398 : option (Opt_dockapp) ? WithdrawnState
1399 : NormalState;
1433 wmHint.window_group = top; 1400 wmHint.window_group = top;
1434 1401
1435 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1402 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1436 &szHint, &wmHint, &classHint); 1403 &szHint, &wmHint, &classHint);
1437#if ENABLE_EWMH 1404#if ENABLE_EWMH
… …
1439 * set up icon hint 1406 * set up icon hint
1440 * rs [Rs_iconfile] is path to icon 1407 * rs [Rs_iconfile] is path to icon
1441 */ 1408 */
1442 1409
1443 if (rs [Rs_iconfile]) 1410 if (rs [Rs_iconfile])
1444 {
1445 set_icon (rs [Rs_iconfile]); 1411 set_icon (rs [Rs_iconfile]);
1446 }
1447#endif 1412#endif
1448 1413
1449#if ENABLE_FRILLS 1414#if ENABLE_FRILLS
1450 if (mwmhints.flags) 1415 if (mwmhints.flags)
1451 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1416 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1527 if (rs[Rs_fade]) 1492 if (rs[Rs_fade])
1528 pix_colors = pix_colors_unfocused; 1493 pix_colors = pix_colors_unfocused;
1529#endif 1494#endif
1530 1495
1531 pointer_unblank (); 1496 pointer_unblank ();
1532 scr_recolour (); 1497 scr_recolor ();
1533} 1498}
1534 1499
1535/*----------------------------------------------------------------------*/ 1500/*----------------------------------------------------------------------*/
1536/* 1501/*
1537 * Run the command in a subprocess and return a file descriptor for the 1502 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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