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.339 by sf-exg, Mon Oct 13 17:05:32 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,
… …
1056 run_command (argv); 1096 run_command (argv);
1057} 1097}
1058 1098
1059/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1060void 1100void
1061rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1062{ 1102{
1063 int i; 1103 int i;
1064 1104
1065#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1066 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1067#endif 1107#endif
1068 1108
1069 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1070 {
1071 const char *name = rs[Rs_color + i]; 1110 if (const char *name = rs[Rs_color + i])
1072
1073 if (!name)
1074 continue;
1075
1076 rxvt_color xcol;
1077
1078 if (!set_color (xcol, name)) 1111 set_color (pix_colors [i], name);
1079 {
1080#ifndef XTERM_REVERSE_VIDEO
1081 if (i < 2 && option (Opt_reverseVideo))
1082 name = def_colorName [1 - i];
1083 else
1084#endif
1085 name = def_colorName [i];
1086
1087 if (!name)
1088 continue;
1089
1090 if (!set_color (xcol, name))
1091 {
1092 switch (i)
1093 {
1094 case Color_fg:
1095 case Color_bg:
1096 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1097 name = "";
1098 break;
1099#ifndef NO_CURSORCOLOR
1100 case Color_cursor2:
1101#endif
1102 case Color_pointer_fg:
1103 name = rs[Rs_color + Color_fg];
1104 xcol.set (this, name);
1105 break;
1106 default:
1107 name = rs[Rs_color + Color_bg];
1108 xcol.set (this, name);
1109 break;
1110 }
1111 }
1112 }
1113
1114 pix_colors[i] = xcol;
1115 rs[Rs_color + i] = name;
1116 }
1117
1118 if (depth <= 2)
1119 {
1120 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1121 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1122 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1123 }
1124 1112
1125 /* 1113 /*
1126 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1127 * 1115 *
1128 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1129 * from the fvwm window manager. 1117 * from the fvwm window manager.
1130 */ 1118 */
1131#ifdef RXVT_SCROLLBAR 1119#ifdef RXVT_SCROLLBAR
1132 if (depth <= 2)
1133 {
1134 /* Monochrome */
1135 alias_color (Color_scroll, Color_fg);
1136 alias_color (Color_topShadow, Color_bg);
1137 alias_color (Color_bottomShadow, Color_bg);
1138 }
1139 else
1140 {
1141 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1142 1121
1143 rgba cscroll; 1122 rgba cscroll;
1144 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1145 1124
1146 /* topShadowColor */ 1125 /* topShadowColor */
1147 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1148 rgba ( 1127 rgba (
1149 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),
1150 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),
1151 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),
1152 cscroll.a) 1131 cscroll.a)
1153 )) 1132 ))
1154 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1155 }
1156#endif 1134#endif
1157 1135
1158#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1159 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1160 update_fade_color (i); 1138 update_fade_color (i, true);
1161#endif 1139#endif
1162} 1140}
1163 1141
1164/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1165/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
… …
1269} 1247}
1270 1248
1271void 1249void
1272rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1273{ 1251{
1274#if HAVE_PIXBUF 1252#if HAVE_PIXBUF && ENABLE_EWMH
1275 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1276 if (!pixbuf) 1254 if (!pixbuf)
1277 { 1255 {
1278 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1279 return; 1257 return;
… …
1344 Window top, parent; 1322 Window top, parent;
1345 1323
1346 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1347 1325
1348 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1349 get_colours (); 1327 get_colors ();
1350 1328
1351 if (!set_fonts ()) 1329 if (!set_fonts ())
1352 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");
1353 1331
1354 parent = display->root; 1332 parent = display->root;
… …
1465 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1466 1444
1467 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1468 1446
1469 /* 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
1470 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1471 1460
1472 /* the vt window */ 1461 /* the vt window */
1473 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1474 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1475 vt_width, vt_height, 1464 vt_width, vt_height,
… …
1507 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1508 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1509#endif 1498#endif
1510 1499
1511 pointer_unblank (); 1500 pointer_unblank ();
1512 scr_recolour (); 1501 scr_recolor ();
1513} 1502}
1514 1503
1515/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1516/* 1505/*
1517 * 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