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.326 by root, Sun Jun 3 10:42:34 2012 UTC vs.
Revision 1.346 by sf-exg, Tue Jun 21 12:03:56 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
… …
588 xa = display->xa; 628 xa = display->xa;
589 629
590 set (display); 630 set (display);
591 extract_resources (); 631 extract_resources ();
592 632
593#if XFT 633#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 634 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_depth], 0, 0)); 635 select_visual (strtol (rs[Rs_visual], 0, 0));
636 else if (rs[Rs_depth])
637 select_depth (strtol (rs[Rs_depth], 0, 0));
596#endif 638#endif
597 639
598 for (int i = NUM_RESOURCES; i--; ) 640 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 641 if (rs [i] == resval_undef)
600 rs [i] = 0; 642 rs [i] = 0;
… …
657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 699 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
658 pointerBlankDelay = i; 700 pointerBlankDelay = i;
659 else 701 else
660 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
661#endif 703#endif
704
705 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
706 multiClickTime = i;
707 else
708 multiClickTime = 500;
709
710 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
662 711
663 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
664 if (!saveLines) 713 if (!saveLines)
665 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
666 715
… …
739 envv->push_back (0); 788 envv->push_back (0);
740 789
741 this->argv = argv; 790 this->argv = argv;
742 this->envv = envv; 791 this->envv = envv;
743 792
793 env = new char *[this->envv->size ()];
794 for (int i = 0; i < this->envv->size (); i++)
795 env[i] = this->envv->at (i);
796
744 init2 (argv->size () - 1, argv->begin ()); 797 init2 (argv->size () - 1, argv->begin ());
745} 798}
746 799
747void 800void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 801rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
766void 819void
767rxvt_term::init2 (int argc, const char *const *argv) 820rxvt_term::init2 (int argc, const char *const *argv)
768{ 821{
769 SET_R (this); 822 SET_R (this);
770 set_locale (""); 823 set_locale ("");
771 set_environ (envv); // a few things in X do not call setlocale :( 824 set_environ (env); // a few things in X do not call setlocale :(
772 825
773 init_vars (); 826 init_vars ();
774 827
775 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
776 829
… …
803 XSynchronize (dpy, True); 856 XSynchronize (dpy, True);
804#endif 857#endif
805 858
806 if (option (Opt_scrollBar)) 859 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */ 860 scrollBar.resize (); /* create and map scrollbar */
861
808#ifdef HAVE_BG_PIXMAP 862#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init (); 863 bg_init ();
811
812#ifdef 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 864#endif
833 865
834#if ENABLE_PERL 866#if ENABLE_PERL
835 rootwin_ev.start (display, display->root); 867 rootwin_ev.start (display, display->root);
836#endif 868#endif
… …
964 996
965/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
966void 998void
967rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
968{ 1000{
969 set_environ (envv); 1001 set_environ (env);
970 1002
971 free (this->locale); 1003 free (this->locale);
972 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
973 1005
974 if (!this->locale) 1006 if (!this->locale)
… …
1002} 1034}
1003 1035
1004void 1036void
1005rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
1006{ 1038{
1007 set_environ (envv); 1039 set_environ (env);
1008 1040
1009#ifdef USE_XIM 1041#if USE_XIM
1010 if (!locale) 1042 if (!locale)
1011 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1012 else 1044 else
1013 { 1045 {
1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1046 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1064 run_command (argv); 1096 run_command (argv);
1065} 1097}
1066 1098
1067/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1068void 1100void
1069rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1070{ 1102{
1071 int i; 1103 int i;
1072 1104
1073#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1074 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1075#endif 1107#endif
1076 1108
1077 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1078 {
1079 const char *name = rs[Rs_color + i]; 1110 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)) 1111 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 1112
1133 /* 1113 /*
1134 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1135 * 1115 *
1136 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1137 * from the fvwm window manager. 1117 * from the fvwm window manager.
1138 */ 1118 */
1139#ifdef RXVT_SCROLLBAR 1119#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]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1150 1121
1151 rgba cscroll; 1122 rgba cscroll;
1152 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1153 1124
1154 /* topShadowColor */ 1125 /* topShadowColor */
1155 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1156 rgba ( 1127 rgba (
1157 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1128 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), 1129 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), 1130 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1160 cscroll.a) 1131 cscroll.a)
1161 )) 1132 ))
1162 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1163 }
1164#endif 1134#endif
1165 1135
1166#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1167 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1168 update_fade_color (i); 1138 update_fade_color (i, true);
1169#endif 1139#endif
1170} 1140}
1171 1141
1172/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1173/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
… …
1222 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1223 { 1193 {
1224 if (kc[k] == 0) 1194 if (kc[k] == 0)
1225 break; 1195 break;
1226 1196
1227 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1228 { 1198 {
1229 case XK_Num_Lock: 1199 case XK_Num_Lock:
1230 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1231 continue; 1201 continue;
1232 1202
… …
1277} 1247}
1278 1248
1279void 1249void
1280rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1281{ 1251{
1282#ifdef HAVE_PIXBUF 1252#if HAVE_PIXBUF && ENABLE_EWMH
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf) 1254 if (!pixbuf)
1285 { 1255 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return; 1257 return;
… …
1352 Window top, parent; 1322 Window top, parent;
1353 1323
1354 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1355 1325
1356 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1357 get_colours (); 1327 get_colors ();
1358 1328
1359 if (!set_fonts ()) 1329 if (!set_fonts ())
1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1330 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1361 1331
1362 parent = display->root; 1332 parent = display->root;
… …
1415 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1416 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1417 1387
1418 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1419 wmHint.input = True; 1389 wmHint.input = True;
1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1421 wmHint.window_group = top; 1393 wmHint.window_group = top;
1422 1394
1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1424 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH 1397#if ENABLE_EWMH
… …
1427 * set up icon hint 1399 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon 1400 * rs [Rs_iconfile] is path to icon
1429 */ 1401 */
1430 1402
1431 if (rs [Rs_iconfile]) 1403 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]); 1404 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif 1405#endif
1436 1406
1437#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
1438 if (mwmhints.flags) 1408 if (mwmhints.flags)
1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1409 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1473 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1474 1444
1475 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1476 1446
1477 /* vt cursor: Black-on-White is standard, but this is more popular */ 1447 /* vt cursor: Black-on-White is standard, but this is more popular */
1448 unsigned int shape = XC_xterm;
1449
1450#ifdef HAVE_XMU
1451 if (rs[Rs_pointerShape])
1452 {
1453 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1454 if (stmp >= 0)
1455 shape = stmp;
1456 }
1457#endif
1458
1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1479 1460
1480 /* the vt window */ 1461 /* the vt window */
1481 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1482 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1483 vt_width, vt_height, 1464 vt_width, vt_height,
… …
1515 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1516 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1517#endif 1498#endif
1518 1499
1519 pointer_unblank (); 1500 pointer_unblank ();
1520 scr_recolour (); 1501 scr_recolor ();
1521} 1502}
1522 1503
1523/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1524/* 1505/*
1525 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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