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.345 by sf-exg, Tue Oct 13 08:10:43 2015 UTC vs.
Revision 1.348 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

… …
150 close (skfd); 150 close (skfd);
151 151
152 return rval; 152 return rval;
153} 153}
154#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
155 180
156static const char *const def_colorName[] = 181static const char *const def_colorName[] =
157 { 182 {
158 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
159 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
… …
256 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
257 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
258 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
259 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
260 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
261#else 292#else
262 // 256 xterm colours 293 // 256 xterm colours
263 "rgb:00/00/00", 294 "rgb:00/00/00",
264 "rgb:00/00/5f", 295 "rgb:00/00/5f",
265 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
498 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
499 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
500 "rgb:da/da/da", 531 "rgb:da/da/da",
501 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
502 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
503#endif 538#endif
504 539
505#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
506 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
507 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
524#endif 559#endif
525 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
526#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
527 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
528#endif 563#endif
529#if BG_IMAGE_FROM_ROOT
530 NULL,
531#endif
532#if OFF_FOCUS_FADING 564#if OFF_FOCUS_FADING
533 "rgb:00/00/00", 565 "rgb:00/00/00",
534#endif 566#endif
535 }; 567 };
536 568
… …
566 set_option (Opt_iso14755); 598 set_option (Opt_iso14755);
567 set_option (Opt_iso14755_52); 599 set_option (Opt_iso14755_52);
568 set_option (Opt_buffered); 600 set_option (Opt_buffered);
569} 601}
570 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
571/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
572const char ** 612const char **
573rxvt_term::init_resources (int argc, const char *const *argv) 613rxvt_term::init_resources (int argc, const char *const *argv)
574{ 614{
575 int i; 615 int i;
… …
613 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
614 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
615 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
616 { 656 {
617 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
618 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
619 } 660 }
620#endif 661#endif
621 662
622 // must be called after initialising the perl interpreter as it 663 // must be called after initialising the perl interpreter as it
… …
822#endif 863#endif
823 864
824 if (option (Opt_scrollBar)) 865 if (option (Opt_scrollBar))
825 scrollBar.resize (); /* create and map scrollbar */ 866 scrollBar.resize (); /* create and map scrollbar */
826 867
827#ifdef HAVE_BG_PIXMAP
828 bg_init ();
829#endif
830
831#if ENABLE_PERL 868#if ENABLE_PERL
832 rootwin_ev.start (display, display->root); 869 rootwin_ev.start (display, display->root);
833#endif 870#endif
834 871
835 init_done = 1; 872 init_done = 1;

Diff Legend

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