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.210 by ayin, Sat Sep 8 21:25:56 2007 UTC vs.
Revision 1.235 by ayin, Sat Dec 29 12:36:56 2007 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.
… …
38 39
39#include <limits> 40#include <limits>
40 41
41#include <csignal> 42#include <csignal>
42 43
44#include <fcntl.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
59#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h>
62#include <sys/socket.h>
63
64/* these next two are probably only on Sun (not Solaris) */
65#ifdef HAVE_SYS_SOCKIO_H
66#include <sys/sockio.h>
67#endif
68#ifdef HAVE_SYS_BYTEORDER_H
69#include <sys/byteorder.h>
70#endif
71
72#include <netinet/in.h>
73#include <arpa/inet.h>
74#include <net/if.h>
75#include <net/if_arp.h>
76
77static char *
78rxvt_network_display (const char *display)
79{
80 char buffer[1024], *rval = NULL;
81 struct ifconf ifc;
82 struct ifreq *ifr;
83 int i, skfd;
84
85 if (display[0] != ':' && strncmp (display, "unix:", 5))
86 return (char *) display; /* nothing to do */
87
88 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
89 ifc.ifc_buf = buffer;
90
91 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
92 {
93 perror ("socket");
94 return NULL;
95 }
96
97 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
98 {
99 perror ("SIOCGIFCONF");
100 close (skfd);
101 return NULL;
102 }
103
104 for (i = 0, ifr = ifc.ifc_req;
105 i < (ifc.ifc_len / sizeof (struct ifreq));
106 i++, ifr++)
107 {
108 struct ifreq ifr2;
109
110 strcpy (ifr2.ifr_name, ifr->ifr_name);
111
112 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
113 {
114 unsigned long addr;
115 struct sockaddr_in *p_addr;
116
117 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
118 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
119
120 /*
121 * not "0.0.0.0" or "127.0.0.1" - so format the address
122 */
123 if (addr && addr != 0x7F000001)
124 {
125 char *colon = strchr (display, ':');
126
127 if (colon == NULL)
128 colon = ":0.0";
129
130 rval = rxvt_malloc (strlen (colon) + 16);
131 sprintf (rval, "%d.%d.%d.%d%s",
132 (int) ((addr >> 030) & 0xFF),
133 (int) ((addr >> 020) & 0xFF),
134 (int) ((addr >> 010) & 0xFF),
135 (int) (addr & 0xFF), colon);
136 break;
137 }
138 }
139 }
140
141 close (skfd);
142
143 return rval;
144}
145#endif
146
43const char *const def_colorName[] = 147const char *const def_colorName[] =
44 { 148 {
45 COLOR_FOREGROUND, 149 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 150 COLOR_BACKGROUND,
47 /* low-intensity colors */ 151 /* low-intensity colors */
… …
50 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 156 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 160 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 161# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 163# endif
60 /* high-intensity colors */ 164 /* high-intensity colors */
61# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
147 251
148#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 258 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 265#if ENABLE_FRILLS
162 NULL, // Color_underline 266 NULL, // Color_underline
163#endif 267#endif
164#ifdef OPTION_HC 268#ifdef OPTION_HC
165 NULL, 269 NULL,
166#endif 270#endif
167#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
171#if ENABLE_TRANSPARENCY 275#if ENABLE_TRANSPARENCY
172 NULL, 276 NULL,
173#endif 277#endif
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 279 "rgb:00/00/00",
176#endif 280#endif
177 }; 281 };
178 282
179bool 283void
180rxvt_term::init_vars () 284rxvt_term::init_vars ()
181{ 285{
182 pix_colors = // 286 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 287
189 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
191 want_refresh = 1; 290 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
… …
194 nrow = 24; 293 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
198 saveLines = SAVELINES; 297 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 298
201 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
202 300
203 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216 last_bot = last_state = -1; 302 last_bot = last_state = -1;
217 303
218 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
… …
222 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
227
228 return true;
229} 313}
230 314
231void 315void
232rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
233{ 317{
… …
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 325 {
242 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 328 }
245 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
246 { 330 {
247 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
248 close (i); 332 close (i);
249 } 333 }
250 334
… …
265/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
266const char ** 350const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 351rxvt_term::init_resources (int argc, const char *const *argv)
268{ 352{
269 int i, r_argc; 353 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 354 const char **cmd_argv, **r_argv;
272 355
273 /* 356 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 357 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 358 */
276 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e")) 360 if (!strcmp (argv[r_argc], "-e"))
278 break; 361 break;
279 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
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281 378
282 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
284 381
285 r_argv[i] = NULL; 382 r_argv[i] = NULL;
286
287 if (r_argc == argc)
288 cmd_argv = NULL;
289 else
290 {
291 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
292
293 for (i = 0; i < argc - r_argc - 1; i++)
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296 cmd_argv[i] = NULL;
297 }
298 383
299 rs[Rs_name] = rxvt_basename (argv[0]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
300 385
301 /* 386 /*
302 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
… …
306 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
307 392
308 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
309 394
310 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
311 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 }
312 400
313 // using a local pointer decreases code size a lot 401 // using a local pointer decreases code size a lot
314 xa = display->xa; 402 xa = display->xa;
315 403
316 set (display); 404 set (display);
… …
320 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif 410#endif
323 411
324#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
325 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);
326#endif 416#endif
327 free (r_argv); 417 free (r_argv);
328 418
329 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
… …
395 rs[Rs_cutchars] = CUTCHARS; 485 rs[Rs_cutchars] = CUTCHARS;
396 486
397#ifndef NO_BACKSPACE_KEY 487#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 488 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 489# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 490 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 491# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 492 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 493# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 key_backspace = val;
408 }
409#endif 494#endif
410 495
411#ifndef NO_DELETE_KEY 496#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 497 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 498# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 499 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 500# else
416 key_delete = "\033[3~"; 501 rs[Rs_delete_key] = "\033[3~";
417# endif 502# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 key_delete = val;
422 }
423#endif 503#endif
424 504
425#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 506 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
427#endif 507#endif
… …
452 color_aliases (Color_fg); 532 color_aliases (Color_fg);
453 color_aliases (Color_bg); 533 color_aliases (Color_bg);
454#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
455 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
456 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
457#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
458 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
459 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
460 color_aliases (Color_border); 540 color_aliases (Color_border);
461#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
462 color_aliases (Color_BD); 542 color_aliases (Color_BD);
463 color_aliases (Color_UL); 543 color_aliases (Color_UL);
464 color_aliases (Color_RV); 544 color_aliases (Color_RV);
465#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
466 546
467 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
468 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
469 549
470 return cmd_argv; 550 return cmd_argv;
… …
490 */ 570 */
491 val = rxvt_network_display (rs[Rs_display_name]); 571 val = rxvt_network_display (rs[Rs_display_name]);
492 rs[Rs_display_name] = (const char *)val; 572 rs[Rs_display_name] = (const char *)val;
493 573
494 if (val == NULL) 574 if (val == NULL)
495#endif /* DISPLAY_IS_IP */ 575#endif /* DISPLAY_IS_IP */
496 val = XDisplayString (dpy); 576 val = XDisplayString (dpy);
497 577
498 if (rs[Rs_display_name] == NULL) 578 if (rs[Rs_display_name] == NULL)
499 rs[Rs_display_name] = val; /* use broken `:0' value */ 579 rs[Rs_display_name] = val; /* use broken `:0' value */
500 580
… …
540#ifdef HAVE_UNSETENV 620#ifdef HAVE_UNSETENV
541 /* avoid passing old settings and confusing term size */ 621 /* avoid passing old settings and confusing term size */
542 unsetenv ("LINES"); 622 unsetenv ("LINES");
543 unsetenv ("COLUMNS"); 623 unsetenv ("COLUMNS");
544 unsetenv ("TERMCAP"); /* terminfo should be okay */ 624 unsetenv ("TERMCAP"); /* terminfo should be okay */
545#endif /* HAVE_UNSETENV */ 625#endif /* HAVE_UNSETENV */
546} 626}
547 627
548/*----------------------------------------------------------------------*/ 628/*----------------------------------------------------------------------*/
549/* 629/*
550 * This is more or less stolen straight from XFree86 xterm. 630 * This is more or less stolen straight from XFree86 xterm.
… …
571 651
572 this->locale = "C"; 652 this->locale = "C";
573 } 653 }
574 654
575 655
576 this->locale = rxvt_strdup (this->locale); 656 this->locale = strdup (this->locale);
577 SET_LOCALE (this->locale); 657 SET_LOCALE (this->locale);
578 mbstate.reset (); 658 mbstate.reset ();
579#endif 659#endif
580 660
581#if HAVE_NL_LANGINFO 661#if HAVE_NL_LANGINFO
… …
638 priv_modes |= PrivMode_Keypress; 718 priv_modes |= PrivMode_Keypress;
639 if (!option (Opt_jumpScroll)) 719 if (!option (Opt_jumpScroll))
640 priv_modes |= PrivMode_smoothScroll; 720 priv_modes |= PrivMode_smoothScroll;
641 721
642#ifndef NO_BACKSPACE_KEY 722#ifndef NO_BACKSPACE_KEY
643 if (strcmp (key_backspace, "DEC") == 0) 723 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
644 priv_modes |= PrivMode_HaveBackSpace; 724 priv_modes |= PrivMode_HaveBackSpace;
645#endif 725#endif
646 726
647 /* add value for scrollBar */ 727 /* add value for scrollBar */
648 if (scrollBar.state) 728 if (scrollBar.state)
… …
661 int i; 741 int i;
662 742
663#ifdef OFF_FOCUS_FADING 743#ifdef OFF_FOCUS_FADING
664 pix_colors = pix_colors_focused; 744 pix_colors = pix_colors_focused;
665#endif 745#endif
666 746
667 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 747 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
668 { 748 {
669 const char *name = rs[Rs_color + i]; 749 const char *name = rs[Rs_color + i];
670 750
671 if (!name) 751 if (!name)
… …
749 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 829 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
750 cscroll.a) 830 cscroll.a)
751 )) 831 ))
752 alias_color (Color_topShadow, Color_White); 832 alias_color (Color_topShadow, Color_White);
753 } 833 }
754#endif /* KEEP_SCROLLCOLOR */ 834#endif /* KEEP_SCROLLCOLOR */
755 835
756#ifdef OFF_FOCUS_FADING 836#ifdef OFF_FOCUS_FADING
757 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 837 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
758 update_fade_color (i); 838 update_fade_color (i);
759#endif 839#endif
… …
767 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 847 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
768 { 848 {
769 int i = atoi (rs[Rs_color + idx]); 849 int i = atoi (rs[Rs_color + idx]);
770 850
771 if (i >= 8 && i <= 15) 851 if (i >= 8 && i <= 15)
772 { /* bright colors */ 852 /* bright colors */
773 i -= 8;
774 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 853 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
775 return; 854 else if (i >= 0 && i <= 7)
776 } 855 /* normal colors */
777
778 if (i >= 0 && i <= 7) /* normal colors */
779 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
780 } 857 }
781} 858}
782 859
783/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
… …
1060 1137
1061/* ------------------------------------------------------------------------- * 1138/* ------------------------------------------------------------------------- *
1062 * GET TTY CURRENT STATE * 1139 * GET TTY CURRENT STATE *
1063 * ------------------------------------------------------------------------- */ 1140 * ------------------------------------------------------------------------- */
1064void 1141void
1065rxvt_get_ttymode (ttymode_t *tio, int erase) 1142rxvt_get_ttymode (struct termios *tio, int erase)
1066{ 1143{
1067 /* 1144 /*
1068 * standard System V termios interface 1145 * standard System V termios interface
1069 */ 1146 */
1070 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1147 if (tcgetattr (STDIN_FILENO, tio) < 0)
1071 { 1148 {
1072 // return error - use system defaults, 1149 // return error - use system defaults,
1073 // where possible, and zero elsewhere 1150 // where possible, and zero elsewhere
1074 memset (tio, 0, sizeof (ttymode_t)); 1151 memset (tio, 0, sizeof (struct termios));
1075 1152
1076 tio->c_cc[VINTR] = CINTR; 1153 tio->c_cc[VINTR] = CINTR;
1077 tio->c_cc[VQUIT] = CQUIT; 1154 tio->c_cc[VQUIT] = CQUIT;
1078 tio->c_cc[VERASE] = CERASE; 1155 tio->c_cc[VERASE] = CERASE;
1079#ifdef VERASE2 1156#ifdef VERASE2
… …
1143 1220
1144 /* 1221 /*
1145 * Debugging 1222 * Debugging
1146 */ 1223 */
1147#ifdef DEBUG_TTYMODE 1224#ifdef DEBUG_TTYMODE
1148#ifdef HAVE_TERMIOS_H
1149 /* c_iflag bits */ 1225 /* c_iflag bits */
1150 fprintf (stderr, "Input flags\n"); 1226 fprintf (stderr, "Input flags\n");
1151 1227
1152 /* cpp token stringize doesn't work on all machines <sigh> */ 1228 /* cpp token stringize doesn't work on all machines <sigh> */
1153# define FOO(flag,name) \ 1229# define FOO(flag,name) \
… …
1216 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1217# endif 1293# endif
1218 1294
1219 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1220# undef FOO 1296# undef FOO
1221# endif /* HAVE_TERMIOS_H */ 1297#endif /* DEBUG_TTYMODE */
1222#endif /* DEBUG_TTYMODE */
1223} 1298}
1224 1299
1225/*----------------------------------------------------------------------*/ 1300/*----------------------------------------------------------------------*/
1226/* 1301/*
1227 * Run the command in a subprocess and return a file descriptor for the 1302 * Run the command in a subprocess and return a file descriptor for the
… …
1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1252 1327
1253 int er; 1328 int er;
1254 1329
1255#ifndef NO_BACKSPACE_KEY 1330#ifndef NO_BACKSPACE_KEY
1256 if (key_backspace[0] && !key_backspace[1]) 1331 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1257 er = key_backspace[0]; 1332 er = rs[Rs_backspace_key][0];
1258 else if (strcmp (key_backspace, "DEC") == 0) 1333 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1259 er = '\177'; /* the initial state anyway */ 1334 er = '\177'; /* the initial state anyway */
1260 else 1335 else
1261#endif 1336#endif
1262 er = -1; 1337 er = -1;
1263 1338
1264 rxvt_get_ttymode (&tio, er); 1339 rxvt_get_ttymode (&tio, er);
1265 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);
1266 pty->set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1267 1345
1268 /* set initial window size */ 1346 /* set initial window size */
1269 tt_winch (); 1347 tt_winch ();
1270 1348
… …
1330rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1331{ 1409{
1332 char *login; 1410 char *login;
1333 1411
1334 if (option (Opt_console)) 1412 if (option (Opt_console))
1413 {
1335 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1336#ifdef TIOCCONS 1415#ifdef TIOCCONS
1337 unsigned int on = 1; 1416 unsigned int on = 1;
1338 1417
1339 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1340#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1342 1421
1343 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1344 if (fd >= 0) 1423 if (fd >= 0)
1345 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1346 close (fd); 1425 close (fd);
1347#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1348 } 1427 }
1349 1428
1350 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1351 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1352 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1359 */ 1438 */
1360#ifdef SIGTSTP 1439#ifdef SIGTSTP
1361 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1362 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1363 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1364#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1365 1444
1366 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1367 sigset_t ss; 1446 sigset_t ss;
1368 sigemptyset (&ss); 1447 sigemptyset (&ss);
1369 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);
1370 1449
1371 /* command interpreter path */ 1450 /* command interpreter path */
1372 if (argv != NULL) 1451 if (argv)
1373 { 1452 {
1374# ifdef DEBUG_CMD 1453# ifdef DEBUG_CMD
1375 int i; 1454 int i;
1376 1455
1377 for (i = 0; argv[i]; i++) 1456 for (i = 0; argv[i]; i++)
… …
1397 login[0] = '-'; 1476 login[0] = '-';
1398 strcpy (&login[1], argv0); 1477 strcpy (&login[1], argv0);
1399 argv0 = login; 1478 argv0 = login;
1400 } 1479 }
1401 1480
1402 execlp (shell, argv0, NULL); 1481 execlp (shell, argv0, (char *)0);
1403 /* no error message: STDERR is closed! */ 1482 /* no error message: STDERR is closed! */
1404 } 1483 }
1405 1484
1406 return -1; 1485 return -1;
1407} 1486}

Diff Legend

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