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.222 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.231 by ayin, Tue Dec 18 12:04:50 2007 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
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) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
40#include "init.h" 38#include "init.h"
41 39
42#include <limits> 40#include <limits>
43 41
44#include <csignal> 42#include <csignal>
43
44#include <fcntl.h>
45 45
46#ifdef HAVE_XSETLOCALE 46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 47# define X_LOCALE
48# include <X11/Xlocale.h> 48# include <X11/Xlocale.h>
49#else 49#else
… …
278#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 279 "rgb:00/00/00",
280#endif 280#endif
281 }; 281 };
282 282
283bool 283void
284rxvt_term::init_vars () 284rxvt_term::init_vars ()
285{ 285{
286 pix_colors = // 286 pix_colors = //
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif 290#endif
291
292 291
293 MEvent.time = CurrentTime; 292 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 293 MEvent.button = AnyButton;
295 want_refresh = 1; 294 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 295 priv_modes = SavedModes = PrivMode_Default;
… …
298 nrow = 24; 297 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 298 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 299 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 300 lineSpace = LINESPACE;
302 saveLines = SAVELINES; 301 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 302
305 refresh_type = SLOW_REFRESH; 303 refresh_type = SLOW_REFRESH;
306 304
307 oldcursor.row = oldcursor.col = -1; 305 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1; 306 last_bot = last_state = -1;
… …
314 set_option (Opt_secondaryScreen); 312 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 313 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 314 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 315 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52); 316 set_option (Opt_iso14755_52);
319
320 return true;
321} 317}
322 318
323void 319void
324rxvt_term::init_secondary () 320rxvt_term::init_secondary ()
325{ 321{
… …
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 849 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854 { 850 {
855 int i = atoi (rs[Rs_color + idx]); 851 int i = atoi (rs[Rs_color + idx]);
856 852
857 if (i >= 8 && i <= 15) 853 if (i >= 8 && i <= 15)
858 { /* bright colors */ 854 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 855 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 856 else if (i >= 0 && i <= 7)
862 } 857 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 858 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 859 }
867} 860}
868 861
869/*----------------------------------------------------------------------*/ 862/*----------------------------------------------------------------------*/
… …
1229 1222
1230 /* 1223 /*
1231 * Debugging 1224 * Debugging
1232 */ 1225 */
1233#ifdef DEBUG_TTYMODE 1226#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */ 1227 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n"); 1228 fprintf (stderr, "Input flags\n");
1237 1229
1238 /* cpp token stringize doesn't work on all machines <sigh> */ 1230 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \ 1231# define FOO(flag,name) \
… …
1302 FOO (VLNEXT, "VLNEXT"); 1294 FOO (VLNEXT, "VLNEXT");
1303# endif 1295# endif
1304 1296
1305 fprintf (stderr, "\n"); 1297 fprintf (stderr, "\n");
1306# undef FOO 1298# undef FOO
1307# endif /* HAVE_TERMIOS_H */
1308#endif /* DEBUG_TTYMODE */ 1299#endif /* DEBUG_TTYMODE */
1309} 1300}
1310 1301
1311/*----------------------------------------------------------------------*/ 1302/*----------------------------------------------------------------------*/
1312/* 1303/*
… …
1416rxvt_term::run_child (const char *const *argv) 1407rxvt_term::run_child (const char *const *argv)
1417{ 1408{
1418 char *login; 1409 char *login;
1419 1410
1420 if (option (Opt_console)) 1411 if (option (Opt_console))
1412 {
1421 { /* be virtual console, fail silently */ 1413 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1414#ifdef TIOCCONS
1423 unsigned int on = 1; 1415 unsigned int on = 1;
1424 1416
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1417 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1418#elif defined (SRIOCSREDIR)

Diff Legend

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