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.327 by root, Mon Jun 4 15:18:52 2012 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 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 ENABLE_TRANSPARENCY 564#if BG_IMAGE_FROM_ROOT
525 NULL, 565 NULL,
526#endif 566#endif
527#if OFF_FOCUS_FADING 567#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 568 "rgb:00/00/00",
529#endif 569#endif
… …
561 set_option (Opt_iso14755); 601 set_option (Opt_iso14755);
562 set_option (Opt_iso14755_52); 602 set_option (Opt_iso14755_52);
563 set_option (Opt_buffered); 603 set_option (Opt_buffered);
564} 604}
565 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
566/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
567const char ** 615const char **
568rxvt_term::init_resources (int argc, const char *const *argv) 616rxvt_term::init_resources (int argc, const char *const *argv)
569{ 617{
570 int i; 618 int i;
… …
588 xa = display->xa; 636 xa = display->xa;
589 637
590 set (display); 638 set (display);
591 extract_resources (); 639 extract_resources ();
592 640
593#if XFT 641#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 642 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_depth], 0, 0)); 643 select_visual (strtol (rs[Rs_visual], 0, 0));
644 else if (rs[Rs_depth])
645 select_depth (strtol (rs[Rs_depth], 0, 0));
596#endif 646#endif
597 647
598 for (int i = NUM_RESOURCES; i--; ) 648 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 649 if (rs [i] == resval_undef)
600 rs [i] = 0; 650 rs [i] = 0;
… …
606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 656 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
607 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 657 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
608 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 658 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
609 { 659 {
610 rxvt_perl.init (this); 660 rxvt_perl.init (this);
661 enumerate_resources (rxvt_perl_parse_resource);
611 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 662 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
612 } 663 }
613#endif 664#endif
614 665
615 // must be called after initialising the perl interpreter as it 666 // must be called after initialising the perl interpreter as it
… …
657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 708 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
658 pointerBlankDelay = i; 709 pointerBlankDelay = i;
659 else 710 else
660 pointerBlankDelay = 2; 711 pointerBlankDelay = 2;
661#endif 712#endif
713
714 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
715 multiClickTime = i;
716 else
717 multiClickTime = 500;
718
719 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
662 720
663 /* no point having a scrollbar without having any scrollback! */ 721 /* no point having a scrollbar without having any scrollback! */
664 if (!saveLines) 722 if (!saveLines)
665 set_option (Opt_scrollBar, 0); 723 set_option (Opt_scrollBar, 0);
666 724
… …
739 envv->push_back (0); 797 envv->push_back (0);
740 798
741 this->argv = argv; 799 this->argv = argv;
742 this->envv = envv; 800 this->envv = envv;
743 801
802 env = new char *[this->envv->size ()];
803 for (int i = 0; i < this->envv->size (); i++)
804 env[i] = this->envv->at (i);
805
744 init2 (argv->size () - 1, argv->begin ()); 806 init2 (argv->size () - 1, argv->begin ());
745} 807}
746 808
747void 809void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 810rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
766void 828void
767rxvt_term::init2 (int argc, const char *const *argv) 829rxvt_term::init2 (int argc, const char *const *argv)
768{ 830{
769 SET_R (this); 831 SET_R (this);
770 set_locale (""); 832 set_locale ("");
771 set_environ (envv); // a few things in X do not call setlocale :( 833 set_environ (env); // a few things in X do not call setlocale :(
772 834
773 init_vars (); 835 init_vars ();
774 836
775 const char **cmd_argv = init_resources (argc, argv); 837 const char **cmd_argv = init_resources (argc, argv);
776 838
… …
803 XSynchronize (dpy, True); 865 XSynchronize (dpy, True);
804#endif 866#endif
805 867
806 if (option (Opt_scrollBar)) 868 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */ 869 scrollBar.resize (); /* create and map scrollbar */
870
808#ifdef HAVE_BG_PIXMAP 871#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init (); 872 bg_init ();
811
812#if ENABLE_TRANSPARENCY
813 if (option (Opt_transparent))
814 {
815 bg_set_transparent ();
816
817 if (rs [Rs_blurradius])
818 root_effects.set_blur (rs [Rs_blurradius]);
819
820 if (ISSET_PIXCOLOR (Color_tint))
821 root_effects.set_tint (pix_colors_focused [Color_tint]);
822
823 if (rs [Rs_shade])
824 root_effects.set_shade (rs [Rs_shade]);
825
826 bg_set_root_pixmap ();
827 XSelectInput (dpy, display->root, PropertyChangeMask);
828 rootwin_ev.start (display, display->root);
829 }
830#endif
831 }
832#endif 873#endif
833 874
834#if ENABLE_PERL 875#if ENABLE_PERL
835 rootwin_ev.start (display, display->root); 876 rootwin_ev.start (display, display->root);
836#endif 877#endif
… …
964 1005
965/*----------------------------------------------------------------------*/ 1006/*----------------------------------------------------------------------*/
966void 1007void
967rxvt_term::set_locale (const char *locale) 1008rxvt_term::set_locale (const char *locale)
968{ 1009{
969 set_environ (envv); 1010 set_environ (env);
970 1011
971 free (this->locale); 1012 free (this->locale);
972 this->locale = setlocale (LC_CTYPE, locale); 1013 this->locale = setlocale (LC_CTYPE, locale);
973 1014
974 if (!this->locale) 1015 if (!this->locale)
… …
1002} 1043}
1003 1044
1004void 1045void
1005rxvt_term::init_xlocale () 1046rxvt_term::init_xlocale ()
1006{ 1047{
1007 set_environ (envv); 1048 set_environ (env);
1008 1049
1009#if USE_XIM 1050#if USE_XIM
1010 if (!locale) 1051 if (!locale)
1011 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1052 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1012 else 1053 else
… …
1064 run_command (argv); 1105 run_command (argv);
1065} 1106}
1066 1107
1067/*----------------------------------------------------------------------*/ 1108/*----------------------------------------------------------------------*/
1068void 1109void
1069rxvt_term::get_colours () 1110rxvt_term::get_colors ()
1070{ 1111{
1071 int i; 1112 int i;
1072 1113
1073#ifdef OFF_FOCUS_FADING 1114#ifdef OFF_FOCUS_FADING
1074 pix_colors = pix_colors_focused; 1115 pix_colors = pix_colors_focused;
1075#endif 1116#endif
1076 1117
1077 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1118 for (i = 0; i < NRS_COLORS; i++)
1078 {
1079 const char *name = rs[Rs_color + i]; 1119 if (const char *name = rs[Rs_color + i])
1080
1081 if (!name)
1082 continue;
1083
1084 rxvt_color xcol;
1085
1086 if (!set_color (xcol, name)) 1120 set_color (pix_colors [i], name);
1087 {
1088#ifndef XTERM_REVERSE_VIDEO
1089 if (i < 2 && option (Opt_reverseVideo))
1090 name = def_colorName [1 - i];
1091 else
1092#endif
1093 name = def_colorName [i];
1094
1095 if (!name)
1096 continue;
1097
1098 if (!set_color (xcol, name))
1099 {
1100 switch (i)
1101 {
1102 case Color_fg:
1103 case Color_bg:
1104 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1105 name = "";
1106 break;
1107#ifndef NO_CURSORCOLOR
1108 case Color_cursor2:
1109#endif
1110 case Color_pointer_fg:
1111 name = rs[Rs_color + Color_fg];
1112 xcol.set (this, name);
1113 break;
1114 default:
1115 name = rs[Rs_color + Color_bg];
1116 xcol.set (this, name);
1117 break;
1118 }
1119 }
1120 }
1121
1122 pix_colors[i] = xcol;
1123 rs[Rs_color + i] = name;
1124 }
1125
1126 if (depth <= 2)
1127 {
1128 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1129 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1130 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1131 }
1132 1121
1133 /* 1122 /*
1134 * get scrollBar shadow colors 1123 * get scrollBar shadow colors
1135 * 1124 *
1136 * The calculations of topShadow/bottomShadow values are adapted 1125 * The calculations of topShadow/bottomShadow values are adapted
1137 * from the fvwm window manager. 1126 * from the fvwm window manager.
1138 */ 1127 */
1139#ifdef RXVT_SCROLLBAR 1128#ifdef RXVT_SCROLLBAR
1140 if (depth <= 2)
1141 {
1142 /* Monochrome */
1143 alias_color (Color_scroll, Color_fg);
1144 alias_color (Color_topShadow, Color_bg);
1145 alias_color (Color_bottomShadow, Color_bg);
1146 }
1147 else
1148 {
1149 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1129 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1150 1130
1151 rgba cscroll; 1131 rgba cscroll;
1152 pix_colors [Color_scroll].get (cscroll); 1132 pix_colors [Color_scroll].get (cscroll);
1153 1133
1154 /* topShadowColor */ 1134 /* topShadowColor */
1155 if (!pix_colors[Color_topShadow].set (this, 1135 if (!pix_colors[Color_topShadow].set (this,
1156 rgba ( 1136 rgba (
1157 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1158 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1138 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1159 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1139 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1160 cscroll.a) 1140 cscroll.a)
1161 )) 1141 ))
1162 alias_color (Color_topShadow, Color_White); 1142 alias_color (Color_topShadow, Color_White);
1163 }
1164#endif 1143#endif
1165 1144
1166#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
1167 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1146 for (i = 0; i < NRS_COLORS; i++)
1168 update_fade_color (i); 1147 update_fade_color (i, true);
1169#endif 1148#endif
1170} 1149}
1171 1150
1172/*----------------------------------------------------------------------*/ 1151/*----------------------------------------------------------------------*/
1173/* color aliases, fg/bg bright-bold */ 1152/* color aliases, fg/bg bright-bold */
… …
1222 for (j = map->max_keypermod; j--; k++) 1201 for (j = map->max_keypermod; j--; k++)
1223 { 1202 {
1224 if (kc[k] == 0) 1203 if (kc[k] == 0)
1225 break; 1204 break;
1226 1205
1227 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1206 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1228 { 1207 {
1229 case XK_Num_Lock: 1208 case XK_Num_Lock:
1230 ModNumLockMask = modmasks[i - 1]; 1209 ModNumLockMask = modmasks[i - 1];
1231 continue; 1210 continue;
1232 1211
… …
1277} 1256}
1278 1257
1279void 1258void
1280rxvt_term::set_icon (const char *file) 1259rxvt_term::set_icon (const char *file)
1281{ 1260{
1282#if HAVE_PIXBUF 1261#if HAVE_PIXBUF && ENABLE_EWMH
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1262 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf) 1263 if (!pixbuf)
1285 { 1264 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1265 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return; 1266 return;
… …
1352 Window top, parent; 1331 Window top, parent;
1353 1332
1354 dLocal (Display *, dpy); 1333 dLocal (Display *, dpy);
1355 1334
1356 /* grab colors before netscape does */ 1335 /* grab colors before netscape does */
1357 get_colours (); 1336 get_colors ();
1358 1337
1359 if (!set_fonts ()) 1338 if (!set_fonts ())
1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1339 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1361 1340
1362 parent = display->root; 1341 parent = display->root;
… …
1415 classHint.res_name = (char *)rs[Rs_name]; 1394 classHint.res_name = (char *)rs[Rs_name];
1416 classHint.res_class = (char *)RESCLASS; 1395 classHint.res_class = (char *)RESCLASS;
1417 1396
1418 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1397 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1419 wmHint.input = True; 1398 wmHint.input = True;
1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1399 wmHint.initial_state = option (Opt_iconic) ? IconicState
1400 : option (Opt_dockapp) ? WithdrawnState
1401 : NormalState;
1421 wmHint.window_group = top; 1402 wmHint.window_group = top;
1422 1403
1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1424 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH 1406#if ENABLE_EWMH
… …
1427 * set up icon hint 1408 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon 1409 * rs [Rs_iconfile] is path to icon
1429 */ 1410 */
1430 1411
1431 if (rs [Rs_iconfile]) 1412 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]); 1413 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif 1414#endif
1436 1415
1437#if ENABLE_FRILLS 1416#if ENABLE_FRILLS
1438 if (mwmhints.flags) 1417 if (mwmhints.flags)
1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1418 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1473 | ExposureMask | StructureNotifyMask); 1452 | ExposureMask | StructureNotifyMask);
1474 1453
1475 termwin_ev.start (display, top); 1454 termwin_ev.start (display, top);
1476 1455
1477 /* vt cursor: Black-on-White is standard, but this is more popular */ 1456 /* vt cursor: Black-on-White is standard, but this is more popular */
1457 unsigned int shape = XC_xterm;
1458
1459#ifdef HAVE_XMU
1460 if (rs[Rs_pointerShape])
1461 {
1462 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1463 if (stmp >= 0)
1464 shape = stmp;
1465 }
1466#endif
1467
1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, shape);
1479 1469
1480 /* the vt window */ 1470 /* the vt window */
1481 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1482 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1483 vt_width, vt_height, 1473 vt_width, vt_height,
… …
1515 if (rs[Rs_fade]) 1505 if (rs[Rs_fade])
1516 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1517#endif 1507#endif
1518 1508
1519 pointer_unblank (); 1509 pointer_unblank ();
1520 scr_recolour (); 1510 scr_recolor ();
1521} 1511}
1522 1512
1523/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1524/* 1514/*
1525 * Run the command in a subprocess and return a file descriptor for the 1515 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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