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.344 by sf-exg, Tue Jun 16 11:58:26 2015 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.
… …
149 close (skfd); 150 close (skfd);
150 151
151 return rval; 152 return rval;
152} 153}
153#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
154 180
155static const char *const def_colorName[] = 181static const char *const def_colorName[] =
156 { 182 {
157 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
158 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
… …
255 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
256 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
257 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
258 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
259 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
260#else 292#else
261 // 256 xterm colours 293 // 256 xterm colours
262 "rgb:00/00/00", 294 "rgb:00/00/00",
263 "rgb:00/00/5f", 295 "rgb:00/00/5f",
264 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
497 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
498 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
499 "rgb:da/da/da", 531 "rgb:da/da/da",
500 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
501 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
502#endif 538#endif
503 539
504#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
505 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
506 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
565 set_option (Opt_iso14755); 601 set_option (Opt_iso14755);
566 set_option (Opt_iso14755_52); 602 set_option (Opt_iso14755_52);
567 set_option (Opt_buffered); 603 set_option (Opt_buffered);
568} 604}
569 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
570/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
571const char ** 615const char **
572rxvt_term::init_resources (int argc, const char *const *argv) 616rxvt_term::init_resources (int argc, const char *const *argv)
573{ 617{
574 int i; 618 int i;
… …
612 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 656 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
613 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 657 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
614 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 658 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
615 { 659 {
616 rxvt_perl.init (this); 660 rxvt_perl.init (this);
661 enumerate_resources (rxvt_perl_parse_resource);
617 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 662 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
618 } 663 }
619#endif 664#endif
620 665
621 // must be called after initialising the perl interpreter as it 666 // must be called after initialising the perl interpreter as it

Diff Legend

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