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.224 by ayin, Mon Nov 26 11:20:16 2007 UTC vs.
Revision 1.233 by ayin, Fri Dec 21 16:21:06 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{
… …
416 if (rs[Rs_depth]) 412 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 413 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 414#endif
419 415
420#ifdef HAVE_AFTERIMAGE 416#ifdef HAVE_AFTERIMAGE
417 set_application_name ((char*)rs[Rs_name]);
418 set_output_threshold (OUTPUT_LEVEL_WARNING);
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 419 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif 420#endif
423 free (r_argv); 421 free (r_argv);
424 422
425 for (int i = NUM_RESOURCES; i--; ) 423 for (int i = NUM_RESOURCES; i--; )
… …
1148rxvt_get_ttymode (ttymode_t *tio, int erase) 1146rxvt_get_ttymode (ttymode_t *tio, int erase)
1149{ 1147{
1150 /* 1148 /*
1151 * standard System V termios interface 1149 * standard System V termios interface
1152 */ 1150 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1151 if (tcgetattr (STDIN_FILENO, tio) < 0)
1154 { 1152 {
1155 // return error - use system defaults, 1153 // return error - use system defaults,
1156 // where possible, and zero elsewhere 1154 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t)); 1155 memset (tio, 0, sizeof (ttymode_t));
1158 1156
… …
1226 1224
1227 /* 1225 /*
1228 * Debugging 1226 * Debugging
1229 */ 1227 */
1230#ifdef DEBUG_TTYMODE 1228#ifdef DEBUG_TTYMODE
1231#ifdef HAVE_TERMIOS_H
1232 /* c_iflag bits */ 1229 /* c_iflag bits */
1233 fprintf (stderr, "Input flags\n"); 1230 fprintf (stderr, "Input flags\n");
1234 1231
1235 /* cpp token stringize doesn't work on all machines <sigh> */ 1232 /* cpp token stringize doesn't work on all machines <sigh> */
1236# define FOO(flag,name) \ 1233# define FOO(flag,name) \
… …
1299 FOO (VLNEXT, "VLNEXT"); 1296 FOO (VLNEXT, "VLNEXT");
1300# endif 1297# endif
1301 1298
1302 fprintf (stderr, "\n"); 1299 fprintf (stderr, "\n");
1303# undef FOO 1300# undef FOO
1304# endif /* HAVE_TERMIOS_H */
1305#endif /* DEBUG_TTYMODE */ 1301#endif /* DEBUG_TTYMODE */
1306} 1302}
1307 1303
1308/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1309/* 1305/*
… …
1343 else 1339 else
1344#endif 1340#endif
1345 er = -1; 1341 er = -1;
1346 1342
1347 rxvt_get_ttymode (&tio, er); 1343 rxvt_get_ttymode (&tio, er);
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1344 /* init terminal attributes */
1345 cfsetospeed (&tio, BAUDRATE);
1346 cfsetispeed (&tio, BAUDRATE);
1347 tcsetattr (pty->tty, TCSANOW, &tio);
1349 pty->set_utf8_mode (enc_utf8); 1348 pty->set_utf8_mode (enc_utf8);
1350 1349
1351 /* set initial window size */ 1350 /* set initial window size */
1352 tt_winch (); 1351 tt_winch ();
1353 1352

Diff Legend

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