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.334 by sf-exg, Sat Aug 16 10:51:23 2014 UTC vs.
Revision 1.349 by root, Tue Jun 25 03:35:01 2019 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 3 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
42 43
43#include <signal.h> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
46 47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# include <locale.h> 56# include <locale.h>
… …
145 close (skfd); 150 close (skfd);
146 151
147 return rval; 152 return rval;
148} 153}
149#endif 154#endif
155
156#define NULL_5 \
157 NULL, \
158 NULL, \
159 NULL, \
160 NULL, \
161 NULL,
162
163#define NULL_10 \
164 NULL_5 \
165 NULL_5
166
167#define NULL_40 \
168 NULL_10 \
169 NULL_10 \
170 NULL_10 \
171 NULL_10
172
173#define NULL_50 \
174 NULL_40 \
175 NULL_10
176
177#define NULL_100 \
178 NULL_50 \
179 NULL_50
150 180
151static const char *const def_colorName[] = 181static const char *const def_colorName[] =
152 { 182 {
153 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
154 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
… …
251 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
252 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
253 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
254 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
255 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
256#else 292#else
257 // 256 xterm colours 293 // 256 xterm colours
258 "rgb:00/00/00", 294 "rgb:00/00/00",
259 "rgb:00/00/5f", 295 "rgb:00/00/5f",
260 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
493 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
495 "rgb:da/da/da", 531 "rgb:da/da/da",
496 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
498#endif 538#endif
499 539
500#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
501 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
502 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
519#endif 559#endif
520 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
523#endif 563#endif
524#if BG_IMAGE_FROM_ROOT
525 NULL,
526#endif
527#if OFF_FOCUS_FADING 564#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 565 "rgb:00/00/00",
529#endif 566#endif
530 }; 567 };
531 568
… …
561 set_option (Opt_iso14755); 598 set_option (Opt_iso14755);
562 set_option (Opt_iso14755_52); 599 set_option (Opt_iso14755_52);
563 set_option (Opt_buffered); 600 set_option (Opt_buffered);
564} 601}
565 602
603#if ENABLE_PERL
604static void
605rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
606{
607 rxvt_perl.parse_resource (term, k, false, false, 0, v);
608}
609#endif
610
566/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
567const char ** 612const char **
568rxvt_term::init_resources (int argc, const char *const *argv) 613rxvt_term::init_resources (int argc, const char *const *argv)
569{ 614{
570 int i; 615 int i;
… …
608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
609 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
610 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
611 { 656 {
612 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 660 }
615#endif 661#endif
616 662
617 // must be called after initialising the perl interpreter as it 663 // must be called after initialising the perl interpreter as it
… …
664 710
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0) 711 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i; 712 multiClickTime = i;
667 else 713 else
668 multiClickTime = 500; 714 multiClickTime = 500;
715
716 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
669 717
670 /* no point having a scrollbar without having any scrollback! */ 718 /* no point having a scrollbar without having any scrollback! */
671 if (!saveLines) 719 if (!saveLines)
672 set_option (Opt_scrollBar, 0); 720 set_option (Opt_scrollBar, 0);
673 721
… …
746 envv->push_back (0); 794 envv->push_back (0);
747 795
748 this->argv = argv; 796 this->argv = argv;
749 this->envv = envv; 797 this->envv = envv;
750 798
799 env = new char *[this->envv->size ()];
800 for (int i = 0; i < this->envv->size (); i++)
801 env[i] = this->envv->at (i);
802
751 init2 (argv->size () - 1, argv->begin ()); 803 init2 (argv->size () - 1, argv->begin ());
752} 804}
753 805
754void 806void
755rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 807rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
773void 825void
774rxvt_term::init2 (int argc, const char *const *argv) 826rxvt_term::init2 (int argc, const char *const *argv)
775{ 827{
776 SET_R (this); 828 SET_R (this);
777 set_locale (""); 829 set_locale ("");
778 set_environ (envv); // a few things in X do not call setlocale :( 830 set_environ (env); // a few things in X do not call setlocale :(
779 831
780 init_vars (); 832 init_vars ();
781 833
782 const char **cmd_argv = init_resources (argc, argv); 834 const char **cmd_argv = init_resources (argc, argv);
783 835
… …
810 XSynchronize (dpy, True); 862 XSynchronize (dpy, True);
811#endif 863#endif
812 864
813 if (option (Opt_scrollBar)) 865 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */ 866 scrollBar.resize (); /* create and map scrollbar */
815
816#ifdef HAVE_BG_PIXMAP
817 bg_init ();
818#endif
819 867
820#if ENABLE_PERL 868#if ENABLE_PERL
821 rootwin_ev.start (display, display->root); 869 rootwin_ev.start (display, display->root);
822#endif 870#endif
823 871
… …
925#ifdef RXVT_TERMINFO 973#ifdef RXVT_TERMINFO
926 putenv ("TERMINFO=" RXVT_TERMINFO); 974 putenv ("TERMINFO=" RXVT_TERMINFO);
927#endif 975#endif
928 976
929 if (depth <= 2) 977 if (depth <= 2)
930 putenv ("COLORTERM=" COLORTERMENV "-mono"); 978 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
931 else 979 else
932 putenv ("COLORTERM=" COLORTERMENVFULL); 980 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
933 981
934 if (rs[Rs_term_name] != NULL) 982 if (rs[Rs_term_name] != NULL)
935 { 983 {
936 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 984 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
937 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 985 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
938 putenv (env_term); 986 putenv (env_term);
939 } 987 }
940 else 988 else
941 putenv ("TERM=" TERMENV); 989 putenv ((char *)"TERM=" TERMENV);
942 990
943#ifdef HAVE_UNSETENV 991#ifdef HAVE_UNSETENV
944 /* avoid passing old settings and confusing term size */ 992 /* avoid passing old settings and confusing term size */
945 unsetenv ("LINES"); 993 unsetenv ("LINES");
946 unsetenv ("COLUMNS"); 994 unsetenv ("COLUMNS");
… …
950 998
951/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
952void 1000void
953rxvt_term::set_locale (const char *locale) 1001rxvt_term::set_locale (const char *locale)
954{ 1002{
955 set_environ (envv); 1003 set_environ (env);
956 1004
957 free (this->locale); 1005 free (this->locale);
958 this->locale = setlocale (LC_CTYPE, locale); 1006 this->locale = setlocale (LC_CTYPE, locale);
959 1007
960 if (!this->locale) 1008 if (!this->locale)
… …
965 setlocale (LC_CTYPE, "C"); 1013 setlocale (LC_CTYPE, "C");
966 } 1014 }
967 else 1015 else
968 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 1016 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
969 1017
970 this->locale = "C"; 1018 this->locale = (char *)"C"; /* strdup'ed below */
971 } 1019 }
972 1020
973 1021
974 this->locale = strdup (this->locale); 1022 this->locale = strdup (this->locale);
975 SET_LOCALE (this->locale); 1023 SET_LOCALE (this->locale);
… …
988} 1036}
989 1037
990void 1038void
991rxvt_term::init_xlocale () 1039rxvt_term::init_xlocale ()
992{ 1040{
993 set_environ (envv); 1041 set_environ (env);
994 1042
995#if USE_XIM 1043#if USE_XIM
996 if (!locale) 1044 if (!locale)
997 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1045 rxvt_warn ("setting locale failed, continuing without locale support.\n");
998 else 1046 else
… …
1050 run_command (argv); 1098 run_command (argv);
1051} 1099}
1052 1100
1053/*----------------------------------------------------------------------*/ 1101/*----------------------------------------------------------------------*/
1054void 1102void
1055rxvt_term::get_colours () 1103rxvt_term::get_colors ()
1056{ 1104{
1057 int i; 1105 int i;
1058 1106
1059#ifdef OFF_FOCUS_FADING 1107#ifdef OFF_FOCUS_FADING
1060 pix_colors = pix_colors_focused; 1108 pix_colors = pix_colors_focused;
1061#endif 1109#endif
1062 1110
1063 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1111 for (i = 0; i < NRS_COLORS; i++)
1064 {
1065 const char *name = rs[Rs_color + i]; 1112 if (const char *name = rs[Rs_color + i])
1066
1067 if (!name)
1068 continue;
1069
1070 rxvt_color xcol;
1071
1072 if (!set_color (xcol, name)) 1113 set_color (pix_colors [i], name);
1073 {
1074#ifndef XTERM_REVERSE_VIDEO
1075 if (i < 2 && option (Opt_reverseVideo))
1076 name = def_colorName [1 - i];
1077 else
1078#endif
1079 name = def_colorName [i];
1080
1081 if (!name)
1082 continue;
1083
1084 if (!set_color (xcol, name))
1085 {
1086 switch (i)
1087 {
1088 case Color_fg:
1089 case Color_bg:
1090 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1091 name = "";
1092 break;
1093#ifndef NO_CURSORCOLOR
1094 case Color_cursor2:
1095#endif
1096 case Color_pointer_fg:
1097 name = rs[Rs_color + Color_fg];
1098 xcol.set (this, name);
1099 break;
1100 default:
1101 name = rs[Rs_color + Color_bg];
1102 xcol.set (this, name);
1103 break;
1104 }
1105 }
1106 }
1107
1108 pix_colors[i] = xcol;
1109 rs[Rs_color + i] = name;
1110 }
1111
1112 if (depth <= 2)
1113 {
1114 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1115 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1116 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1117 }
1118 1114
1119 /* 1115 /*
1120 * get scrollBar shadow colors 1116 * get scrollBar shadow colors
1121 * 1117 *
1122 * The calculations of topShadow/bottomShadow values are adapted 1118 * The calculations of topShadow/bottomShadow values are adapted
1123 * from the fvwm window manager. 1119 * from the fvwm window manager.
1124 */ 1120 */
1125#ifdef RXVT_SCROLLBAR 1121#ifdef RXVT_SCROLLBAR
1126 if (depth <= 2)
1127 {
1128 /* Monochrome */
1129 alias_color (Color_scroll, Color_fg);
1130 alias_color (Color_topShadow, Color_bg);
1131 alias_color (Color_bottomShadow, Color_bg);
1132 }
1133 else
1134 {
1135 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1122 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1136 1123
1137 rgba cscroll; 1124 rgba cscroll;
1138 pix_colors [Color_scroll].get (cscroll); 1125 pix_colors [Color_scroll].get (cscroll);
1139 1126
1140 /* topShadowColor */ 1127 /* topShadowColor */
1141 if (!pix_colors[Color_topShadow].set (this, 1128 if (!pix_colors[Color_topShadow].set (this,
1142 rgba ( 1129 rgba (
1143 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1130 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1144 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1131 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1145 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1132 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1146 cscroll.a) 1133 cscroll.a)
1147 )) 1134 ))
1148 alias_color (Color_topShadow, Color_White); 1135 alias_color (Color_topShadow, Color_White);
1149 }
1150#endif 1136#endif
1151 1137
1152#ifdef OFF_FOCUS_FADING 1138#ifdef OFF_FOCUS_FADING
1153 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1139 for (i = 0; i < NRS_COLORS; i++)
1154 update_fade_color (i); 1140 update_fade_color (i, true);
1155#endif 1141#endif
1156} 1142}
1157 1143
1158/*----------------------------------------------------------------------*/ 1144/*----------------------------------------------------------------------*/
1159/* color aliases, fg/bg bright-bold */ 1145/* color aliases, fg/bg bright-bold */
… …
1208 for (j = map->max_keypermod; j--; k++) 1194 for (j = map->max_keypermod; j--; k++)
1209 { 1195 {
1210 if (kc[k] == 0) 1196 if (kc[k] == 0)
1211 break; 1197 break;
1212 1198
1213 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1199 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1214 { 1200 {
1215 case XK_Num_Lock: 1201 case XK_Num_Lock:
1216 ModNumLockMask = modmasks[i - 1]; 1202 ModNumLockMask = modmasks[i - 1];
1217 continue; 1203 continue;
1218 1204
… …
1263} 1249}
1264 1250
1265void 1251void
1266rxvt_term::set_icon (const char *file) 1252rxvt_term::set_icon (const char *file)
1267{ 1253{
1268#if HAVE_PIXBUF 1254#if HAVE_PIXBUF && ENABLE_EWMH
1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1255 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1270 if (!pixbuf) 1256 if (!pixbuf)
1271 { 1257 {
1272 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1258 rxvt_warn ("Loading image icon failed, continuing without.\n");
1273 return; 1259 return;
… …
1338 Window top, parent; 1324 Window top, parent;
1339 1325
1340 dLocal (Display *, dpy); 1326 dLocal (Display *, dpy);
1341 1327
1342 /* grab colors before netscape does */ 1328 /* grab colors before netscape does */
1343 get_colours (); 1329 get_colors ();
1344 1330
1345 if (!set_fonts ()) 1331 if (!set_fonts ())
1346 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1332 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1347 1333
1348 parent = display->root; 1334 parent = display->root;
… …
1459 | ExposureMask | StructureNotifyMask); 1445 | ExposureMask | StructureNotifyMask);
1460 1446
1461 termwin_ev.start (display, top); 1447 termwin_ev.start (display, top);
1462 1448
1463 /* vt cursor: Black-on-White is standard, but this is more popular */ 1449 /* vt cursor: Black-on-White is standard, but this is more popular */
1450 unsigned int shape = XC_xterm;
1451
1452#ifdef HAVE_XMU
1453 if (rs[Rs_pointerShape])
1454 {
1455 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1456 if (stmp >= 0)
1457 shape = stmp;
1458 }
1459#endif
1460
1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1461 TermWin_cursor = XCreateFontCursor (dpy, shape);
1465 1462
1466 /* the vt window */ 1463 /* the vt window */
1467 vt = XCreateSimpleWindow (dpy, top, 1464 vt = XCreateSimpleWindow (dpy, top,
1468 window_vt_x, window_vt_y, 1465 window_vt_x, window_vt_y,
1469 vt_width, vt_height, 1466 vt_width, vt_height,
… …
1501 if (rs[Rs_fade]) 1498 if (rs[Rs_fade])
1502 pix_colors = pix_colors_unfocused; 1499 pix_colors = pix_colors_unfocused;
1503#endif 1500#endif
1504 1501
1505 pointer_unblank (); 1502 pointer_unblank ();
1506 scr_recolour (); 1503 scr_recolor ();
1507} 1504}
1508 1505
1509/*----------------------------------------------------------------------*/ 1506/*----------------------------------------------------------------------*/
1510/* 1507/*
1511 * Run the command in a subprocess and return a file descriptor for the 1508 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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