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.347 by sf-exg, Thu Jul 14 05:10:06 2016 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,
… …
561 set_option (Opt_iso14755); 601 set_option (Opt_iso14755);
562 set_option (Opt_iso14755_52); 602 set_option (Opt_iso14755_52);
563 set_option (Opt_buffered); 603 set_option (Opt_buffered);
564} 604}
565 605
606#if ENABLE_PERL
607static void
608rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
609{
610 rxvt_perl.parse_resource (term, k, false, false, 0, v);
611}
612#endif
613
566/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
567const char ** 615const char **
568rxvt_term::init_resources (int argc, const char *const *argv) 616rxvt_term::init_resources (int argc, const char *const *argv)
569{ 617{
570 int i; 618 int i;
… …
608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 656 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
609 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 657 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
610 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 658 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
611 { 659 {
612 rxvt_perl.init (this); 660 rxvt_perl.init (this);
661 enumerate_resources (rxvt_perl_parse_resource);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 662 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 663 }
615#endif 664#endif
616 665
617 // must be called after initialising the perl interpreter as it 666 // must be called after initialising the perl interpreter as it
… …
664 713
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0) 714 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i; 715 multiClickTime = i;
667 else 716 else
668 multiClickTime = 500; 717 multiClickTime = 500;
718
719 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
669 720
670 /* no point having a scrollbar without having any scrollback! */ 721 /* no point having a scrollbar without having any scrollback! */
671 if (!saveLines) 722 if (!saveLines)
672 set_option (Opt_scrollBar, 0); 723 set_option (Opt_scrollBar, 0);
673 724
… …
746 envv->push_back (0); 797 envv->push_back (0);
747 798
748 this->argv = argv; 799 this->argv = argv;
749 this->envv = envv; 800 this->envv = envv;
750 801
802 env = new char *[this->envv->size ()];
803 for (int i = 0; i < this->envv->size (); i++)
804 env[i] = this->envv->at (i);
805
751 init2 (argv->size () - 1, argv->begin ()); 806 init2 (argv->size () - 1, argv->begin ());
752} 807}
753 808
754void 809void
755rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 810rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
773void 828void
774rxvt_term::init2 (int argc, const char *const *argv) 829rxvt_term::init2 (int argc, const char *const *argv)
775{ 830{
776 SET_R (this); 831 SET_R (this);
777 set_locale (""); 832 set_locale ("");
778 set_environ (envv); // a few things in X do not call setlocale :( 833 set_environ (env); // a few things in X do not call setlocale :(
779 834
780 init_vars (); 835 init_vars ();
781 836
782 const char **cmd_argv = init_resources (argc, argv); 837 const char **cmd_argv = init_resources (argc, argv);
783 838
… …
950 1005
951/*----------------------------------------------------------------------*/ 1006/*----------------------------------------------------------------------*/
952void 1007void
953rxvt_term::set_locale (const char *locale) 1008rxvt_term::set_locale (const char *locale)
954{ 1009{
955 set_environ (envv); 1010 set_environ (env);
956 1011
957 free (this->locale); 1012 free (this->locale);
958 this->locale = setlocale (LC_CTYPE, locale); 1013 this->locale = setlocale (LC_CTYPE, locale);
959 1014
960 if (!this->locale) 1015 if (!this->locale)
… …
988} 1043}
989 1044
990void 1045void
991rxvt_term::init_xlocale () 1046rxvt_term::init_xlocale ()
992{ 1047{
993 set_environ (envv); 1048 set_environ (env);
994 1049
995#if USE_XIM 1050#if USE_XIM
996 if (!locale) 1051 if (!locale)
997 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1052 rxvt_warn ("setting locale failed, continuing without locale support.\n");
998 else 1053 else
… …
1050 run_command (argv); 1105 run_command (argv);
1051} 1106}
1052 1107
1053/*----------------------------------------------------------------------*/ 1108/*----------------------------------------------------------------------*/
1054void 1109void
1055rxvt_term::get_colours () 1110rxvt_term::get_colors ()
1056{ 1111{
1057 int i; 1112 int i;
1058 1113
1059#ifdef OFF_FOCUS_FADING 1114#ifdef OFF_FOCUS_FADING
1060 pix_colors = pix_colors_focused; 1115 pix_colors = pix_colors_focused;
1061#endif 1116#endif
1062 1117
1063 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1118 for (i = 0; i < NRS_COLORS; i++)
1064 {
1065 const char *name = rs[Rs_color + i]; 1119 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)) 1120 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 1121
1119 /* 1122 /*
1120 * get scrollBar shadow colors 1123 * get scrollBar shadow colors
1121 * 1124 *
1122 * The calculations of topShadow/bottomShadow values are adapted 1125 * The calculations of topShadow/bottomShadow values are adapted
1123 * from the fvwm window manager. 1126 * from the fvwm window manager.
1124 */ 1127 */
1125#ifdef RXVT_SCROLLBAR 1128#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]); 1129 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1136 1130
1137 rgba cscroll; 1131 rgba cscroll;
1138 pix_colors [Color_scroll].get (cscroll); 1132 pix_colors [Color_scroll].get (cscroll);
1139 1133
1140 /* topShadowColor */ 1134 /* topShadowColor */
1141 if (!pix_colors[Color_topShadow].set (this, 1135 if (!pix_colors[Color_topShadow].set (this,
1142 rgba ( 1136 rgba (
1143 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1137 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), 1138 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), 1139 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1146 cscroll.a) 1140 cscroll.a)
1147 )) 1141 ))
1148 alias_color (Color_topShadow, Color_White); 1142 alias_color (Color_topShadow, Color_White);
1149 }
1150#endif 1143#endif
1151 1144
1152#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
1153 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1146 for (i = 0; i < NRS_COLORS; i++)
1154 update_fade_color (i); 1147 update_fade_color (i, true);
1155#endif 1148#endif
1156} 1149}
1157 1150
1158/*----------------------------------------------------------------------*/ 1151/*----------------------------------------------------------------------*/
1159/* color aliases, fg/bg bright-bold */ 1152/* color aliases, fg/bg bright-bold */
… …
1208 for (j = map->max_keypermod; j--; k++) 1201 for (j = map->max_keypermod; j--; k++)
1209 { 1202 {
1210 if (kc[k] == 0) 1203 if (kc[k] == 0)
1211 break; 1204 break;
1212 1205
1213 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1206 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1214 { 1207 {
1215 case XK_Num_Lock: 1208 case XK_Num_Lock:
1216 ModNumLockMask = modmasks[i - 1]; 1209 ModNumLockMask = modmasks[i - 1];
1217 continue; 1210 continue;
1218 1211
… …
1263} 1256}
1264 1257
1265void 1258void
1266rxvt_term::set_icon (const char *file) 1259rxvt_term::set_icon (const char *file)
1267{ 1260{
1268#if HAVE_PIXBUF 1261#if HAVE_PIXBUF && ENABLE_EWMH
1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1262 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1270 if (!pixbuf) 1263 if (!pixbuf)
1271 { 1264 {
1272 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1265 rxvt_warn ("Loading image icon failed, continuing without.\n");
1273 return; 1266 return;
… …
1338 Window top, parent; 1331 Window top, parent;
1339 1332
1340 dLocal (Display *, dpy); 1333 dLocal (Display *, dpy);
1341 1334
1342 /* grab colors before netscape does */ 1335 /* grab colors before netscape does */
1343 get_colours (); 1336 get_colors ();
1344 1337
1345 if (!set_fonts ()) 1338 if (!set_fonts ())
1346 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1339 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1347 1340
1348 parent = display->root; 1341 parent = display->root;
… …
1459 | ExposureMask | StructureNotifyMask); 1452 | ExposureMask | StructureNotifyMask);
1460 1453
1461 termwin_ev.start (display, top); 1454 termwin_ev.start (display, top);
1462 1455
1463 /* vt cursor: Black-on-White is standard, but this is more popular */ 1456 /* vt cursor: Black-on-White is standard, but this is more popular */
1457 unsigned int shape = XC_xterm;
1458
1459#ifdef HAVE_XMU
1460 if (rs[Rs_pointerShape])
1461 {
1462 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1463 if (stmp >= 0)
1464 shape = stmp;
1465 }
1466#endif
1467
1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, shape);
1465 1469
1466 /* the vt window */ 1470 /* the vt window */
1467 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1468 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1469 vt_width, vt_height, 1473 vt_width, vt_height,
… …
1501 if (rs[Rs_fade]) 1505 if (rs[Rs_fade])
1502 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1503#endif 1507#endif
1504 1508
1505 pointer_unblank (); 1509 pointer_unblank ();
1506 scr_recolour (); 1510 scr_recolor ();
1507} 1511}
1508 1512
1509/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1510/* 1514/*
1511 * Run the command in a subprocess and return a file descriptor for the 1515 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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