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.345 by sf-exg, Tue Oct 13 08:10:43 2015 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.
… …
41#include <limits> 42#include <limits>
42 43
43#include <signal.h> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 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
… …
660 pointerBlankDelay = i; 665 pointerBlankDelay = i;
661 else 666 else
662 pointerBlankDelay = 2; 667 pointerBlankDelay = 2;
663#endif 668#endif
664 669
670 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
671 multiClickTime = i;
672 else
673 multiClickTime = 500;
674
675 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
676
665 /* no point having a scrollbar without having any scrollback! */ 677 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 678 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 679 set_option (Opt_scrollBar, 0);
668 680
669 if (!rs[Rs_cutchars]) 681 if (!rs[Rs_cutchars])
… …
741 envv->push_back (0); 753 envv->push_back (0);
742 754
743 this->argv = argv; 755 this->argv = argv;
744 this->envv = envv; 756 this->envv = envv;
745 757
758 env = new char *[this->envv->size ()];
759 for (int i = 0; i < this->envv->size (); i++)
760 env[i] = this->envv->at (i);
761
746 init2 (argv->size () - 1, argv->begin ()); 762 init2 (argv->size () - 1, argv->begin ());
747} 763}
748 764
749void 765void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 766rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 784void
769rxvt_term::init2 (int argc, const char *const *argv) 785rxvt_term::init2 (int argc, const char *const *argv)
770{ 786{
771 SET_R (this); 787 SET_R (this);
772 set_locale (""); 788 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 789 set_environ (env); // a few things in X do not call setlocale :(
774 790
775 init_vars (); 791 init_vars ();
776 792
777 const char **cmd_argv = init_resources (argc, argv); 793 const char **cmd_argv = init_resources (argc, argv);
778 794
… …
945 961
946/*----------------------------------------------------------------------*/ 962/*----------------------------------------------------------------------*/
947void 963void
948rxvt_term::set_locale (const char *locale) 964rxvt_term::set_locale (const char *locale)
949{ 965{
950 set_environ (envv); 966 set_environ (env);
951 967
952 free (this->locale); 968 free (this->locale);
953 this->locale = setlocale (LC_CTYPE, locale); 969 this->locale = setlocale (LC_CTYPE, locale);
954 970
955 if (!this->locale) 971 if (!this->locale)
… …
983} 999}
984 1000
985void 1001void
986rxvt_term::init_xlocale () 1002rxvt_term::init_xlocale ()
987{ 1003{
988 set_environ (envv); 1004 set_environ (env);
989 1005
990#if USE_XIM 1006#if USE_XIM
991 if (!locale) 1007 if (!locale)
992 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1008 rxvt_warn ("setting locale failed, continuing without locale support.\n");
993 else 1009 else
… …
1045 run_command (argv); 1061 run_command (argv);
1046} 1062}
1047 1063
1048/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
1049void 1065void
1050rxvt_term::get_colours () 1066rxvt_term::get_colors ()
1051{ 1067{
1052 int i; 1068 int i;
1053 1069
1054#ifdef OFF_FOCUS_FADING 1070#ifdef OFF_FOCUS_FADING
1055 pix_colors = pix_colors_focused; 1071 pix_colors = pix_colors_focused;
1056#endif 1072#endif
1057 1073
1058 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1074 for (i = 0; i < NRS_COLORS; i++)
1059 {
1060 const char *name = rs[Rs_color + i]; 1075 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)) 1076 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 1077
1114 /* 1078 /*
1115 * get scrollBar shadow colors 1079 * get scrollBar shadow colors
1116 * 1080 *
1117 * The calculations of topShadow/bottomShadow values are adapted 1081 * The calculations of topShadow/bottomShadow values are adapted
1118 * from the fvwm window manager. 1082 * from the fvwm window manager.
1119 */ 1083 */
1120#ifdef RXVT_SCROLLBAR 1084#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]); 1085 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1131 1086
1132 rgba cscroll; 1087 rgba cscroll;
1133 pix_colors [Color_scroll].get (cscroll); 1088 pix_colors [Color_scroll].get (cscroll);
1134 1089
1135 /* topShadowColor */ 1090 /* topShadowColor */
1136 if (!pix_colors[Color_topShadow].set (this, 1091 if (!pix_colors[Color_topShadow].set (this,
1137 rgba ( 1092 rgba (
1138 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1093 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), 1094 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), 1095 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1141 cscroll.a) 1096 cscroll.a)
1142 )) 1097 ))
1143 alias_color (Color_topShadow, Color_White); 1098 alias_color (Color_topShadow, Color_White);
1144 }
1145#endif 1099#endif
1146 1100
1147#ifdef OFF_FOCUS_FADING 1101#ifdef OFF_FOCUS_FADING
1148 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < NRS_COLORS; i++)
1149 update_fade_color (i); 1103 update_fade_color (i, true);
1150#endif 1104#endif
1151} 1105}
1152 1106
1153/*----------------------------------------------------------------------*/ 1107/*----------------------------------------------------------------------*/
1154/* color aliases, fg/bg bright-bold */ 1108/* color aliases, fg/bg bright-bold */
… …
1203 for (j = map->max_keypermod; j--; k++) 1157 for (j = map->max_keypermod; j--; k++)
1204 { 1158 {
1205 if (kc[k] == 0) 1159 if (kc[k] == 0)
1206 break; 1160 break;
1207 1161
1208 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1162 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1209 { 1163 {
1210 case XK_Num_Lock: 1164 case XK_Num_Lock:
1211 ModNumLockMask = modmasks[i - 1]; 1165 ModNumLockMask = modmasks[i - 1];
1212 continue; 1166 continue;
1213 1167
… …
1258} 1212}
1259 1213
1260void 1214void
1261rxvt_term::set_icon (const char *file) 1215rxvt_term::set_icon (const char *file)
1262{ 1216{
1263#if HAVE_PIXBUF 1217#if HAVE_PIXBUF && ENABLE_EWMH
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1218 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf) 1219 if (!pixbuf)
1266 { 1220 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1221 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return; 1222 return;
… …
1333 Window top, parent; 1287 Window top, parent;
1334 1288
1335 dLocal (Display *, dpy); 1289 dLocal (Display *, dpy);
1336 1290
1337 /* grab colors before netscape does */ 1291 /* grab colors before netscape does */
1338 get_colours (); 1292 get_colors ();
1339 1293
1340 if (!set_fonts ()) 1294 if (!set_fonts ())
1341 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1295 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1342 1296
1343 parent = display->root; 1297 parent = display->root;
… …
1396 classHint.res_name = (char *)rs[Rs_name]; 1350 classHint.res_name = (char *)rs[Rs_name];
1397 classHint.res_class = (char *)RESCLASS; 1351 classHint.res_class = (char *)RESCLASS;
1398 1352
1399 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1353 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1400 wmHint.input = True; 1354 wmHint.input = True;
1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1355 wmHint.initial_state = option (Opt_iconic) ? IconicState
1356 : option (Opt_dockapp) ? WithdrawnState
1357 : NormalState;
1402 wmHint.window_group = top; 1358 wmHint.window_group = top;
1403 1359
1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1360 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1405 &szHint, &wmHint, &classHint); 1361 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH 1362#if ENABLE_EWMH
… …
1452 | ExposureMask | StructureNotifyMask); 1408 | ExposureMask | StructureNotifyMask);
1453 1409
1454 termwin_ev.start (display, top); 1410 termwin_ev.start (display, top);
1455 1411
1456 /* vt cursor: Black-on-White is standard, but this is more popular */ 1412 /* vt cursor: Black-on-White is standard, but this is more popular */
1413 unsigned int shape = XC_xterm;
1414
1415#ifdef HAVE_XMU
1416 if (rs[Rs_pointerShape])
1417 {
1418 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1419 if (stmp >= 0)
1420 shape = stmp;
1421 }
1422#endif
1423
1457 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1424 TermWin_cursor = XCreateFontCursor (dpy, shape);
1458 1425
1459 /* the vt window */ 1426 /* the vt window */
1460 vt = XCreateSimpleWindow (dpy, top, 1427 vt = XCreateSimpleWindow (dpy, top,
1461 window_vt_x, window_vt_y, 1428 window_vt_x, window_vt_y,
1462 vt_width, vt_height, 1429 vt_width, vt_height,
… …
1494 if (rs[Rs_fade]) 1461 if (rs[Rs_fade])
1495 pix_colors = pix_colors_unfocused; 1462 pix_colors = pix_colors_unfocused;
1496#endif 1463#endif
1497 1464
1498 pointer_unblank (); 1465 pointer_unblank ();
1499 scr_recolour (); 1466 scr_recolor ();
1500} 1467}
1501 1468
1502/*----------------------------------------------------------------------*/ 1469/*----------------------------------------------------------------------*/
1503/* 1470/*
1504 * Run the command in a subprocess and return a file descriptor for the 1471 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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