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.198 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.225 by ayin, Tue Dec 11 11:39:06 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> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 16 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
42 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 TINTING 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
… …
199 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
200 304
201 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
202 306
203 oldcursor.row = oldcursor.col = -1; 307 oldcursor.row = oldcursor.col = -1;
204#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
205#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1; 308 last_bot = last_state = -1;
214 309
215 set_option (Opt_scrollBar); 310 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 311 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 312 set_option (Opt_jumpScroll);
… …
237 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 { 333 {
239 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
241 } 336 }
242 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
243 { 338 {
244 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
245 close (i); 340 close (i);
246 } 341 }
247 342
… …
262/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
263const char ** 358const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 359rxvt_term::init_resources (int argc, const char *const *argv)
265{ 360{
266 int i, r_argc; 361 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 362 const char **cmd_argv, **r_argv;
269 363
270 /* 364 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args 365 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */ 366 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 368 if (!strcmp (argv[r_argc], "-e"))
275 break; 369 break;
276 370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
384
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 386
279 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
281 389
282 r_argv[i] = NULL; 390 r_argv[i] = NULL;
283 391
284 if (r_argc == argc)
285 cmd_argv = NULL;
286 else
287 {
288 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
289
290 for (i = 0; i < argc - r_argc - 1; i++)
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292
293 cmd_argv[i] = NULL;
294 }
295
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
297 393
298 /* 394 /*
299 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
300 */ 396 */
301 397
… …
303 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
304 400
305 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
306 402
307 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 406 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
407 }
309 408
310 // using a local pointer decreases code size a lot 409 // using a local pointer decreases code size a lot
311 xa = display->xa; 410 xa = display->xa;
312 411
313 set (display); 412 set (display);
… …
344 * set any defaults not already set 443 * set any defaults not already set
345 */ 444 */
346 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
347 { 446 {
348 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
350 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
352 } 451 }
353 else 452 else
354 { 453 {
… …
392 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
393 492
394#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
395 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
396# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
397 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
398# else 497# else
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
400# endif 499# endif
401 else
402 {
403 val = strdup (rs[Rs_backspace_key]);
404 rxvt_Str_trim (val);
405 rxvt_Str_escaped (val);
406 key_backspace = val;
407 }
408#endif 500#endif
409 501
410#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
411 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
412# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
413 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
414# else 506# else
415 key_delete = "\033[3~"; 507 rs[Rs_delete_key] = "\033[3~";
416# endif
417 else
418 {
419 val = strdup (rs[Rs_delete_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_delete = val;
423 }
424#endif 508# endif
425 if (rs[Rs_answerbackstring]) 509#endif
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430 510
431#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
433#endif 513#endif
434 514
… …
458 color_aliases (Color_fg); 538 color_aliases (Color_fg);
459 color_aliases (Color_bg); 539 color_aliases (Color_bg);
460#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
461 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
462 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
463#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
464 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
465 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
466 color_aliases (Color_border); 546 color_aliases (Color_border);
467#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
468 color_aliases (Color_BD); 548 color_aliases (Color_BD);
469 color_aliases (Color_UL); 549 color_aliases (Color_UL);
470 color_aliases (Color_RV); 550 color_aliases (Color_RV);
471#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
472 552
473 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
474 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
475 555
476 return cmd_argv; 556 return cmd_argv;
… …
479/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
480void 560void
481rxvt_term::init_env () 561rxvt_term::init_env ()
482{ 562{
483 int i; 563 int i;
484 unsigned int u;
485 char *val; 564 char *val;
486 565
487#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 567 /* Fixup display_name for export over pty to any interested terminal
489 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
497 */ 576 */
498 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
499 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
500 579
501 if (val == NULL) 580 if (val == NULL)
502#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
503 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
504 583
505 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
507 586
508 i = strlen (val); 587 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
510 589
511 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
512 591
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
514 593
… …
535 else 614 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
537 616
538 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
539 { 618 {
540 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 619 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 621 putenv (env_term);
543 } 622 }
544 else 623 else
545 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
547#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
548 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
549 unsetenv ("LINES"); 628 unsetenv ("LINES");
550 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
551 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
552#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
553} 632}
554 633
555/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
556/* 635/*
557 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
… …
578 657
579 this->locale = "C"; 658 this->locale = "C";
580 } 659 }
581 660
582 661
583 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
584 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
585 mbstate.reset (); 664 mbstate.reset ();
586#endif 665#endif
587 666
588#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
645 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
646 if (!option (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
647 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
648 727
649#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
650 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
651 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
652#endif 731#endif
653 732
654 /* add value for scrollBar */ 733 /* add value for scrollBar */
655 if (scrollBar.state) 734 if (scrollBar.state)
… …
668 int i; 747 int i;
669 748
670#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
671 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
672#endif 751#endif
673 752
674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
675 { 754 {
676 const char *name = rs[Rs_color + i]; 755 const char *name = rs[Rs_color + i];
677 756
678 if (!name) 757 if (!name)
… …
756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 cscroll.a) 836 cscroll.a)
758 )) 837 ))
759 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
760 } 839 }
761#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
762 841
763#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i); 844 update_fade_color (i);
766#endif 845#endif
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 854 {
776 int i = atoi (rs[Rs_color + idx]); 855 int i = atoi (rs[Rs_color + idx]);
777 856
778 if (i >= 8 && i <= 15) 857 if (i >= 8 && i <= 15)
779 { /* bright colors */ 858 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 860 else if (i >= 0 && i <= 7)
783 } 861 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 862 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 863 }
788} 864}
789 865
790/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
… …
905#if ENABLE_FRILLS 981#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 982 if (option (Opt_borderLess))
907 { 983 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 984 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 985 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 986 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 987 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 988 }
914 else 989 else
915 { 990 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 991 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 992 }
919 } 993 }
920 else
921 mwmhints.flags = 0;
922#endif 994#endif
923 995
924#if ENABLE_XEMBED 996#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 997 if (rs[Rs_embed])
926 { 998 {
… …
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1109
1038 vt_select_input (); 1110 vt_select_input ();
1039 1111
1040 vt_ev.start (display, vt); 1112 vt_ev.start (display, vt);
1041
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL)
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057 1113
1058 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1117 gcvalue.graphics_exposures = 0;
… …
1170 1226
1171 /* 1227 /*
1172 * Debugging 1228 * Debugging
1173 */ 1229 */
1174#ifdef DEBUG_TTYMODE 1230#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */ 1231 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n"); 1232 fprintf (stderr, "Input flags\n");
1178 1233
1179 /* cpp token stringize doesn't work on all machines <sigh> */ 1234 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \ 1235# define FOO(flag,name) \
… …
1243 FOO (VLNEXT, "VLNEXT"); 1298 FOO (VLNEXT, "VLNEXT");
1244# endif 1299# endif
1245 1300
1246 fprintf (stderr, "\n"); 1301 fprintf (stderr, "\n");
1247# undef FOO 1302# undef FOO
1248# endif /* HAVE_TERMIOS_H */ 1303#endif /* DEBUG_TTYMODE */
1249#endif /* DEBUG_TTYMODE */
1250} 1304}
1251 1305
1252/*----------------------------------------------------------------------*/ 1306/*----------------------------------------------------------------------*/
1253/* 1307/*
1254 * Run the command in a subprocess and return a file descriptor for the 1308 * Run the command in a subprocess and return a file descriptor for the
… …
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1332 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1333
1280 int er; 1334 int er;
1281 1335
1282#ifndef NO_BACKSPACE_KEY 1336#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1337 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1338 er = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1339 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1340 er = '\177'; /* the initial state anyway */
1287 else 1341 else
1288#endif 1342#endif
1289 er = -1; 1343 er = -1;
1290 1344
… …
1357rxvt_term::run_child (const char *const *argv) 1411rxvt_term::run_child (const char *const *argv)
1358{ 1412{
1359 char *login; 1413 char *login;
1360 1414
1361 if (option (Opt_console)) 1415 if (option (Opt_console))
1416 {
1362 { /* be virtual console, fail silently */ 1417 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1418#ifdef TIOCCONS
1364 unsigned int on = 1; 1419 unsigned int on = 1;
1365 1420
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1421 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1422#elif defined (SRIOCSREDIR)
… …
1369 1424
1370 fd = open (CONSOLE, O_WRONLY, 0); 1425 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1426 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1427 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1428 close (fd);
1374#endif /* SRIOCSREDIR */ 1429#endif /* SRIOCSREDIR */
1375 } 1430 }
1376 1431
1377 /* reset signals and spin off the command interpreter */ 1432 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1433 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1434 signal (SIGQUIT, SIG_DFL);
… …
1386 */ 1441 */
1387#ifdef SIGTSTP 1442#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1443 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1444 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1445 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1446#endif /* SIGTSTP */
1392 1447
1393 // unblock signals (signals are blocked by iom.C 1448 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss; 1449 sigset_t ss;
1395 sigemptyset (&ss); 1450 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0); 1451 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1452
1398 /* command interpreter path */ 1453 /* command interpreter path */
1399 if (argv != NULL) 1454 if (argv)
1400 { 1455 {
1401# ifdef DEBUG_CMD 1456# ifdef DEBUG_CMD
1402 int i; 1457 int i;
1403 1458
1404 for (i = 0; argv[i]; i++) 1459 for (i = 0; argv[i]; i++)
… …
1413 const char *argv0, *shell; 1468 const char *argv0, *shell;
1414 1469
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1470 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1471 shell = "/bin/sh";
1417 1472
1418 argv0 = (const char *)rxvt_r_basename (shell); 1473 argv0 = (const char *)rxvt_basename (shell);
1419 1474
1420 if (option (Opt_loginShell)) 1475 if (option (Opt_loginShell))
1421 { 1476 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1477 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1478
1424 login[0] = '-'; 1479 login[0] = '-';
1425 strcpy (&login[1], argv0); 1480 strcpy (&login[1], argv0);
1426 argv0 = login; 1481 argv0 = login;
1427 } 1482 }
1428 1483
1429 execlp (shell, argv0, NULL); 1484 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1485 /* no error message: STDERR is closed! */
1431 } 1486 }
1432 1487
1433 return -1; 1488 return -1;
1434} 1489}

Diff Legend

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