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.229 by root, Fri Dec 14 02:22:24 2007 UTC vs.
Revision 1.243 by root, Fri Jan 25 16:04:57 2008 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) 2003-2007 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
16 * 16 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
34 34
35#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
36#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
37#include "rxvtutil.h" 37#include "rxvtutil.h"
38#include "init.h" 38#include "init.h"
39#include "keyboard.h"
39 40
40#include <limits> 41#include <limits>
41 42
42#include <csignal> 43#include <csignal>
43 44
… …
281 }; 282 };
282 283
283void 284void
284rxvt_term::init_vars () 285rxvt_term::init_vars ()
285{ 286{
286 pix_colors = // 287 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 288
293 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
295 want_refresh = 1; 291 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
298 nrow = 24; 294 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
302 saveLines = SAVELINES; 298 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 299
305 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
306 301
307 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 303
310 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
… …
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} 313}
320 314
321void 315static void
322rxvt_term::init_secondary () 316init_secondary ()
323{ 317{
324 int i; 318 int i;
325 319
326 /*
327 * Close all unused file descriptors
328 * We don't want them, we don't need them.
329 */
330 if ((i = open ("/dev/null", O_RDONLY)) < 0) 320 if ((i = open ("/dev/null", O_RDONLY)) < 0)
331 { 321 {
332 /* TODO: BOO HISS */
333 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
334 } 323 }
335 else if (i != STDIN_FILENO) 324 else if (i != STDIN_FILENO)
336 { 325 {
337 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
338 close (i); 327 close (i);
339 } 328 }
340 329
341 dup2 (STDERR_FILENO, STDOUT_FILENO); 330 dup2 (STDERR_FILENO, STDOUT_FILENO);
342
343#if 0 // schmorp sayz closing filies is murder
344 for (i = STDERR_FILENO + 1; i < num_fds; i++)
345 {
346#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
347 if (i == 4 || i == 7)
348 continue;
349#endif
350 close (i);
351 }
352#endif
353} 331}
354 332
355/*----------------------------------------------------------------------*/ 333/*----------------------------------------------------------------------*/
356const char ** 334const char **
357rxvt_term::init_resources (int argc, const char *const *argv) 335rxvt_term::init_resources (int argc, const char *const *argv)
… …
414 if (rs[Rs_depth]) 392 if (rs[Rs_depth])
415 select_visual (strtol (rs[Rs_depth], 0, 0)); 393 select_visual (strtol (rs[Rs_depth], 0, 0));
416#endif 394#endif
417 395
418#ifdef HAVE_AFTERIMAGE 396#ifdef HAVE_AFTERIMAGE
397 set_application_name ((char*)rs[Rs_name]);
398 set_output_threshold (OUTPUT_LEVEL_WARNING);
419 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 399 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
420#endif 400#endif
421 free (r_argv); 401 free (r_argv);
422 402
423 for (int i = NUM_RESOURCES; i--; ) 403 for (int i = NUM_RESOURCES; i--; )
… …
554 return cmd_argv; 534 return cmd_argv;
555} 535}
556 536
557/*----------------------------------------------------------------------*/ 537/*----------------------------------------------------------------------*/
558void 538void
539rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
540{
541 this->envv = envv;
542
543 SET_R (this);
544 set_locale ("");
545 set_environ (envv); // few things in X do not call setlocale :(
546
547 init_vars ();
548
549 init_secondary ();
550
551 const char **cmd_argv = init_resources (argc, argv);
552
553#ifdef KEYSYM_RESOURCE
554 keyboard->register_done ();
555#endif
556
557#ifdef HAVE_SCROLLBARS
558 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */
560#endif
561
562 pty = ptytty::create ();
563
564 create_windows (argc, argv);
565
566 init_xlocale ();
567
568 scr_reset (); // initialize screen
569
570#if 0
571 XSynchronize (dpy, True);
572#endif
573
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */
577#endif
578#ifdef HAVE_BG_PIXMAP
579 {
580 bgPixmap.set_target (this);
581 bgPixmap.invalidate ();
582
583#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent))
585 {
586 bgPixmap.set_transparent ();
587
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
591#endif
592 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
594
595 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]);
597
598 bgPixmap.set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root);
601 }
602#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 }
623#endif
624
625#if ENABLE_PERL
626 rootwin_ev.start (display, display->root);
627#endif
628
629 set_colorfgbg ();
630
631 init_command (cmd_argv);
632
633 free (cmd_argv);
634
635 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ);
637
638 HOOK_INVOKE ((this, HOOK_START, DT_END));
639
640#if ENABLE_XEMBED
641 if (rs[Rs_embed])
642 {
643 long info[2] = { 0, XEMBED_MAPPED };
644
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2);
647 }
648#endif
649
650 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]);
652
653 refresh_check ();
654}
655
656/*----------------------------------------------------------------------*/
657void
559rxvt_term::init_env () 658rxvt_term::init_env ()
560{ 659{
561 int i; 660 int i;
562 char *val; 661 char *val;
563 662
… …
1080 termwin_ev.start (display, top); 1179 termwin_ev.start (display, top);
1081 1180
1082 /* vt cursor: Black-on-White is standard, but this is more popular */ 1181 /* vt cursor: Black-on-White is standard, but this is more popular */
1083 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1182 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1084 1183
1085#ifdef HAVE_SCROLLBARS
1086 /* cursor scrollBar: Black-on-White */
1087 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1088#endif
1089
1090 /* the vt window */ 1184 /* the vt window */
1091 vt = XCreateSimpleWindow (dpy, top, 1185 vt = XCreateSimpleWindow (dpy, top,
1092 window_vt_x, window_vt_y, 1186 window_vt_x, window_vt_y,
1093 width, height, 1187 width, height,
1094 0, 1188 0,
… …
1118 GCForeground | GCBackground | GCGraphicsExposures, 1212 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1213 &gcvalue);
1120 1214
1121 drawable = new rxvt_drawable (this, vt); 1215 drawable = new rxvt_drawable (this, vt);
1122 1216
1123#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif
1131
1132#ifdef OFF_FOCUS_FADING 1217#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1218 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1219 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1220 pix_colors = pix_colors_unfocused;
1136#endif 1221#endif
… …
1141 1226
1142/* ------------------------------------------------------------------------- * 1227/* ------------------------------------------------------------------------- *
1143 * GET TTY CURRENT STATE * 1228 * GET TTY CURRENT STATE *
1144 * ------------------------------------------------------------------------- */ 1229 * ------------------------------------------------------------------------- */
1145void 1230void
1146rxvt_get_ttymode (ttymode_t *tio, int erase) 1231rxvt_get_ttymode (struct termios *tio, int erase)
1147{ 1232{
1148 /* 1233 /*
1149 * standard System V termios interface 1234 * standard System V termios interface
1150 */ 1235 */
1151 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1152 { 1237 {
1153 // return error - use system defaults, 1238 // return error - use system defaults,
1154 // where possible, and zero elsewhere 1239 // where possible, and zero elsewhere
1155 memset (tio, 0, sizeof (ttymode_t)); 1240 memset (tio, 0, sizeof (struct termios));
1156 1241
1157 tio->c_cc[VINTR] = CINTR; 1242 tio->c_cc[VINTR] = CINTR;
1158 tio->c_cc[VQUIT] = CQUIT; 1243 tio->c_cc[VQUIT] = CQUIT;
1159 tio->c_cc[VERASE] = CERASE; 1244 tio->c_cc[VERASE] = CERASE;
1160#ifdef VERASE2 1245#ifdef VERASE2
… …
1339 else 1424 else
1340#endif 1425#endif
1341 er = -1; 1426 er = -1;
1342 1427
1343 rxvt_get_ttymode (&tio, er); 1428 rxvt_get_ttymode (&tio, er);
1344 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1429 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio);
1345 pty->set_utf8_mode (enc_utf8); 1433 pty->set_utf8_mode (enc_utf8);
1346 1434
1347 /* set initial window size */ 1435 /* set initial window size */
1348 tt_winch (); 1436 tt_winch ();
1349 1437

Diff Legend

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