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.214 by ayin, Fri Sep 14 17:10:34 2007 UTC vs.
Revision 1.251 by ayin, Tue Feb 19 18:15:26 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) 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-2008 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.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
45 59
46#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 62#include <sys/types.h>
49#include <sys/socket.h> 63#include <sys/socket.h>
… …
141 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 162# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 164# endif
151 /* high-intensity colors */ 165 /* high-intensity colors */
152# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
237 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
238 252
239#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 259 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 266#if ENABLE_FRILLS
253 NULL, // Color_underline 267 NULL, // Color_underline
254#endif 268#endif
255#ifdef OPTION_HC 269#ifdef OPTION_HC
256 NULL, 270 NULL,
257#endif 271#endif
258#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
260 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 275#endif
262#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
263 NULL, 277 NULL,
264#endif 278#endif
265#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 280 "rgb:00/00/00",
267#endif 281#endif
268 }; 282 };
269 283
270bool 284void
271rxvt_term::init_vars () 285rxvt_term::init_vars ()
272{ 286{
273 pix_colors = // 287 pix_colors = pix_colors_focused;
274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275#ifdef OFF_FOCUS_FADING
276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277#endif
278
279 288
280 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
282 want_refresh = 1; 291 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
285 nrow = 24; 294 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
289 saveLines = SAVELINES; 298 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 299
292 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
293 301
294 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1;
296 303
297 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
306 313 set_option (Opt_buffered);
307 return true;
308} 314}
309 315
310void 316static void
311rxvt_term::init_secondary () 317init_secondary ()
312{ 318{
313 int i; 319 int i;
314 320
315 /*
316 * Close all unused file descriptors
317 * We don't want them, we don't need them.
318 */
319 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
320 { 322 {
321 /* TODO: BOO HISS */
322 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
323 } 324 }
324 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
325 { 326 {
326 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
327 close (i); 328 close (i);
328 } 329 }
329 330
330 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
331
332#if 0 // schmorp sayz closing filies is murder
333 for (i = STDERR_FILENO + 1; i < num_fds; i++)
334 {
335#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
336 if (i == 4 || i == 7)
337 continue;
338#endif
339 close (i);
340 }
341#endif
342} 332}
343 333
344/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
345const char ** 335const char **
346rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
… …
353 */ 343 */
354 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
355 if (!strcmp (argv[r_argc], "-e")) 345 if (!strcmp (argv[r_argc], "-e"))
356 break; 346 break;
357 347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
359 363
360 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
361 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
362 366
363 r_argv[i] = NULL; 367 r_argv[i] = NULL;
364
365 if (r_argc == argc)
366 cmd_argv = NULL;
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
376 368
377 rs[Rs_name] = rxvt_basename (argv[0]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
378 370
379 /* 371 /*
380 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
… …
384 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
385 377
386 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
387 379
388 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
390 385
391 // using a local pointer decreases code size a lot 386 // using a local pointer decreases code size a lot
392 xa = display->xa; 387 xa = display->xa;
393 388
394 set (display); 389 set (display);
… …
398 if (rs[Rs_depth]) 393 if (rs[Rs_depth])
399 select_visual (strtol (rs[Rs_depth], 0, 0)); 394 select_visual (strtol (rs[Rs_depth], 0, 0));
400#endif 395#endif
401 396
402#ifdef HAVE_AFTERIMAGE 397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif 401#endif
405 free (r_argv); 402 free (r_argv);
406 403
407 for (int i = NUM_RESOURCES; i--; ) 404 for (int i = NUM_RESOURCES; i--; )
… …
488# else 485# else
489 rs[Rs_delete_key] = "\033[3~"; 486 rs[Rs_delete_key] = "\033[3~";
490# endif 487# endif
491#endif 488#endif
492 489
493#ifdef HAVE_SCROLLBARS 490 scrollBar.setup (this);
494 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
495#endif
496 491
497#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
498 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
499 if (option (Opt_reverseVideo)) 494 if (option (Opt_reverseVideo))
500 { 495 {
… …
520 color_aliases (Color_fg); 515 color_aliases (Color_fg);
521 color_aliases (Color_bg); 516 color_aliases (Color_bg);
522#ifndef NO_CURSORCOLOR 517#ifndef NO_CURSORCOLOR
523 color_aliases (Color_cursor); 518 color_aliases (Color_cursor);
524 color_aliases (Color_cursor2); 519 color_aliases (Color_cursor2);
525#endif /* NO_CURSORCOLOR */ 520#endif /* NO_CURSORCOLOR */
526 color_aliases (Color_pointer_fg); 521 color_aliases (Color_pointer_fg);
527 color_aliases (Color_pointer_bg); 522 color_aliases (Color_pointer_bg);
528 color_aliases (Color_border); 523 color_aliases (Color_border);
529#ifndef NO_BOLD_UNDERLINE_REVERSE 524#ifndef NO_BOLD_UNDERLINE_REVERSE
530 color_aliases (Color_BD); 525 color_aliases (Color_BD);
531 color_aliases (Color_UL); 526 color_aliases (Color_UL);
532 color_aliases (Color_RV); 527 color_aliases (Color_RV);
533#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 528#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
534 529
535 if (!rs[Rs_color + Color_border]) 530 if (!rs[Rs_color + Color_border])
536 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 531 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
537 532
538 return cmd_argv; 533 return cmd_argv;
534}
535
536/*----------------------------------------------------------------------*/
537void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
539{
540 this->envv = envv;
541
542 SET_R (this);
543 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :(
545
546 init_vars ();
547
548 init_secondary ();
549
550 const char **cmd_argv = init_resources (argc, argv);
551
552#ifdef KEYSYM_RESOURCE
553 keyboard->register_done ();
554#endif
555
556 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
558
559 pty = ptytty::create ();
560
561 create_windows (argc, argv);
562
563 init_xlocale ();
564
565 scr_reset (); // initialize screen
566
567#if 0
568 XSynchronize (dpy, True);
569#endif
570
571 if (option (Opt_scrollBar))
572 scrollBar.resize (); /* create and map scrollbar */
573#ifdef HAVE_BG_PIXMAP
574 {
575 bgPixmap.set_target (this);
576 bgPixmap.invalidate ();
577
578#ifdef ENABLE_TRANSPARENCY
579 if (option (Opt_transparent))
580 {
581 bgPixmap.set_transparent ();
582
583#ifdef HAVE_AFTERIMAGE
584 if (rs [Rs_blurradius])
585 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
586#endif
587 if (ISSET_PIXCOLOR (Color_tint))
588 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
589
590 if (rs [Rs_shade])
591 bgPixmap.set_shade (rs [Rs_shade]);
592
593 bgPixmap.set_root_pixmap ();
594 XSelectInput (dpy, display->root, PropertyChangeMask);
595 rootwin_ev.start (display, display->root);
596 }
597#endif
598
599#ifdef BG_IMAGE_FROM_FILE
600 if (rs[Rs_backgroundPixmap])
601 {
602 const char *p = rs[Rs_backgroundPixmap];
603
604 if ((p = strchr (p, ';')) != 0)
605 {
606 p++;
607 bgPixmap.set_geometry (p);
608 }
609 else
610 bgPixmap.set_defaultGeometry ();
611
612 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
613 if (!bgPixmap.window_position_sensitive ())
614 update_background ();
615 }
616#endif
617 }
618#endif
619
620#if ENABLE_PERL
621 rootwin_ev.start (display, display->root);
622#endif
623
624 set_colorfgbg ();
625
626 init_command (cmd_argv);
627
628 free (cmd_argv);
629
630 if (pty->pty >= 0)
631 pty_ev.start (pty->pty, ev::READ);
632
633 HOOK_INVOKE ((this, HOOK_START, DT_END));
634
635#if ENABLE_XEMBED
636 if (rs[Rs_embed])
637 {
638 long info[2] = { 0, XEMBED_MAPPED };
639
640 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
641 32, PropModeReplace, (unsigned char *)&info, 2);
642 }
643#endif
644
645 XMapWindow (dpy, vt);
646 XMapWindow (dpy, parent[0]);
647
648 refresh_check ();
539} 649}
540 650
541/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
542void 652void
543rxvt_term::init_env () 653rxvt_term::init_env ()
… …
558 */ 668 */
559 val = rxvt_network_display (rs[Rs_display_name]); 669 val = rxvt_network_display (rs[Rs_display_name]);
560 rs[Rs_display_name] = (const char *)val; 670 rs[Rs_display_name] = (const char *)val;
561 671
562 if (val == NULL) 672 if (val == NULL)
563#endif /* DISPLAY_IS_IP */ 673#endif /* DISPLAY_IS_IP */
564 val = XDisplayString (dpy); 674 val = XDisplayString (dpy);
565 675
566 if (rs[Rs_display_name] == NULL) 676 if (rs[Rs_display_name] == NULL)
567 rs[Rs_display_name] = val; /* use broken `:0' value */ 677 rs[Rs_display_name] = val; /* use broken `:0' value */
568 678
… …
608#ifdef HAVE_UNSETENV 718#ifdef HAVE_UNSETENV
609 /* avoid passing old settings and confusing term size */ 719 /* avoid passing old settings and confusing term size */
610 unsetenv ("LINES"); 720 unsetenv ("LINES");
611 unsetenv ("COLUMNS"); 721 unsetenv ("COLUMNS");
612 unsetenv ("TERMCAP"); /* terminfo should be okay */ 722 unsetenv ("TERMCAP"); /* terminfo should be okay */
613#endif /* HAVE_UNSETENV */ 723#endif /* HAVE_UNSETENV */
614} 724}
615 725
616/*----------------------------------------------------------------------*/ 726/*----------------------------------------------------------------------*/
617/* 727/*
618 * This is more or less stolen straight from XFree86 xterm. 728 * This is more or less stolen straight from XFree86 xterm.
… …
639 749
640 this->locale = "C"; 750 this->locale = "C";
641 } 751 }
642 752
643 753
644 this->locale = rxvt_strdup (this->locale); 754 this->locale = strdup (this->locale);
645 SET_LOCALE (this->locale); 755 SET_LOCALE (this->locale);
646 mbstate.reset (); 756 mbstate.reset ();
647#endif 757#endif
648 758
649#if HAVE_NL_LANGINFO 759#if HAVE_NL_LANGINFO
… …
722 run_command (argv); 832 run_command (argv);
723} 833}
724 834
725/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
726void 836void
727rxvt_term::Get_Colours () 837rxvt_term::get_colours ()
728{ 838{
729 int i; 839 int i;
730 840
731#ifdef OFF_FOCUS_FADING 841#ifdef OFF_FOCUS_FADING
732 pix_colors = pix_colors_focused; 842 pix_colors = pix_colors_focused;
733#endif 843#endif
734 844
735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
736 { 846 {
737 const char *name = rs[Rs_color + i]; 847 const char *name = rs[Rs_color + i];
738 848
739 if (!name) 849 if (!name)
… …
792 * get scrollBar shadow colors 902 * get scrollBar shadow colors
793 * 903 *
794 * The calculations of topShadow/bottomShadow values are adapted 904 * The calculations of topShadow/bottomShadow values are adapted
795 * from the fvwm window manager. 905 * from the fvwm window manager.
796 */ 906 */
797#ifdef KEEP_SCROLLCOLOR 907#ifdef RXVT_SCROLLBAR
798 if (depth <= 2) 908 if (depth <= 2)
799 { 909 {
800 /* Monochrome */ 910 /* Monochrome */
801 alias_color (Color_scroll, Color_fg); 911 alias_color (Color_scroll, Color_fg);
802 alias_color (Color_topShadow, Color_bg); 912 alias_color (Color_topShadow, Color_bg);
… …
817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 927 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
818 cscroll.a) 928 cscroll.a)
819 )) 929 ))
820 alias_color (Color_topShadow, Color_White); 930 alias_color (Color_topShadow, Color_White);
821 } 931 }
822#endif /* KEEP_SCROLLCOLOR */ 932#endif
823 933
824#ifdef OFF_FOCUS_FADING 934#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 935 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i); 936 update_fade_color (i);
827#endif 937#endif
… …
835 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 945 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
836 { 946 {
837 int i = atoi (rs[Rs_color + idx]); 947 int i = atoi (rs[Rs_color + idx]);
838 948
839 if (i >= 8 && i <= 15) 949 if (i >= 8 && i <= 15)
840 { /* bright colors */ 950 /* bright colors */
841 i -= 8;
842 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 951 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
843 return; 952 else if (i >= 0 && i <= 7)
844 } 953 /* normal colors */
845
846 if (i >= 0 && i <= 7) /* normal colors */
847 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 954 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
848 } 955 }
849} 956}
850 957
851/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
… …
952 Window top, parent; 1059 Window top, parent;
953 1060
954 dLocal (Display *, dpy); 1061 dLocal (Display *, dpy);
955 1062
956 /* grab colors before netscape does */ 1063 /* grab colors before netscape does */
957 Get_Colours (); 1064 get_colours ();
958 1065
959 if (!set_fonts ()) 1066 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1067 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961 1068
962 parent = display->root; 1069 parent = display->root;
… …
1067 termwin_ev.start (display, top); 1174 termwin_ev.start (display, top);
1068 1175
1069 /* vt cursor: Black-on-White is standard, but this is more popular */ 1176 /* vt cursor: Black-on-White is standard, but this is more popular */
1070 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1177 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1071 1178
1072#ifdef HAVE_SCROLLBARS
1073 /* cursor scrollBar: Black-on-White */
1074 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1075#endif
1076
1077 /* the vt window */ 1179 /* the vt window */
1078 vt = XCreateSimpleWindow (dpy, top, 1180 vt = XCreateSimpleWindow (dpy, top,
1079 window_vt_x, window_vt_y, 1181 window_vt_x, window_vt_y,
1080 width, height, 1182 width, height,
1081 0, 1183 0,
… …
1105 GCForeground | GCBackground | GCGraphicsExposures, 1207 GCForeground | GCBackground | GCGraphicsExposures,
1106 &gcvalue); 1208 &gcvalue);
1107 1209
1108 drawable = new rxvt_drawable (this, vt); 1210 drawable = new rxvt_drawable (this, vt);
1109 1211
1110#ifdef RXVT_SCROLLBAR
1111 gcvalue.foreground = pix_colors[Color_topShadow];
1112 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1114 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1116 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117#endif
1118
1119#ifdef OFF_FOCUS_FADING 1212#ifdef OFF_FOCUS_FADING
1120 // initially we are in unfocused state 1213 // initially we are in unfocused state
1121 if (rs[Rs_fade]) 1214 if (rs[Rs_fade])
1122 pix_colors = pix_colors_unfocused; 1215 pix_colors = pix_colors_unfocused;
1123#endif 1216#endif
… …
1128 1221
1129/* ------------------------------------------------------------------------- * 1222/* ------------------------------------------------------------------------- *
1130 * GET TTY CURRENT STATE * 1223 * GET TTY CURRENT STATE *
1131 * ------------------------------------------------------------------------- */ 1224 * ------------------------------------------------------------------------- */
1132void 1225void
1133rxvt_get_ttymode (ttymode_t *tio, int erase) 1226rxvt_get_ttymode (struct termios *tio, int erase)
1134{ 1227{
1135 /* 1228 /*
1136 * standard System V termios interface 1229 * standard System V termios interface
1137 */ 1230 */
1138 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1231 if (tcgetattr (STDIN_FILENO, tio) < 0)
1139 { 1232 {
1140 // return error - use system defaults, 1233 // return error - use system defaults,
1141 // where possible, and zero elsewhere 1234 // where possible, and zero elsewhere
1142 memset (tio, 0, sizeof (ttymode_t)); 1235 memset (tio, 0, sizeof (struct termios));
1143 1236
1144 tio->c_cc[VINTR] = CINTR; 1237 tio->c_cc[VINTR] = CINTR;
1145 tio->c_cc[VQUIT] = CQUIT; 1238 tio->c_cc[VQUIT] = CQUIT;
1146 tio->c_cc[VERASE] = CERASE; 1239 tio->c_cc[VERASE] = CERASE;
1147#ifdef VERASE2 1240#ifdef VERASE2
… …
1211 1304
1212 /* 1305 /*
1213 * Debugging 1306 * Debugging
1214 */ 1307 */
1215#ifdef DEBUG_TTYMODE 1308#ifdef DEBUG_TTYMODE
1216#ifdef HAVE_TERMIOS_H
1217 /* c_iflag bits */ 1309 /* c_iflag bits */
1218 fprintf (stderr, "Input flags\n"); 1310 fprintf (stderr, "Input flags\n");
1219 1311
1220 /* cpp token stringize doesn't work on all machines <sigh> */ 1312 /* cpp token stringize doesn't work on all machines <sigh> */
1221# define FOO(flag,name) \ 1313# define FOO(flag,name) \
… …
1284 FOO (VLNEXT, "VLNEXT"); 1376 FOO (VLNEXT, "VLNEXT");
1285# endif 1377# endif
1286 1378
1287 fprintf (stderr, "\n"); 1379 fprintf (stderr, "\n");
1288# undef FOO 1380# undef FOO
1289# endif /* HAVE_TERMIOS_H */ 1381#endif /* DEBUG_TTYMODE */
1290#endif /* DEBUG_TTYMODE */
1291} 1382}
1292 1383
1293/*----------------------------------------------------------------------*/ 1384/*----------------------------------------------------------------------*/
1294/* 1385/*
1295 * Run the command in a subprocess and return a file descriptor for the 1386 * Run the command in a subprocess and return a file descriptor for the
… …
1328 else 1419 else
1329#endif 1420#endif
1330 er = -1; 1421 er = -1;
1331 1422
1332 rxvt_get_ttymode (&tio, er); 1423 rxvt_get_ttymode (&tio, er);
1333 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1424 /* init terminal attributes */
1425 cfsetospeed (&tio, BAUDRATE);
1426 cfsetispeed (&tio, BAUDRATE);
1427 tcsetattr (pty->tty, TCSANOW, &tio);
1334 pty->set_utf8_mode (enc_utf8); 1428 pty->set_utf8_mode (enc_utf8);
1335 1429
1336 /* set initial window size */ 1430 /* set initial window size */
1337 tt_winch (); 1431 tt_winch ();
1338 1432
… …
1398rxvt_term::run_child (const char *const *argv) 1492rxvt_term::run_child (const char *const *argv)
1399{ 1493{
1400 char *login; 1494 char *login;
1401 1495
1402 if (option (Opt_console)) 1496 if (option (Opt_console))
1497 {
1403 { /* be virtual console, fail silently */ 1498 /* be virtual console, fail silently */
1404#ifdef TIOCCONS 1499#ifdef TIOCCONS
1405 unsigned int on = 1; 1500 unsigned int on = 1;
1406 1501
1407 ioctl (STDIN_FILENO, TIOCCONS, &on); 1502 ioctl (STDIN_FILENO, TIOCCONS, &on);
1408#elif defined (SRIOCSREDIR) 1503#elif defined (SRIOCSREDIR)
… …
1410 1505
1411 fd = open (CONSOLE, O_WRONLY, 0); 1506 fd = open (CONSOLE, O_WRONLY, 0);
1412 if (fd >= 0) 1507 if (fd >= 0)
1413 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1508 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1414 close (fd); 1509 close (fd);
1415#endif /* SRIOCSREDIR */ 1510#endif /* SRIOCSREDIR */
1416 } 1511 }
1417 1512
1418 /* reset signals and spin off the command interpreter */ 1513 /* reset signals and spin off the command interpreter */
1419 signal (SIGINT, SIG_DFL); 1514 signal (SIGINT, SIG_DFL);
1420 signal (SIGQUIT, SIG_DFL); 1515 signal (SIGQUIT, SIG_DFL);
… …
1427 */ 1522 */
1428#ifdef SIGTSTP 1523#ifdef SIGTSTP
1429 signal (SIGTSTP, SIG_IGN); 1524 signal (SIGTSTP, SIG_IGN);
1430 signal (SIGTTIN, SIG_IGN); 1525 signal (SIGTTIN, SIG_IGN);
1431 signal (SIGTTOU, SIG_IGN); 1526 signal (SIGTTOU, SIG_IGN);
1432#endif /* SIGTSTP */ 1527#endif /* SIGTSTP */
1433
1434 // unblock signals (signals are blocked by iom.C
1435 sigset_t ss;
1436 sigemptyset (&ss);
1437 sigprocmask (SIG_SETMASK, &ss, 0);
1438 1528
1439 /* command interpreter path */ 1529 /* command interpreter path */
1440 if (argv) 1530 if (argv)
1441 { 1531 {
1442# ifdef DEBUG_CMD 1532# ifdef DEBUG_CMD

Diff Legend

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