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.342 by root, Mon Dec 15 02:04:02 2014 UTC vs.
Revision 1.351 by root, Fri Dec 23 21:46:46 2022 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
… …
649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
650 696
651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
652 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
653 699
654 if (rs[Rs_letterSpace]) 700 if (const char *v = rs[Rs_letterSpace])
655 letterSpace = atoi (rs[Rs_letterSpace]); 701 letterSpace = atoi (v);
702
703 rewrap_always = rewrap_never = 0;
704 if (const char *v = rs[Rs_rewrapMode])
705 if (!strcmp (v, "never"))
706 rewrap_never = 1;
707 else if (!strcmp (v, "always"))
708 rewrap_always = 1;
709 else if (!strcmp (v, "auto"))
710 /* nop **/;
711 else
712 rxvt_warn ("invalid rewrapMode, must be auto, always or never.\n");
656#endif 713#endif
657 714
658#ifdef POINTER_BLANK 715#ifdef POINTER_BLANK
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 716 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 717 pointerBlankDelay = i;
… …
789 846
790#ifdef KEYSYM_RESOURCE 847#ifdef KEYSYM_RESOURCE
791 keyboard->register_done (); 848 keyboard->register_done ();
792#endif 849#endif
793 850
851 {
852 ev_tstamp interval = 1. / 60.;
853
854#if ENABLE_FRILLS
855 if (rs[Rs_refreshRate])
856 {
857 interval = atof (rs[Rs_refreshRate]);
858 if (interval <= 0.)
859 interval = -interval;
860 else
861 interval = 1. / interval;
862 }
863#endif
864
865 flush_ev.set (interval, interval);
866 }
867
794 if (const char *path = rs[Rs_chdir]) 868 if (const char *path = rs[Rs_chdir])
795 if (*path) // ignored if empty 869 if (*path) // ignored if empty
796 { 870 {
797 if (*path != '/') 871 if (*path != '/')
798 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n"); 872 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
… …
816 XSynchronize (dpy, True); 890 XSynchronize (dpy, True);
817#endif 891#endif
818 892
819 if (option (Opt_scrollBar)) 893 if (option (Opt_scrollBar))
820 scrollBar.resize (); /* create and map scrollbar */ 894 scrollBar.resize (); /* create and map scrollbar */
821
822#ifdef HAVE_BG_PIXMAP
823 bg_init ();
824#endif
825 895
826#if ENABLE_PERL 896#if ENABLE_PERL
827 rootwin_ev.start (display, display->root); 897 rootwin_ev.start (display, display->root);
828#endif 898#endif
829 899
… …
931#ifdef RXVT_TERMINFO 1001#ifdef RXVT_TERMINFO
932 putenv ("TERMINFO=" RXVT_TERMINFO); 1002 putenv ("TERMINFO=" RXVT_TERMINFO);
933#endif 1003#endif
934 1004
935 if (depth <= 2) 1005 if (depth <= 2)
936 putenv ("COLORTERM=" COLORTERMENV "-mono"); 1006 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
937 else 1007 else
938 putenv ("COLORTERM=" COLORTERMENVFULL); 1008 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
939 1009
940 if (rs[Rs_term_name] != NULL) 1010 if (rs[Rs_term_name] != NULL)
941 { 1011 {
942 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 1012 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
943 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 1013 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
944 putenv (env_term); 1014 putenv (env_term);
945 } 1015 }
946 else 1016 else
947 putenv ("TERM=" TERMENV); 1017 putenv ((char *)"TERM=" TERMENV);
948 1018
949#ifdef HAVE_UNSETENV 1019#ifdef HAVE_UNSETENV
950 /* avoid passing old settings and confusing term size */ 1020 /* avoid passing old settings and confusing term size */
951 unsetenv ("LINES"); 1021 unsetenv ("LINES");
952 unsetenv ("COLUMNS"); 1022 unsetenv ("COLUMNS");
… …
971 setlocale (LC_CTYPE, "C"); 1041 setlocale (LC_CTYPE, "C");
972 } 1042 }
973 else 1043 else
974 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 1044 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
975 1045
976 this->locale = "C"; 1046 this->locale = (char *)"C"; /* strdup'ed below */
977 } 1047 }
978 1048
979 1049
980 this->locale = strdup (this->locale); 1050 this->locale = strdup (this->locale);
981 SET_LOCALE (this->locale); 1051 SET_LOCALE (this->locale);
… …
1207} 1277}
1208 1278
1209void 1279void
1210rxvt_term::set_icon (const char *file) 1280rxvt_term::set_icon (const char *file)
1211{ 1281{
1212#if HAVE_PIXBUF 1282#if HAVE_PIXBUF && ENABLE_EWMH
1213 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1214 if (!pixbuf) 1284 if (!pixbuf)
1215 { 1285 {
1216 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1217 return; 1287 return;
… …
1403 | ExposureMask | StructureNotifyMask); 1473 | ExposureMask | StructureNotifyMask);
1404 1474
1405 termwin_ev.start (display, top); 1475 termwin_ev.start (display, top);
1406 1476
1407 /* vt cursor: Black-on-White is standard, but this is more popular */ 1477 /* vt cursor: Black-on-White is standard, but this is more popular */
1478 unsigned int shape = XC_xterm;
1479
1480#ifdef HAVE_XMU
1481 if (rs[Rs_pointerShape])
1482 {
1483 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1484 if (stmp >= 0)
1485 shape = stmp;
1486 }
1487#endif
1488
1408 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1489 TermWin_cursor = XCreateFontCursor (dpy, shape);
1409 1490
1410 /* the vt window */ 1491 /* the vt window */
1411 vt = XCreateSimpleWindow (dpy, top, 1492 vt = XCreateSimpleWindow (dpy, top,
1412 window_vt_x, window_vt_y, 1493 window_vt_x, window_vt_y,
1413 vt_width, vt_height, 1494 vt_width, vt_height,

Diff Legend

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