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.212 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.239 by ayin, Sat Jan 19 13:00:07 2008 UTC

… …
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * 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
17 * 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
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#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
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
… …
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
147 252
148#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 259 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 266#if ENABLE_FRILLS
162 NULL, // Color_underline 267 NULL, // Color_underline
163#endif 268#endif
164#ifdef OPTION_HC 269#ifdef OPTION_HC
165 NULL, 270 NULL,
166#endif 271#endif
167#ifdef KEEP_SCROLLCOLOR 272#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 273 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif /* KEEP_SCROLLCOLOR */
171#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188 288
189 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
191 want_refresh = 1; 291 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
194 nrow = 24; 294 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
198 saveLines = SAVELINES; 298 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 299
201 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
202 301
203 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
204 last_bot = last_state = -1;
205 303
206 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
214 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
215
216 return true;
217} 313}
218 314
219void 315void
220rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
221{ 317{
… …
228 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
229 { 325 {
230 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
231 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
232 } 328 }
233 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
234 { 330 {
235 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
236 close (i); 332 close (i);
237 } 333 }
238 334
… …
262 */ 358 */
263 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
264 if (!strcmp (argv[r_argc], "-e")) 360 if (!strcmp (argv[r_argc], "-e"))
265 break; 361 break;
266 362
363 if (r_argc == argc)
364 cmd_argv = NULL;
365 else if (!argv[r_argc + 1])
366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
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
267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
268 378
269 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
270 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
271 381
272 r_argv[i] = NULL; 382 r_argv[i] = NULL;
273
274 if (r_argc == argc)
275 cmd_argv = NULL;
276 else
277 {
278 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
279
280 for (i = 0; i < argc - r_argc - 1; i++)
281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
282
283 cmd_argv[i] = NULL;
284 }
285 383
286 rs[Rs_name] = rxvt_basename (argv[0]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
287 385
288 /* 386 /*
289 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
… …
293 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
294 392
295 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
296 394
297 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
298 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 398 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
399 }
299 400
300 // using a local pointer decreases code size a lot 401 // using a local pointer decreases code size a lot
301 xa = display->xa; 402 xa = display->xa;
302 403
303 set (display); 404 set (display);
… …
307 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
308 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
309#endif 410#endif
310 411
311#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
312 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);
313#endif 416#endif
314 free (r_argv); 417 free (r_argv);
315 418
316 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
… …
429 color_aliases (Color_fg); 532 color_aliases (Color_fg);
430 color_aliases (Color_bg); 533 color_aliases (Color_bg);
431#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
432 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
433 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
434#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
435 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
436 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
437 color_aliases (Color_border); 540 color_aliases (Color_border);
438#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
439 color_aliases (Color_BD); 542 color_aliases (Color_BD);
440 color_aliases (Color_UL); 543 color_aliases (Color_UL);
441 color_aliases (Color_RV); 544 color_aliases (Color_RV);
442#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
443 546
444 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
445 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
446 549
447 return cmd_argv; 550 return cmd_argv;
551}
552
553/*----------------------------------------------------------------------*/
554void
555rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
556{
557 this->envv = envv;
558
559 SET_R (this);
560 set_locale ("");
561 set_environ (envv); // few things in X do not call setlocale :(
562
563 init_vars ();
564
565 init_secondary ();
566
567 const char **cmd_argv = init_resources (argc, argv);
568
569#ifdef KEYSYM_RESOURCE
570 keyboard->register_done ();
571#endif
572
573#ifdef HAVE_SCROLLBARS
574 if (option (Opt_scrollBar))
575 scrollBar.setIdle (); /* set existence for size calculations */
576#endif
577
578 pty = ptytty::create ();
579
580 create_windows (argc, argv);
581
582 init_xlocale ();
583
584 scr_reset (); // initialize screen
585
586#if 0
587 XSynchronize (dpy, True);
588#endif
589
590#ifdef HAVE_SCROLLBARS
591 if (option (Opt_scrollBar))
592 resize_scrollbar (); /* create and map scrollbar */
593#endif
594#ifdef HAVE_BG_PIXMAP
595 {
596 bgPixmap.set_target (this);
597 bgPixmap.invalidate ();
598
599#ifdef ENABLE_TRANSPARENCY
600 if (option (Opt_transparent))
601 {
602 bgPixmap.set_transparent ();
603
604#ifdef HAVE_AFTERIMAGE
605 if (rs [Rs_blurradius])
606 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
607#endif
608 if (ISSET_PIXCOLOR (Color_tint))
609 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
610
611 if (rs [Rs_shade])
612 bgPixmap.set_shade (rs [Rs_shade]);
613
614 bgPixmap.set_root_pixmap ();
615 XSelectInput (dpy, display->root, PropertyChangeMask);
616 rootwin_ev.start (display, display->root);
617 }
618#endif
619
620#ifdef BG_IMAGE_FROM_FILE
621 if (rs[Rs_backgroundPixmap])
622 {
623 const char *p = rs[Rs_backgroundPixmap];
624
625 if ((p = strchr (p, ';')) != 0)
626 {
627 p++;
628 bgPixmap.set_geometry (p);
629 }
630 else
631 bgPixmap.set_defaultGeometry ();
632
633 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
634 if (!bgPixmap.window_position_sensitive ())
635 update_background ();
636 }
637#endif
638 }
639#endif
640
641#if ENABLE_PERL
642 rootwin_ev.start (display, display->root);
643#endif
644
645 set_colorfgbg ();
646
647 init_command (cmd_argv);
648
649 free (cmd_argv);
650
651 if (pty->pty >= 0)
652 pty_ev.start (pty->pty, ev::READ);
653
654 HOOK_INVOKE ((this, HOOK_START, DT_END));
655
656#if ENABLE_XEMBED
657 if (rs[Rs_embed])
658 {
659 long info[2] = { 0, XEMBED_MAPPED };
660
661 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
662 32, PropModeReplace, (unsigned char *)&info, 2);
663 }
664#endif
665
666 XMapWindow (dpy, vt);
667 XMapWindow (dpy, parent[0]);
668
669 refresh_check ();
448} 670}
449 671
450/*----------------------------------------------------------------------*/ 672/*----------------------------------------------------------------------*/
451void 673void
452rxvt_term::init_env () 674rxvt_term::init_env ()
… …
467 */ 689 */
468 val = rxvt_network_display (rs[Rs_display_name]); 690 val = rxvt_network_display (rs[Rs_display_name]);
469 rs[Rs_display_name] = (const char *)val; 691 rs[Rs_display_name] = (const char *)val;
470 692
471 if (val == NULL) 693 if (val == NULL)
472#endif /* DISPLAY_IS_IP */ 694#endif /* DISPLAY_IS_IP */
473 val = XDisplayString (dpy); 695 val = XDisplayString (dpy);
474 696
475 if (rs[Rs_display_name] == NULL) 697 if (rs[Rs_display_name] == NULL)
476 rs[Rs_display_name] = val; /* use broken `:0' value */ 698 rs[Rs_display_name] = val; /* use broken `:0' value */
477 699
… …
517#ifdef HAVE_UNSETENV 739#ifdef HAVE_UNSETENV
518 /* avoid passing old settings and confusing term size */ 740 /* avoid passing old settings and confusing term size */
519 unsetenv ("LINES"); 741 unsetenv ("LINES");
520 unsetenv ("COLUMNS"); 742 unsetenv ("COLUMNS");
521 unsetenv ("TERMCAP"); /* terminfo should be okay */ 743 unsetenv ("TERMCAP"); /* terminfo should be okay */
522#endif /* HAVE_UNSETENV */ 744#endif /* HAVE_UNSETENV */
523} 745}
524 746
525/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
526/* 748/*
527 * This is more or less stolen straight from XFree86 xterm. 749 * This is more or less stolen straight from XFree86 xterm.
… …
548 770
549 this->locale = "C"; 771 this->locale = "C";
550 } 772 }
551 773
552 774
553 this->locale = rxvt_strdup (this->locale); 775 this->locale = strdup (this->locale);
554 SET_LOCALE (this->locale); 776 SET_LOCALE (this->locale);
555 mbstate.reset (); 777 mbstate.reset ();
556#endif 778#endif
557 779
558#if HAVE_NL_LANGINFO 780#if HAVE_NL_LANGINFO
… …
638 int i; 860 int i;
639 861
640#ifdef OFF_FOCUS_FADING 862#ifdef OFF_FOCUS_FADING
641 pix_colors = pix_colors_focused; 863 pix_colors = pix_colors_focused;
642#endif 864#endif
643 865
644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 866 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
645 { 867 {
646 const char *name = rs[Rs_color + i]; 868 const char *name = rs[Rs_color + i];
647 869
648 if (!name) 870 if (!name)
… …
726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 948 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
727 cscroll.a) 949 cscroll.a)
728 )) 950 ))
729 alias_color (Color_topShadow, Color_White); 951 alias_color (Color_topShadow, Color_White);
730 } 952 }
731#endif /* KEEP_SCROLLCOLOR */ 953#endif /* KEEP_SCROLLCOLOR */
732 954
733#ifdef OFF_FOCUS_FADING 955#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 956 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
735 update_fade_color (i); 957 update_fade_color (i);
736#endif 958#endif
… …
744 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 966 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
745 { 967 {
746 int i = atoi (rs[Rs_color + idx]); 968 int i = atoi (rs[Rs_color + idx]);
747 969
748 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
749 { /* bright colors */ 971 /* bright colors */
750 i -= 8;
751 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 972 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
752 return; 973 else if (i >= 0 && i <= 7)
753 } 974 /* normal colors */
754
755 if (i >= 0 && i <= 7) /* normal colors */
756 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 975 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
757 } 976 }
758} 977}
759 978
760/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
… …
976 termwin_ev.start (display, top); 1195 termwin_ev.start (display, top);
977 1196
978 /* vt cursor: Black-on-White is standard, but this is more popular */ 1197 /* vt cursor: Black-on-White is standard, but this is more popular */
979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1198 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
980 1199
981#ifdef HAVE_SCROLLBARS
982 /* cursor scrollBar: Black-on-White */
983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
984#endif
985
986 /* the vt window */ 1200 /* the vt window */
987 vt = XCreateSimpleWindow (dpy, top, 1201 vt = XCreateSimpleWindow (dpy, top,
988 window_vt_x, window_vt_y, 1202 window_vt_x, window_vt_y,
989 width, height, 1203 width, height,
990 0, 1204 0,
… …
1014 GCForeground | GCBackground | GCGraphicsExposures, 1228 GCForeground | GCBackground | GCGraphicsExposures,
1015 &gcvalue); 1229 &gcvalue);
1016 1230
1017 drawable = new rxvt_drawable (this, vt); 1231 drawable = new rxvt_drawable (this, vt);
1018 1232
1019#ifdef RXVT_SCROLLBAR
1020 gcvalue.foreground = pix_colors[Color_topShadow];
1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1026#endif
1027
1028#ifdef OFF_FOCUS_FADING 1233#ifdef OFF_FOCUS_FADING
1029 // initially we are in unfocused state 1234 // initially we are in unfocused state
1030 if (rs[Rs_fade]) 1235 if (rs[Rs_fade])
1031 pix_colors = pix_colors_unfocused; 1236 pix_colors = pix_colors_unfocused;
1032#endif 1237#endif
… …
1037 1242
1038/* ------------------------------------------------------------------------- * 1243/* ------------------------------------------------------------------------- *
1039 * GET TTY CURRENT STATE * 1244 * GET TTY CURRENT STATE *
1040 * ------------------------------------------------------------------------- */ 1245 * ------------------------------------------------------------------------- */
1041void 1246void
1042rxvt_get_ttymode (ttymode_t *tio, int erase) 1247rxvt_get_ttymode (struct termios *tio, int erase)
1043{ 1248{
1044 /* 1249 /*
1045 * standard System V termios interface 1250 * standard System V termios interface
1046 */ 1251 */
1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1252 if (tcgetattr (STDIN_FILENO, tio) < 0)
1048 { 1253 {
1049 // return error - use system defaults, 1254 // return error - use system defaults,
1050 // where possible, and zero elsewhere 1255 // where possible, and zero elsewhere
1051 memset (tio, 0, sizeof (ttymode_t)); 1256 memset (tio, 0, sizeof (struct termios));
1052 1257
1053 tio->c_cc[VINTR] = CINTR; 1258 tio->c_cc[VINTR] = CINTR;
1054 tio->c_cc[VQUIT] = CQUIT; 1259 tio->c_cc[VQUIT] = CQUIT;
1055 tio->c_cc[VERASE] = CERASE; 1260 tio->c_cc[VERASE] = CERASE;
1056#ifdef VERASE2 1261#ifdef VERASE2
… …
1120 1325
1121 /* 1326 /*
1122 * Debugging 1327 * Debugging
1123 */ 1328 */
1124#ifdef DEBUG_TTYMODE 1329#ifdef DEBUG_TTYMODE
1125#ifdef HAVE_TERMIOS_H
1126 /* c_iflag bits */ 1330 /* c_iflag bits */
1127 fprintf (stderr, "Input flags\n"); 1331 fprintf (stderr, "Input flags\n");
1128 1332
1129 /* cpp token stringize doesn't work on all machines <sigh> */ 1333 /* cpp token stringize doesn't work on all machines <sigh> */
1130# define FOO(flag,name) \ 1334# define FOO(flag,name) \
… …
1193 FOO (VLNEXT, "VLNEXT"); 1397 FOO (VLNEXT, "VLNEXT");
1194# endif 1398# endif
1195 1399
1196 fprintf (stderr, "\n"); 1400 fprintf (stderr, "\n");
1197# undef FOO 1401# undef FOO
1198# endif /* HAVE_TERMIOS_H */ 1402#endif /* DEBUG_TTYMODE */
1199#endif /* DEBUG_TTYMODE */
1200} 1403}
1201 1404
1202/*----------------------------------------------------------------------*/ 1405/*----------------------------------------------------------------------*/
1203/* 1406/*
1204 * Run the command in a subprocess and return a file descriptor for the 1407 * Run the command in a subprocess and return a file descriptor for the
… …
1237 else 1440 else
1238#endif 1441#endif
1239 er = -1; 1442 er = -1;
1240 1443
1241 rxvt_get_ttymode (&tio, er); 1444 rxvt_get_ttymode (&tio, er);
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1445 /* init terminal attributes */
1446 cfsetospeed (&tio, BAUDRATE);
1447 cfsetispeed (&tio, BAUDRATE);
1448 tcsetattr (pty->tty, TCSANOW, &tio);
1243 pty->set_utf8_mode (enc_utf8); 1449 pty->set_utf8_mode (enc_utf8);
1244 1450
1245 /* set initial window size */ 1451 /* set initial window size */
1246 tt_winch (); 1452 tt_winch ();
1247 1453
… …
1307rxvt_term::run_child (const char *const *argv) 1513rxvt_term::run_child (const char *const *argv)
1308{ 1514{
1309 char *login; 1515 char *login;
1310 1516
1311 if (option (Opt_console)) 1517 if (option (Opt_console))
1518 {
1312 { /* be virtual console, fail silently */ 1519 /* be virtual console, fail silently */
1313#ifdef TIOCCONS 1520#ifdef TIOCCONS
1314 unsigned int on = 1; 1521 unsigned int on = 1;
1315 1522
1316 ioctl (STDIN_FILENO, TIOCCONS, &on); 1523 ioctl (STDIN_FILENO, TIOCCONS, &on);
1317#elif defined (SRIOCSREDIR) 1524#elif defined (SRIOCSREDIR)
… …
1319 1526
1320 fd = open (CONSOLE, O_WRONLY, 0); 1527 fd = open (CONSOLE, O_WRONLY, 0);
1321 if (fd >= 0) 1528 if (fd >= 0)
1322 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1323 close (fd); 1530 close (fd);
1324#endif /* SRIOCSREDIR */ 1531#endif /* SRIOCSREDIR */
1325 } 1532 }
1326 1533
1327 /* reset signals and spin off the command interpreter */ 1534 /* reset signals and spin off the command interpreter */
1328 signal (SIGINT, SIG_DFL); 1535 signal (SIGINT, SIG_DFL);
1329 signal (SIGQUIT, SIG_DFL); 1536 signal (SIGQUIT, SIG_DFL);
… …
1336 */ 1543 */
1337#ifdef SIGTSTP 1544#ifdef SIGTSTP
1338 signal (SIGTSTP, SIG_IGN); 1545 signal (SIGTSTP, SIG_IGN);
1339 signal (SIGTTIN, SIG_IGN); 1546 signal (SIGTTIN, SIG_IGN);
1340 signal (SIGTTOU, SIG_IGN); 1547 signal (SIGTTOU, SIG_IGN);
1341#endif /* SIGTSTP */ 1548#endif /* SIGTSTP */
1342 1549
1343 // unblock signals (signals are blocked by iom.C 1550 // unblock signals (signals are blocked by iom.C
1344 sigset_t ss; 1551 sigset_t ss;
1345 sigemptyset (&ss); 1552 sigemptyset (&ss);
1346 sigprocmask (SIG_SETMASK, &ss, 0); 1553 sigprocmask (SIG_SETMASK, &ss, 0);
1347 1554
1348 /* command interpreter path */ 1555 /* command interpreter path */
1349 if (argv != NULL) 1556 if (argv)
1350 { 1557 {
1351# ifdef DEBUG_CMD 1558# ifdef DEBUG_CMD
1352 int i; 1559 int i;
1353 1560
1354 for (i = 0; argv[i]; i++) 1561 for (i = 0; argv[i]; i++)
… …
1374 login[0] = '-'; 1581 login[0] = '-';
1375 strcpy (&login[1], argv0); 1582 strcpy (&login[1], argv0);
1376 argv0 = login; 1583 argv0 = login;
1377 } 1584 }
1378 1585
1379 execlp (shell, argv0, NULL); 1586 execlp (shell, argv0, (char *)0);
1380 /* no error message: STDERR is closed! */ 1587 /* no error message: STDERR is closed! */
1381 } 1588 }
1382 1589
1383 return -1; 1590 return -1;
1384} 1591}

Diff Legend

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