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.340 by root, Sat Dec 13 12:24:32 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
… …
817#endif 863#endif
818 864
819 if (option (Opt_scrollBar)) 865 if (option (Opt_scrollBar))
820 scrollBar.resize (); /* create and map scrollbar */ 866 scrollBar.resize (); /* create and map scrollbar */
821 867
822#ifdef HAVE_BG_PIXMAP
823 bg_init ();
824#endif
825
826#if ENABLE_PERL 868#if ENABLE_PERL
827 rootwin_ev.start (display, display->root); 869 rootwin_ev.start (display, display->root);
828#endif 870#endif
829 871
830 init_done = 1; 872 init_done = 1;
… …
931#ifdef RXVT_TERMINFO 973#ifdef RXVT_TERMINFO
932 putenv ("TERMINFO=" RXVT_TERMINFO); 974 putenv ("TERMINFO=" RXVT_TERMINFO);
933#endif 975#endif
934 976
935 if (depth <= 2) 977 if (depth <= 2)
936 putenv ("COLORTERM=" COLORTERMENV "-mono"); 978 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
937 else 979 else
938 putenv ("COLORTERM=" COLORTERMENVFULL); 980 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
939 981
940 if (rs[Rs_term_name] != NULL) 982 if (rs[Rs_term_name] != NULL)
941 { 983 {
942 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 984 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
943 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 985 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
944 putenv (env_term); 986 putenv (env_term);
945 } 987 }
946 else 988 else
947 putenv ("TERM=" TERMENV); 989 putenv ((char *)"TERM=" TERMENV);
948 990
949#ifdef HAVE_UNSETENV 991#ifdef HAVE_UNSETENV
950 /* avoid passing old settings and confusing term size */ 992 /* avoid passing old settings and confusing term size */
951 unsetenv ("LINES"); 993 unsetenv ("LINES");
952 unsetenv ("COLUMNS"); 994 unsetenv ("COLUMNS");
… …
971 setlocale (LC_CTYPE, "C"); 1013 setlocale (LC_CTYPE, "C");
972 } 1014 }
973 else 1015 else
974 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");
975 1017
976 this->locale = "C"; 1018 this->locale = (char *)"C"; /* strdup'ed below */
977 } 1019 }
978 1020
979 1021
980 this->locale = strdup (this->locale); 1022 this->locale = strdup (this->locale);
981 SET_LOCALE (this->locale); 1023 SET_LOCALE (this->locale);
… …
1065#ifdef OFF_FOCUS_FADING 1107#ifdef OFF_FOCUS_FADING
1066 pix_colors = pix_colors_focused; 1108 pix_colors = pix_colors_focused;
1067#endif 1109#endif
1068 1110
1069 for (i = 0; i < NRS_COLORS; i++) 1111 for (i = 0; i < NRS_COLORS; i++)
1070 {
1071 const char *name = rs[Rs_color + i]; 1112 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)) 1113 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 xcol.free (this);
1091
1092 if (!set_color (xcol, name))
1093 {
1094 switch (i)
1095 {
1096 case Color_fg:
1097 case Color_bg:
1098 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1099 name = "";
1100 break;
1101#ifndef NO_CURSORCOLOR
1102 case Color_cursor2:
1103#endif
1104 case Color_pointer_fg:
1105 name = rs[Rs_color + Color_fg];
1106 xcol.set (this, name);
1107 break;
1108 default:
1109 name = rs[Rs_color + Color_bg];
1110 xcol.set (this, name);
1111 break;
1112 }
1113 }
1114 }
1115
1116 pix_colors[i] = xcol;
1117 rs[Rs_color + i] = name;
1118 }
1119 1114
1120 /* 1115 /*
1121 * get scrollBar shadow colors 1116 * get scrollBar shadow colors
1122 * 1117 *
1123 * The calculations of topShadow/bottomShadow values are adapted 1118 * The calculations of topShadow/bottomShadow values are adapted
… …
1254} 1249}
1255 1250
1256void 1251void
1257rxvt_term::set_icon (const char *file) 1252rxvt_term::set_icon (const char *file)
1258{ 1253{
1259#if HAVE_PIXBUF 1254#if HAVE_PIXBUF && ENABLE_EWMH
1260 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1255 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1261 if (!pixbuf) 1256 if (!pixbuf)
1262 { 1257 {
1263 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1258 rxvt_warn ("Loading image icon failed, continuing without.\n");
1264 return; 1259 return;
… …
1450 | ExposureMask | StructureNotifyMask); 1445 | ExposureMask | StructureNotifyMask);
1451 1446
1452 termwin_ev.start (display, top); 1447 termwin_ev.start (display, top);
1453 1448
1454 /* 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
1455 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1461 TermWin_cursor = XCreateFontCursor (dpy, shape);
1456 1462
1457 /* the vt window */ 1463 /* the vt window */
1458 vt = XCreateSimpleWindow (dpy, top, 1464 vt = XCreateSimpleWindow (dpy, top,
1459 window_vt_x, window_vt_y, 1465 window_vt_x, window_vt_y,
1460 vt_width, vt_height, 1466 vt_width, vt_height,

Diff Legend

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