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.332 by root, Thu May 22 18:54:32 2014 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 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,
… …
660 pointerBlankDelay = i; 700 pointerBlankDelay = i;
661 else 701 else
662 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
663#endif 703#endif
664 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;
711
665 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 713 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
668 715
669 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
… …
741 envv->push_back (0); 788 envv->push_back (0);
742 789
743 this->argv = argv; 790 this->argv = argv;
744 this->envv = envv; 791 this->envv = envv;
745 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
746 init2 (argv->size () - 1, argv->begin ()); 797 init2 (argv->size () - 1, argv->begin ());
747} 798}
748 799
749void 800void
750rxvt_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)
… …
768void 819void
769rxvt_term::init2 (int argc, const char *const *argv) 820rxvt_term::init2 (int argc, const char *const *argv)
770{ 821{
771 SET_R (this); 822 SET_R (this);
772 set_locale (""); 823 set_locale ("");
773 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 :(
774 825
775 init_vars (); 826 init_vars ();
776 827
777 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
778 829
… …
945 996
946/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
947void 998void
948rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
949{ 1000{
950 set_environ (envv); 1001 set_environ (env);
951 1002
952 free (this->locale); 1003 free (this->locale);
953 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
954 1005
955 if (!this->locale) 1006 if (!this->locale)
… …
983} 1034}
984 1035
985void 1036void
986rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
987{ 1038{
988 set_environ (envv); 1039 set_environ (env);
989 1040
990#if USE_XIM 1041#if USE_XIM
991 if (!locale) 1042 if (!locale)
992 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
993 else 1044 else
… …
1045 run_command (argv); 1096 run_command (argv);
1046} 1097}
1047 1098
1048/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1049void 1100void
1050rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1051{ 1102{
1052 int i; 1103 int i;
1053 1104
1054#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1055 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1056#endif 1107#endif
1057 1108
1058 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1059 {
1060 const char *name = rs[Rs_color + i]; 1110 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)) 1111 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 1112
1114 /* 1113 /*
1115 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1116 * 1115 *
1117 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1118 * from the fvwm window manager. 1117 * from the fvwm window manager.
1119 */ 1118 */
1120#ifdef RXVT_SCROLLBAR 1119#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]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1131 1121
1132 rgba cscroll; 1122 rgba cscroll;
1133 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1134 1124
1135 /* topShadowColor */ 1125 /* topShadowColor */
1136 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1137 rgba ( 1127 rgba (
1138 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),
1139 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),
1140 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),
1141 cscroll.a) 1131 cscroll.a)
1142 )) 1132 ))
1143 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1144 }
1145#endif 1134#endif
1146 1135
1147#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1148 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1149 update_fade_color (i); 1138 update_fade_color (i, true);
1150#endif 1139#endif
1151} 1140}
1152 1141
1153/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1154/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
… …
1203 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1204 { 1193 {
1205 if (kc[k] == 0) 1194 if (kc[k] == 0)
1206 break; 1195 break;
1207 1196
1208 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1209 { 1198 {
1210 case XK_Num_Lock: 1199 case XK_Num_Lock:
1211 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1212 continue; 1201 continue;
1213 1202
… …
1258} 1247}
1259 1248
1260void 1249void
1261rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1262{ 1251{
1263#if HAVE_PIXBUF 1252#if HAVE_PIXBUF && ENABLE_EWMH
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf) 1254 if (!pixbuf)
1266 { 1255 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return; 1257 return;
… …
1333 Window top, parent; 1322 Window top, parent;
1334 1323
1335 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1336 1325
1337 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1338 get_colours (); 1327 get_colors ();
1339 1328
1340 if (!set_fonts ()) 1329 if (!set_fonts ())
1341 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");
1342 1331
1343 parent = display->root; 1332 parent = display->root;
… …
1396 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1397 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1398 1387
1399 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1400 wmHint.input = True; 1389 wmHint.input = True;
1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1402 wmHint.window_group = top; 1393 wmHint.window_group = top;
1403 1394
1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1405 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH 1397#if ENABLE_EWMH
… …
1452 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1453 1444
1454 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1455 1446
1456 /* 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
1457 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1458 1460
1459 /* the vt window */ 1461 /* the vt window */
1460 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1461 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1462 vt_width, vt_height, 1464 vt_width, vt_height,
… …
1494 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1495 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1496#endif 1498#endif
1497 1499
1498 pointer_unblank (); 1500 pointer_unblank ();
1499 scr_recolour (); 1501 scr_recolor ();
1500} 1502}
1501 1503
1502/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1503/* 1505/*
1504 * 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