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.330 by sf-exg, Sat Dec 29 14:23:35 2012 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 2 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.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 705 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 706 pointerBlankDelay = i;
661 else 707 else
662 pointerBlankDelay = 2; 708 pointerBlankDelay = 2;
663#endif 709#endif
710
711 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
712 multiClickTime = i;
713 else
714 multiClickTime = 500;
715
716 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 717
665 /* no point having a scrollbar without having any scrollback! */ 718 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 719 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 720 set_option (Opt_scrollBar, 0);
668 721
… …
741 envv->push_back (0); 794 envv->push_back (0);
742 795
743 this->argv = argv; 796 this->argv = argv;
744 this->envv = envv; 797 this->envv = envv;
745 798
799 env = new char *[this->envv->size ()];
800 for (int i = 0; i < this->envv->size (); i++)
801 env[i] = this->envv->at (i);
802
746 init2 (argv->size () - 1, argv->begin ()); 803 init2 (argv->size () - 1, argv->begin ());
747} 804}
748 805
749void 806void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 807rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 825void
769rxvt_term::init2 (int argc, const char *const *argv) 826rxvt_term::init2 (int argc, const char *const *argv)
770{ 827{
771 SET_R (this); 828 SET_R (this);
772 set_locale (""); 829 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 830 set_environ (env); // a few things in X do not call setlocale :(
774 831
775 init_vars (); 832 init_vars ();
776 833
777 const char **cmd_argv = init_resources (argc, argv); 834 const char **cmd_argv = init_resources (argc, argv);
778 835
… …
805 XSynchronize (dpy, True); 862 XSynchronize (dpy, True);
806#endif 863#endif
807 864
808 if (option (Opt_scrollBar)) 865 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 866 scrollBar.resize (); /* create and map scrollbar */
810
811#ifdef HAVE_BG_PIXMAP
812 bg_init ();
813#endif
814 867
815#if ENABLE_PERL 868#if ENABLE_PERL
816 rootwin_ev.start (display, display->root); 869 rootwin_ev.start (display, display->root);
817#endif 870#endif
818 871
… …
920#ifdef RXVT_TERMINFO 973#ifdef RXVT_TERMINFO
921 putenv ("TERMINFO=" RXVT_TERMINFO); 974 putenv ("TERMINFO=" RXVT_TERMINFO);
922#endif 975#endif
923 976
924 if (depth <= 2) 977 if (depth <= 2)
925 putenv ("COLORTERM=" COLORTERMENV "-mono"); 978 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
926 else 979 else
927 putenv ("COLORTERM=" COLORTERMENVFULL); 980 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
928 981
929 if (rs[Rs_term_name] != NULL) 982 if (rs[Rs_term_name] != NULL)
930 { 983 {
931 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 984 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
932 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 985 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
933 putenv (env_term); 986 putenv (env_term);
934 } 987 }
935 else 988 else
936 putenv ("TERM=" TERMENV); 989 putenv ((char *)"TERM=" TERMENV);
937 990
938#ifdef HAVE_UNSETENV 991#ifdef HAVE_UNSETENV
939 /* avoid passing old settings and confusing term size */ 992 /* avoid passing old settings and confusing term size */
940 unsetenv ("LINES"); 993 unsetenv ("LINES");
941 unsetenv ("COLUMNS"); 994 unsetenv ("COLUMNS");
… …
945 998
946/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
947void 1000void
948rxvt_term::set_locale (const char *locale) 1001rxvt_term::set_locale (const char *locale)
949{ 1002{
950 set_environ (envv); 1003 set_environ (env);
951 1004
952 free (this->locale); 1005 free (this->locale);
953 this->locale = setlocale (LC_CTYPE, locale); 1006 this->locale = setlocale (LC_CTYPE, locale);
954 1007
955 if (!this->locale) 1008 if (!this->locale)
… …
960 setlocale (LC_CTYPE, "C"); 1013 setlocale (LC_CTYPE, "C");
961 } 1014 }
962 else 1015 else
963 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");
964 1017
965 this->locale = "C"; 1018 this->locale = (char *)"C"; /* strdup'ed below */
966 } 1019 }
967 1020
968 1021
969 this->locale = strdup (this->locale); 1022 this->locale = strdup (this->locale);
970 SET_LOCALE (this->locale); 1023 SET_LOCALE (this->locale);
… …
983} 1036}
984 1037
985void 1038void
986rxvt_term::init_xlocale () 1039rxvt_term::init_xlocale ()
987{ 1040{
988 set_environ (envv); 1041 set_environ (env);
989 1042
990#if USE_XIM 1043#if USE_XIM
991 if (!locale) 1044 if (!locale)
992 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1045 rxvt_warn ("setting locale failed, continuing without locale support.\n");
993 else 1046 else
… …
1045 run_command (argv); 1098 run_command (argv);
1046} 1099}
1047 1100
1048/*----------------------------------------------------------------------*/ 1101/*----------------------------------------------------------------------*/
1049void 1102void
1050rxvt_term::get_colours () 1103rxvt_term::get_colors ()
1051{ 1104{
1052 int i; 1105 int i;
1053 1106
1054#ifdef OFF_FOCUS_FADING 1107#ifdef OFF_FOCUS_FADING
1055 pix_colors = pix_colors_focused; 1108 pix_colors = pix_colors_focused;
1056#endif 1109#endif
1057 1110
1058 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1111 for (i = 0; i < NRS_COLORS; i++)
1059 {
1060 const char *name = rs[Rs_color + i]; 1112 if (const char *name = rs[Rs_color + i])
1061
1062 if (!name)
1063 continue;
1064
1065 rxvt_color xcol;
1066
1067 if (!set_color (xcol, name)) 1113 set_color (pix_colors [i], name);
1068 {
1069#ifndef XTERM_REVERSE_VIDEO
1070 if (i < 2 && option (Opt_reverseVideo))
1071 name = def_colorName [1 - i];
1072 else
1073#endif
1074 name = def_colorName [i];
1075
1076 if (!name)
1077 continue;
1078
1079 if (!set_color (xcol, name))
1080 {
1081 switch (i)
1082 {
1083 case Color_fg:
1084 case Color_bg:
1085 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1086 name = "";
1087 break;
1088#ifndef NO_CURSORCOLOR
1089 case Color_cursor2:
1090#endif
1091 case Color_pointer_fg:
1092 name = rs[Rs_color + Color_fg];
1093 xcol.set (this, name);
1094 break;
1095 default:
1096 name = rs[Rs_color + Color_bg];
1097 xcol.set (this, name);
1098 break;
1099 }
1100 }
1101 }
1102
1103 pix_colors[i] = xcol;
1104 rs[Rs_color + i] = name;
1105 }
1106
1107 if (depth <= 2)
1108 {
1109 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1110 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1111 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1112 }
1113 1114
1114 /* 1115 /*
1115 * get scrollBar shadow colors 1116 * get scrollBar shadow colors
1116 * 1117 *
1117 * The calculations of topShadow/bottomShadow values are adapted 1118 * The calculations of topShadow/bottomShadow values are adapted
1118 * from the fvwm window manager. 1119 * from the fvwm window manager.
1119 */ 1120 */
1120#ifdef RXVT_SCROLLBAR 1121#ifdef RXVT_SCROLLBAR
1121 if (depth <= 2)
1122 {
1123 /* Monochrome */
1124 alias_color (Color_scroll, Color_fg);
1125 alias_color (Color_topShadow, Color_bg);
1126 alias_color (Color_bottomShadow, Color_bg);
1127 }
1128 else
1129 {
1130 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1122 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1131 1123
1132 rgba cscroll; 1124 rgba cscroll;
1133 pix_colors [Color_scroll].get (cscroll); 1125 pix_colors [Color_scroll].get (cscroll);
1134 1126
1135 /* topShadowColor */ 1127 /* topShadowColor */
1136 if (!pix_colors[Color_topShadow].set (this, 1128 if (!pix_colors[Color_topShadow].set (this,
1137 rgba ( 1129 rgba (
1138 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1130 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1139 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1131 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1140 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1132 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1141 cscroll.a) 1133 cscroll.a)
1142 )) 1134 ))
1143 alias_color (Color_topShadow, Color_White); 1135 alias_color (Color_topShadow, Color_White);
1144 }
1145#endif 1136#endif
1146 1137
1147#ifdef OFF_FOCUS_FADING 1138#ifdef OFF_FOCUS_FADING
1148 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1139 for (i = 0; i < NRS_COLORS; i++)
1149 update_fade_color (i); 1140 update_fade_color (i, true);
1150#endif 1141#endif
1151} 1142}
1152 1143
1153/*----------------------------------------------------------------------*/ 1144/*----------------------------------------------------------------------*/
1154/* color aliases, fg/bg bright-bold */ 1145/* color aliases, fg/bg bright-bold */
… …
1203 for (j = map->max_keypermod; j--; k++) 1194 for (j = map->max_keypermod; j--; k++)
1204 { 1195 {
1205 if (kc[k] == 0) 1196 if (kc[k] == 0)
1206 break; 1197 break;
1207 1198
1208 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1199 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1209 { 1200 {
1210 case XK_Num_Lock: 1201 case XK_Num_Lock:
1211 ModNumLockMask = modmasks[i - 1]; 1202 ModNumLockMask = modmasks[i - 1];
1212 continue; 1203 continue;
1213 1204
… …
1258} 1249}
1259 1250
1260void 1251void
1261rxvt_term::set_icon (const char *file) 1252rxvt_term::set_icon (const char *file)
1262{ 1253{
1263#if HAVE_PIXBUF 1254#if HAVE_PIXBUF && ENABLE_EWMH
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1255 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf) 1256 if (!pixbuf)
1266 { 1257 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1258 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return; 1259 return;
… …
1333 Window top, parent; 1324 Window top, parent;
1334 1325
1335 dLocal (Display *, dpy); 1326 dLocal (Display *, dpy);
1336 1327
1337 /* grab colors before netscape does */ 1328 /* grab colors before netscape does */
1338 get_colours (); 1329 get_colors ();
1339 1330
1340 if (!set_fonts ()) 1331 if (!set_fonts ())
1341 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1332 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1342 1333
1343 parent = display->root; 1334 parent = display->root;
… …
1396 classHint.res_name = (char *)rs[Rs_name]; 1387 classHint.res_name = (char *)rs[Rs_name];
1397 classHint.res_class = (char *)RESCLASS; 1388 classHint.res_class = (char *)RESCLASS;
1398 1389
1399 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1390 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1400 wmHint.input = True; 1391 wmHint.input = True;
1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1392 wmHint.initial_state = option (Opt_iconic) ? IconicState
1393 : option (Opt_dockapp) ? WithdrawnState
1394 : NormalState;
1402 wmHint.window_group = top; 1395 wmHint.window_group = top;
1403 1396
1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1397 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1405 &szHint, &wmHint, &classHint); 1398 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH 1399#if ENABLE_EWMH
… …
1408 * set up icon hint 1401 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon 1402 * rs [Rs_iconfile] is path to icon
1410 */ 1403 */
1411 1404
1412 if (rs [Rs_iconfile]) 1405 if (rs [Rs_iconfile])
1413 {
1414 set_icon (rs [Rs_iconfile]); 1406 set_icon (rs [Rs_iconfile]);
1415 }
1416#endif 1407#endif
1417 1408
1418#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1419 if (mwmhints.flags) 1410 if (mwmhints.flags)
1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1411 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1454 | ExposureMask | StructureNotifyMask); 1445 | ExposureMask | StructureNotifyMask);
1455 1446
1456 termwin_ev.start (display, top); 1447 termwin_ev.start (display, top);
1457 1448
1458 /* 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
1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1461 TermWin_cursor = XCreateFontCursor (dpy, shape);
1460 1462
1461 /* the vt window */ 1463 /* the vt window */
1462 vt = XCreateSimpleWindow (dpy, top, 1464 vt = XCreateSimpleWindow (dpy, top,
1463 window_vt_x, window_vt_y, 1465 window_vt_x, window_vt_y,
1464 vt_width, vt_height, 1466 vt_width, vt_height,
… …
1496 if (rs[Rs_fade]) 1498 if (rs[Rs_fade])
1497 pix_colors = pix_colors_unfocused; 1499 pix_colors = pix_colors_unfocused;
1498#endif 1500#endif
1499 1501
1500 pointer_unblank (); 1502 pointer_unblank ();
1501 scr_recolour (); 1503 scr_recolor ();
1502} 1504}
1503 1505
1504/*----------------------------------------------------------------------*/ 1506/*----------------------------------------------------------------------*/
1505/* 1507/*
1506 * Run the command in a subprocess and return a file descriptor for the 1508 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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