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.335 by sf-exg, Thu Aug 21 15:58:29 2014 UTC vs.
Revision 1.346 by sf-exg, Tue Jun 21 12:03:56 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,
… …
748 envv->push_back (0); 788 envv->push_back (0);
749 789
750 this->argv = argv; 790 this->argv = argv;
751 this->envv = envv; 791 this->envv = envv;
752 792
793 env = new char *[this->envv->size ()];
794 for (int i = 0; i < this->envv->size (); i++)
795 env[i] = this->envv->at (i);
796
753 init2 (argv->size () - 1, argv->begin ()); 797 init2 (argv->size () - 1, argv->begin ());
754} 798}
755 799
756void 800void
757rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 801rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
775void 819void
776rxvt_term::init2 (int argc, const char *const *argv) 820rxvt_term::init2 (int argc, const char *const *argv)
777{ 821{
778 SET_R (this); 822 SET_R (this);
779 set_locale (""); 823 set_locale ("");
780 set_environ (envv); // a few things in X do not call setlocale :( 824 set_environ (env); // a few things in X do not call setlocale :(
781 825
782 init_vars (); 826 init_vars ();
783 827
784 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
785 829
… …
952 996
953/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
954void 998void
955rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
956{ 1000{
957 set_environ (envv); 1001 set_environ (env);
958 1002
959 free (this->locale); 1003 free (this->locale);
960 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
961 1005
962 if (!this->locale) 1006 if (!this->locale)
… …
990} 1034}
991 1035
992void 1036void
993rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
994{ 1038{
995 set_environ (envv); 1039 set_environ (env);
996 1040
997#if USE_XIM 1041#if USE_XIM
998 if (!locale) 1042 if (!locale)
999 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1000 else 1044 else
… …
1052 run_command (argv); 1096 run_command (argv);
1053} 1097}
1054 1098
1055/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1056void 1100void
1057rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1058{ 1102{
1059 int i; 1103 int i;
1060 1104
1061#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1062 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1063#endif 1107#endif
1064 1108
1065 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1066 {
1067 const char *name = rs[Rs_color + i]; 1110 if (const char *name = rs[Rs_color + i])
1068
1069 if (!name)
1070 continue;
1071
1072 rxvt_color xcol;
1073
1074 if (!set_color (xcol, name)) 1111 set_color (pix_colors [i], name);
1075 {
1076#ifndef XTERM_REVERSE_VIDEO
1077 if (i < 2 && option (Opt_reverseVideo))
1078 name = def_colorName [1 - i];
1079 else
1080#endif
1081 name = def_colorName [i];
1082
1083 if (!name)
1084 continue;
1085
1086 if (!set_color (xcol, name))
1087 {
1088 switch (i)
1089 {
1090 case Color_fg:
1091 case Color_bg:
1092 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1093 name = "";
1094 break;
1095#ifndef NO_CURSORCOLOR
1096 case Color_cursor2:
1097#endif
1098 case Color_pointer_fg:
1099 name = rs[Rs_color + Color_fg];
1100 xcol.set (this, name);
1101 break;
1102 default:
1103 name = rs[Rs_color + Color_bg];
1104 xcol.set (this, name);
1105 break;
1106 }
1107 }
1108 }
1109
1110 pix_colors[i] = xcol;
1111 rs[Rs_color + i] = name;
1112 }
1113
1114 if (depth <= 2)
1115 {
1116 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1117 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1118 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1119 }
1120 1112
1121 /* 1113 /*
1122 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1123 * 1115 *
1124 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1125 * from the fvwm window manager. 1117 * from the fvwm window manager.
1126 */ 1118 */
1127#ifdef RXVT_SCROLLBAR 1119#ifdef RXVT_SCROLLBAR
1128 if (depth <= 2)
1129 {
1130 /* Monochrome */
1131 alias_color (Color_scroll, Color_fg);
1132 alias_color (Color_topShadow, Color_bg);
1133 alias_color (Color_bottomShadow, Color_bg);
1134 }
1135 else
1136 {
1137 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1138 1121
1139 rgba cscroll; 1122 rgba cscroll;
1140 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1141 1124
1142 /* topShadowColor */ 1125 /* topShadowColor */
1143 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1144 rgba ( 1127 rgba (
1145 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1128 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1146 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1129 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1147 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1130 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1148 cscroll.a) 1131 cscroll.a)
1149 )) 1132 ))
1150 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1151 }
1152#endif 1134#endif
1153 1135
1154#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1155 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1156 update_fade_color (i); 1138 update_fade_color (i, true);
1157#endif 1139#endif
1158} 1140}
1159 1141
1160/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1161/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
… …
1210 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1211 { 1193 {
1212 if (kc[k] == 0) 1194 if (kc[k] == 0)
1213 break; 1195 break;
1214 1196
1215 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1216 { 1198 {
1217 case XK_Num_Lock: 1199 case XK_Num_Lock:
1218 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1219 continue; 1201 continue;
1220 1202
… …
1265} 1247}
1266 1248
1267void 1249void
1268rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1269{ 1251{
1270#if HAVE_PIXBUF 1252#if HAVE_PIXBUF && ENABLE_EWMH
1271 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1272 if (!pixbuf) 1254 if (!pixbuf)
1273 { 1255 {
1274 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1275 return; 1257 return;
… …
1340 Window top, parent; 1322 Window top, parent;
1341 1323
1342 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1343 1325
1344 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1345 get_colours (); 1327 get_colors ();
1346 1328
1347 if (!set_fonts ()) 1329 if (!set_fonts ())
1348 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1330 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1349 1331
1350 parent = display->root; 1332 parent = display->root;
… …
1461 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1462 1444
1463 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1464 1446
1465 /* vt cursor: Black-on-White is standard, but this is more popular */ 1447 /* vt cursor: Black-on-White is standard, but this is more popular */
1448 unsigned int shape = XC_xterm;
1449
1450#ifdef HAVE_XMU
1451 if (rs[Rs_pointerShape])
1452 {
1453 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1454 if (stmp >= 0)
1455 shape = stmp;
1456 }
1457#endif
1458
1466 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1467 1460
1468 /* the vt window */ 1461 /* the vt window */
1469 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1470 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1471 vt_width, vt_height, 1464 vt_width, vt_height,
… …
1503 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1504 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1505#endif 1498#endif
1506 1499
1507 pointer_unblank (); 1500 pointer_unblank ();
1508 scr_recolour (); 1501 scr_recolor ();
1509} 1502}
1510 1503
1511/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1512/* 1505/*
1513 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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