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.223 by ayin, Mon Nov 26 10:33:36 2007 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 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 = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 287
293 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
295 want_refresh = 1; 290 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
… …
298 nrow = 24; 293 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
302 saveLines = SAVELINES; 297 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 298
305 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
306 300
307 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1; 302 last_bot = last_state = -1;
… …
314 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
319
320 return true;
321} 313}
322 314
323void 315void
324rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
325{ 317{
… …
416 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 410#endif
419 411
420#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif 416#endif
423 free (r_argv); 417 free (r_argv);
424 418
425 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
… …
1148rxvt_get_ttymode (ttymode_t *tio, int erase) 1142rxvt_get_ttymode (ttymode_t *tio, int erase)
1149{ 1143{
1150 /* 1144 /*
1151 * standard System V termios interface 1145 * standard System V termios interface
1152 */ 1146 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1147 if (tcgetattr (STDIN_FILENO, tio) < 0)
1154 { 1148 {
1155 // return error - use system defaults, 1149 // return error - use system defaults,
1156 // where possible, and zero elsewhere 1150 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t)); 1151 memset (tio, 0, sizeof (ttymode_t));
1158 1152
… …
1226 1220
1227 /* 1221 /*
1228 * Debugging 1222 * Debugging
1229 */ 1223 */
1230#ifdef DEBUG_TTYMODE 1224#ifdef DEBUG_TTYMODE
1231#ifdef HAVE_TERMIOS_H
1232 /* c_iflag bits */ 1225 /* c_iflag bits */
1233 fprintf (stderr, "Input flags\n"); 1226 fprintf (stderr, "Input flags\n");
1234 1227
1235 /* cpp token stringize doesn't work on all machines <sigh> */ 1228 /* cpp token stringize doesn't work on all machines <sigh> */
1236# define FOO(flag,name) \ 1229# define FOO(flag,name) \
… …
1299 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1300# endif 1293# endif
1301 1294
1302 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1303# undef FOO 1296# undef FOO
1304# endif /* HAVE_TERMIOS_H */
1305#endif /* DEBUG_TTYMODE */ 1297#endif /* DEBUG_TTYMODE */
1306} 1298}
1307 1299
1308/*----------------------------------------------------------------------*/ 1300/*----------------------------------------------------------------------*/
1309/* 1301/*
… …
1343 else 1335 else
1344#endif 1336#endif
1345 er = -1; 1337 er = -1;
1346 1338
1347 rxvt_get_ttymode (&tio, er); 1339 rxvt_get_ttymode (&tio, er);
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1340 /* init terminal attributes */
1341 cfsetospeed (&tio, BAUDRATE);
1342 cfsetispeed (&tio, BAUDRATE);
1343 tcsetattr (pty->tty, TCSANOW, &tio);
1349 pty->set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1350 1345
1351 /* set initial window size */ 1346 /* set initial window size */
1352 tt_winch (); 1347 tt_winch ();
1353 1348
… …
1413rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1414{ 1409{
1415 char *login; 1410 char *login;
1416 1411
1417 if (option (Opt_console)) 1412 if (option (Opt_console))
1413 {
1418 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1419#ifdef TIOCCONS 1415#ifdef TIOCCONS
1420 unsigned int on = 1; 1416 unsigned int on = 1;
1421 1417
1422 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1423#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)

Diff Legend

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