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.337 by sf-exg, Fri Sep 5 19:02:53 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
… …
612 rxvt_perl.init (this); 617 rxvt_perl.init (this);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 618 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 619 }
615#endif 620#endif
616 621
622 // must be called after initialising the perl interpreter as it
623 // may invoke the `on_register_command' hook
617 extract_keysym_resources (); 624 extract_keysym_resources ();
618 625
619 /* 626 /*
620 * set any defaults not already set 627 * set any defaults not already set
621 */ 628 */
… …
746 envv->push_back (0); 753 envv->push_back (0);
747 754
748 this->argv = argv; 755 this->argv = argv;
749 this->envv = envv; 756 this->envv = envv;
750 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
751 init2 (argv->size () - 1, argv->begin ()); 762 init2 (argv->size () - 1, argv->begin ());
752} 763}
753 764
754void 765void
755rxvt_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)
… …
773void 784void
774rxvt_term::init2 (int argc, const char *const *argv) 785rxvt_term::init2 (int argc, const char *const *argv)
775{ 786{
776 SET_R (this); 787 SET_R (this);
777 set_locale (""); 788 set_locale ("");
778 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 :(
779 790
780 init_vars (); 791 init_vars ();
781 792
782 const char **cmd_argv = init_resources (argc, argv); 793 const char **cmd_argv = init_resources (argc, argv);
783 794
… …
950 961
951/*----------------------------------------------------------------------*/ 962/*----------------------------------------------------------------------*/
952void 963void
953rxvt_term::set_locale (const char *locale) 964rxvt_term::set_locale (const char *locale)
954{ 965{
955 set_environ (envv); 966 set_environ (env);
956 967
957 free (this->locale); 968 free (this->locale);
958 this->locale = setlocale (LC_CTYPE, locale); 969 this->locale = setlocale (LC_CTYPE, locale);
959 970
960 if (!this->locale) 971 if (!this->locale)
… …
988} 999}
989 1000
990void 1001void
991rxvt_term::init_xlocale () 1002rxvt_term::init_xlocale ()
992{ 1003{
993 set_environ (envv); 1004 set_environ (env);
994 1005
995#if USE_XIM 1006#if USE_XIM
996 if (!locale) 1007 if (!locale)
997 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1008 rxvt_warn ("setting locale failed, continuing without locale support.\n");
998 else 1009 else
… …
1050 run_command (argv); 1061 run_command (argv);
1051} 1062}
1052 1063
1053/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
1054void 1065void
1055rxvt_term::get_colours () 1066rxvt_term::get_colors ()
1056{ 1067{
1057 int i; 1068 int i;
1058 1069
1059#ifdef OFF_FOCUS_FADING 1070#ifdef OFF_FOCUS_FADING
1060 pix_colors = pix_colors_focused; 1071 pix_colors = pix_colors_focused;
1061#endif 1072#endif
1062 1073
1063 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1074 for (i = 0; i < NRS_COLORS; i++)
1064 {
1065 const char *name = rs[Rs_color + i]; 1075 if (const char *name = rs[Rs_color + i])
1066
1067 if (!name)
1068 continue;
1069
1070 rxvt_color xcol;
1071
1072 if (!set_color (xcol, name)) 1076 set_color (pix_colors [i], name);
1073 {
1074#ifndef XTERM_REVERSE_VIDEO
1075 if (i < 2 && option (Opt_reverseVideo))
1076 name = def_colorName [1 - i];
1077 else
1078#endif
1079 name = def_colorName [i];
1080
1081 if (!name)
1082 continue;
1083
1084 if (!set_color (xcol, name))
1085 {
1086 switch (i)
1087 {
1088 case Color_fg:
1089 case Color_bg:
1090 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1091 name = "";
1092 break;
1093#ifndef NO_CURSORCOLOR
1094 case Color_cursor2:
1095#endif
1096 case Color_pointer_fg:
1097 name = rs[Rs_color + Color_fg];
1098 xcol.set (this, name);
1099 break;
1100 default:
1101 name = rs[Rs_color + Color_bg];
1102 xcol.set (this, name);
1103 break;
1104 }
1105 }
1106 }
1107
1108 pix_colors[i] = xcol;
1109 rs[Rs_color + i] = name;
1110 }
1111
1112 if (depth <= 2)
1113 {
1114 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1115 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1116 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1117 }
1118 1077
1119 /* 1078 /*
1120 * get scrollBar shadow colors 1079 * get scrollBar shadow colors
1121 * 1080 *
1122 * The calculations of topShadow/bottomShadow values are adapted 1081 * The calculations of topShadow/bottomShadow values are adapted
1123 * from the fvwm window manager. 1082 * from the fvwm window manager.
1124 */ 1083 */
1125#ifdef RXVT_SCROLLBAR 1084#ifdef RXVT_SCROLLBAR
1126 if (depth <= 2)
1127 {
1128 /* Monochrome */
1129 alias_color (Color_scroll, Color_fg);
1130 alias_color (Color_topShadow, Color_bg);
1131 alias_color (Color_bottomShadow, Color_bg);
1132 }
1133 else
1134 {
1135 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1085 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1136 1086
1137 rgba cscroll; 1087 rgba cscroll;
1138 pix_colors [Color_scroll].get (cscroll); 1088 pix_colors [Color_scroll].get (cscroll);
1139 1089
1140 /* topShadowColor */ 1090 /* topShadowColor */
1141 if (!pix_colors[Color_topShadow].set (this, 1091 if (!pix_colors[Color_topShadow].set (this,
1142 rgba ( 1092 rgba (
1143 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),
1144 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),
1145 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),
1146 cscroll.a) 1096 cscroll.a)
1147 )) 1097 ))
1148 alias_color (Color_topShadow, Color_White); 1098 alias_color (Color_topShadow, Color_White);
1149 }
1150#endif 1099#endif
1151 1100
1152#ifdef OFF_FOCUS_FADING 1101#ifdef OFF_FOCUS_FADING
1153 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < NRS_COLORS; i++)
1154 update_fade_color (i); 1103 update_fade_color (i, true);
1155#endif 1104#endif
1156} 1105}
1157 1106
1158/*----------------------------------------------------------------------*/ 1107/*----------------------------------------------------------------------*/
1159/* color aliases, fg/bg bright-bold */ 1108/* color aliases, fg/bg bright-bold */
… …
1263} 1212}
1264 1213
1265void 1214void
1266rxvt_term::set_icon (const char *file) 1215rxvt_term::set_icon (const char *file)
1267{ 1216{
1268#if HAVE_PIXBUF 1217#if HAVE_PIXBUF && ENABLE_EWMH
1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1218 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1270 if (!pixbuf) 1219 if (!pixbuf)
1271 { 1220 {
1272 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1221 rxvt_warn ("Loading image icon failed, continuing without.\n");
1273 return; 1222 return;
… …
1338 Window top, parent; 1287 Window top, parent;
1339 1288
1340 dLocal (Display *, dpy); 1289 dLocal (Display *, dpy);
1341 1290
1342 /* grab colors before netscape does */ 1291 /* grab colors before netscape does */
1343 get_colours (); 1292 get_colors ();
1344 1293
1345 if (!set_fonts ()) 1294 if (!set_fonts ())
1346 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");
1347 1296
1348 parent = display->root; 1297 parent = display->root;
… …
1459 | ExposureMask | StructureNotifyMask); 1408 | ExposureMask | StructureNotifyMask);
1460 1409
1461 termwin_ev.start (display, top); 1410 termwin_ev.start (display, top);
1462 1411
1463 /* 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
1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1424 TermWin_cursor = XCreateFontCursor (dpy, shape);
1465 1425
1466 /* the vt window */ 1426 /* the vt window */
1467 vt = XCreateSimpleWindow (dpy, top, 1427 vt = XCreateSimpleWindow (dpy, top,
1468 window_vt_x, window_vt_y, 1428 window_vt_x, window_vt_y,
1469 vt_width, vt_height, 1429 vt_width, vt_height,
… …
1501 if (rs[Rs_fade]) 1461 if (rs[Rs_fade])
1502 pix_colors = pix_colors_unfocused; 1462 pix_colors = pix_colors_unfocused;
1503#endif 1463#endif
1504 1464
1505 pointer_unblank (); 1465 pointer_unblank ();
1506 scr_recolour (); 1466 scr_recolor ();
1507} 1467}
1508 1468
1509/*----------------------------------------------------------------------*/ 1469/*----------------------------------------------------------------------*/
1510/* 1470/*
1511 * 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