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.326 by root, Sun Jun 3 10:42:34 2012 UTC vs.
Revision 1.342 by root, Mon Dec 15 02:04:02 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
… …
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
… …
803 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
804#endif 817#endif
805 818
806 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
808#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init (); 823 bg_init ();
811
812#ifdef ENABLE_TRANSPARENCY
813 if (option (Opt_transparent))
814 {
815 bg_set_transparent ();
816
817 if (rs [Rs_blurradius])
818 root_effects.set_blur (rs [Rs_blurradius]);
819
820 if (ISSET_PIXCOLOR (Color_tint))
821 root_effects.set_tint (pix_colors_focused [Color_tint]);
822
823 if (rs [Rs_shade])
824 root_effects.set_shade (rs [Rs_shade]);
825
826 bg_set_root_pixmap ();
827 XSelectInput (dpy, display->root, PropertyChangeMask);
828 rootwin_ev.start (display, display->root);
829 }
830#endif
831 }
832#endif 824#endif
833 825
834#if ENABLE_PERL 826#if ENABLE_PERL
835 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
836#endif 828#endif
… …
964 956
965/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
966void 958void
967rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
968{ 960{
969 set_environ (envv); 961 set_environ (env);
970 962
971 free (this->locale); 963 free (this->locale);
972 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
973 965
974 if (!this->locale) 966 if (!this->locale)
… …
1002} 994}
1003 995
1004void 996void
1005rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1006{ 998{
1007 set_environ (envv); 999 set_environ (env);
1008 1000
1009#ifdef USE_XIM 1001#if USE_XIM
1010 if (!locale) 1002 if (!locale)
1011 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1012 else 1004 else
1013 { 1005 {
1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1064 run_command (argv); 1056 run_command (argv);
1065} 1057}
1066 1058
1067/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1068void 1060void
1069rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1070{ 1062{
1071 int i; 1063 int i;
1072 1064
1073#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1074 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1075#endif 1067#endif
1076 1068
1077 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1078 {
1079 const char *name = rs[Rs_color + i]; 1070 if (const char *name = rs[Rs_color + i])
1080
1081 if (!name)
1082 continue;
1083
1084 rxvt_color xcol;
1085
1086 if (!set_color (xcol, name)) 1071 set_color (pix_colors [i], name);
1087 {
1088#ifndef XTERM_REVERSE_VIDEO
1089 if (i < 2 && option (Opt_reverseVideo))
1090 name = def_colorName [1 - i];
1091 else
1092#endif
1093 name = def_colorName [i];
1094
1095 if (!name)
1096 continue;
1097
1098 if (!set_color (xcol, name))
1099 {
1100 switch (i)
1101 {
1102 case Color_fg:
1103 case Color_bg:
1104 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1105 name = "";
1106 break;
1107#ifndef NO_CURSORCOLOR
1108 case Color_cursor2:
1109#endif
1110 case Color_pointer_fg:
1111 name = rs[Rs_color + Color_fg];
1112 xcol.set (this, name);
1113 break;
1114 default:
1115 name = rs[Rs_color + Color_bg];
1116 xcol.set (this, name);
1117 break;
1118 }
1119 }
1120 }
1121
1122 pix_colors[i] = xcol;
1123 rs[Rs_color + i] = name;
1124 }
1125
1126 if (depth <= 2)
1127 {
1128 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1129 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1130 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1131 }
1132 1072
1133 /* 1073 /*
1134 * get scrollBar shadow colors 1074 * get scrollBar shadow colors
1135 * 1075 *
1136 * The calculations of topShadow/bottomShadow values are adapted 1076 * The calculations of topShadow/bottomShadow values are adapted
1137 * from the fvwm window manager. 1077 * from the fvwm window manager.
1138 */ 1078 */
1139#ifdef RXVT_SCROLLBAR 1079#ifdef RXVT_SCROLLBAR
1140 if (depth <= 2)
1141 {
1142 /* Monochrome */
1143 alias_color (Color_scroll, Color_fg);
1144 alias_color (Color_topShadow, Color_bg);
1145 alias_color (Color_bottomShadow, Color_bg);
1146 }
1147 else
1148 {
1149 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1080 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1150 1081
1151 rgba cscroll; 1082 rgba cscroll;
1152 pix_colors [Color_scroll].get (cscroll); 1083 pix_colors [Color_scroll].get (cscroll);
1153 1084
1154 /* topShadowColor */ 1085 /* topShadowColor */
1155 if (!pix_colors[Color_topShadow].set (this, 1086 if (!pix_colors[Color_topShadow].set (this,
1156 rgba ( 1087 rgba (
1157 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1088 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1158 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1089 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1159 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1090 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1160 cscroll.a) 1091 cscroll.a)
1161 )) 1092 ))
1162 alias_color (Color_topShadow, Color_White); 1093 alias_color (Color_topShadow, Color_White);
1163 }
1164#endif 1094#endif
1165 1095
1166#ifdef OFF_FOCUS_FADING 1096#ifdef OFF_FOCUS_FADING
1167 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1097 for (i = 0; i < NRS_COLORS; i++)
1168 update_fade_color (i); 1098 update_fade_color (i, true);
1169#endif 1099#endif
1170} 1100}
1171 1101
1172/*----------------------------------------------------------------------*/ 1102/*----------------------------------------------------------------------*/
1173/* color aliases, fg/bg bright-bold */ 1103/* color aliases, fg/bg bright-bold */
… …
1222 for (j = map->max_keypermod; j--; k++) 1152 for (j = map->max_keypermod; j--; k++)
1223 { 1153 {
1224 if (kc[k] == 0) 1154 if (kc[k] == 0)
1225 break; 1155 break;
1226 1156
1227 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1157 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1228 { 1158 {
1229 case XK_Num_Lock: 1159 case XK_Num_Lock:
1230 ModNumLockMask = modmasks[i - 1]; 1160 ModNumLockMask = modmasks[i - 1];
1231 continue; 1161 continue;
1232 1162
… …
1277} 1207}
1278 1208
1279void 1209void
1280rxvt_term::set_icon (const char *file) 1210rxvt_term::set_icon (const char *file)
1281{ 1211{
1282#ifdef HAVE_PIXBUF 1212#if HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1213 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf) 1214 if (!pixbuf)
1285 { 1215 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1216 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return; 1217 return;
… …
1352 Window top, parent; 1282 Window top, parent;
1353 1283
1354 dLocal (Display *, dpy); 1284 dLocal (Display *, dpy);
1355 1285
1356 /* grab colors before netscape does */ 1286 /* grab colors before netscape does */
1357 get_colours (); 1287 get_colors ();
1358 1288
1359 if (!set_fonts ()) 1289 if (!set_fonts ())
1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1290 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1361 1291
1362 parent = display->root; 1292 parent = display->root;
… …
1415 classHint.res_name = (char *)rs[Rs_name]; 1345 classHint.res_name = (char *)rs[Rs_name];
1416 classHint.res_class = (char *)RESCLASS; 1346 classHint.res_class = (char *)RESCLASS;
1417 1347
1418 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1348 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1419 wmHint.input = True; 1349 wmHint.input = True;
1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1350 wmHint.initial_state = option (Opt_iconic) ? IconicState
1351 : option (Opt_dockapp) ? WithdrawnState
1352 : NormalState;
1421 wmHint.window_group = top; 1353 wmHint.window_group = top;
1422 1354
1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1355 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1424 &szHint, &wmHint, &classHint); 1356 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH 1357#if ENABLE_EWMH
… …
1427 * set up icon hint 1359 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon 1360 * rs [Rs_iconfile] is path to icon
1429 */ 1361 */
1430 1362
1431 if (rs [Rs_iconfile]) 1363 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]); 1364 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif 1365#endif
1436 1366
1437#if ENABLE_FRILLS 1367#if ENABLE_FRILLS
1438 if (mwmhints.flags) 1368 if (mwmhints.flags)
1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1369 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1515 if (rs[Rs_fade]) 1445 if (rs[Rs_fade])
1516 pix_colors = pix_colors_unfocused; 1446 pix_colors = pix_colors_unfocused;
1517#endif 1447#endif
1518 1448
1519 pointer_unblank (); 1449 pointer_unblank ();
1520 scr_recolour (); 1450 scr_recolor ();
1521} 1451}
1522 1452
1523/*----------------------------------------------------------------------*/ 1453/*----------------------------------------------------------------------*/
1524/* 1454/*
1525 * Run the command in a subprocess and return a file descriptor for the 1455 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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