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.202 by sasha, Tue Aug 7 22:43:33 2007 UTC vs.
Revision 1.223 by ayin, Mon Nov 26 10:33:36 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 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",
… …
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#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
217 last_bot = last_state = -1; 308 last_bot = last_state = -1;
218 309
219 set_option (Opt_scrollBar); 310 set_option (Opt_scrollBar);
220 set_option (Opt_scrollTtyOutput); 311 set_option (Opt_scrollTtyOutput);
221 set_option (Opt_jumpScroll); 312 set_option (Opt_jumpScroll);
… …
241 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
242 { 333 {
243 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
244 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
245 } 336 }
246 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
247 { 338 {
248 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
249 close (i); 340 close (i);
250 } 341 }
251 342
… …
266/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
267const char ** 358const char **
268rxvt_term::init_resources (int argc, const char *const *argv) 359rxvt_term::init_resources (int argc, const char *const *argv)
269{ 360{
270 int i, r_argc; 361 int i, r_argc;
271 char *val;
272 const char **cmd_argv, **r_argv; 362 const char **cmd_argv, **r_argv;
273 363
274 /* 364 /*
275 * 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
276 */ 366 */
277 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
278 if (!strcmp (argv[r_argc], "-e")) 368 if (!strcmp (argv[r_argc], "-e"))
279 break; 369 break;
280 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
281 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
282 386
283 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
284 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
285 389
286 r_argv[i] = NULL; 390 r_argv[i] = NULL;
287 391
288 if (r_argc == argc)
289 cmd_argv = NULL;
290 else
291 {
292 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
293
294 for (i = 0; i < argc - r_argc - 1; i++)
295 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
296
297 cmd_argv[i] = NULL;
298 }
299
300 rs[Rs_name] = rxvt_r_basename (argv[0]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
301 393
302 /* 394 /*
303 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
304 */ 396 */
305 397
… …
307 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
308 400
309 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
310 402
311 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
312 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 }
313 408
314 // using a local pointer decreases code size a lot 409 // using a local pointer decreases code size a lot
315 xa = display->xa; 410 xa = display->xa;
316 411
317 set (display); 412 set (display);
… …
348 * set any defaults not already set 443 * set any defaults not already set
349 */ 444 */
350 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
351 { 446 {
352 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
353 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
354 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
355 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
356 } 451 }
357 else 452 else
358 { 453 {
… …
396 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
397 492
398#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
399 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
400# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
401 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402# else 497# else
403 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404# endif 499# endif
405 else
406 {
407 val = strdup (rs[Rs_backspace_key]);
408 rxvt_Str_trim (val);
409 rxvt_Str_escaped (val);
410 key_backspace = val;
411 }
412#endif 500#endif
413 501
414#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
415 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
416# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
417 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
418# else 506# else
419 key_delete = "\033[3~"; 507 rs[Rs_delete_key] = "\033[3~";
420# endif
421 else
422 {
423 val = strdup (rs[Rs_delete_key]);
424 rxvt_Str_trim (val);
425 rxvt_Str_escaped (val);
426 key_delete = val;
427 }
428#endif 508# endif
429 if (rs[Rs_answerbackstring]) 509#endif
430 {
431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433 }
434 510
435#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
436 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]);
437#endif 513#endif
438 514
… …
462 color_aliases (Color_fg); 538 color_aliases (Color_fg);
463 color_aliases (Color_bg); 539 color_aliases (Color_bg);
464#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
465 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
466 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
467#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
468 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
469 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
470 color_aliases (Color_border); 546 color_aliases (Color_border);
471#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
472 color_aliases (Color_BD); 548 color_aliases (Color_BD);
473 color_aliases (Color_UL); 549 color_aliases (Color_UL);
474 color_aliases (Color_RV); 550 color_aliases (Color_RV);
475#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
476 552
477 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
478 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
479 555
480 return cmd_argv; 556 return cmd_argv;
… …
483/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
484void 560void
485rxvt_term::init_env () 561rxvt_term::init_env ()
486{ 562{
487 int i; 563 int i;
488 unsigned int u;
489 char *val; 564 char *val;
490 565
491#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
492 /* Fixup display_name for export over pty to any interested terminal 567 /* Fixup display_name for export over pty to any interested terminal
493 * 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
… …
501 */ 576 */
502 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
503 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
504 579
505 if (val == NULL) 580 if (val == NULL)
506#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
507 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
508 583
509 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
510 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
511 586
512 i = strlen (val); 587 i = strlen (val);
513 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
514 589
515 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
516 591
517 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
518 593
… …
539 else 614 else
540 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
541 616
542 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
543 { 618 {
544 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);
545 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
546 putenv (env_term); 621 putenv (env_term);
547 } 622 }
548 else 623 else
549 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
551#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
552 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
553 unsetenv ("LINES"); 628 unsetenv ("LINES");
554 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
555 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
556#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
557} 632}
558 633
559/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
560/* 635/*
561 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
… …
582 657
583 this->locale = "C"; 658 this->locale = "C";
584 } 659 }
585 660
586 661
587 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
588 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
589 mbstate.reset (); 664 mbstate.reset ();
590#endif 665#endif
591 666
592#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
649 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
650 if (!option (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
651 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
652 727
653#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
654 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
655 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
656#endif 731#endif
657 732
658 /* add value for scrollBar */ 733 /* add value for scrollBar */
659 if (scrollBar.state) 734 if (scrollBar.state)
… …
672 int i; 747 int i;
673 748
674#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
675 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
676#endif 751#endif
677 752
678 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
679 { 754 {
680 const char *name = rs[Rs_color + i]; 755 const char *name = rs[Rs_color + i];
681 756
682 if (!name) 757 if (!name)
… …
760 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),
761 cscroll.a) 836 cscroll.a)
762 )) 837 ))
763 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
764 } 839 }
765#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
766 841
767#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
768 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
769 update_fade_color (i); 844 update_fade_color (i);
770#endif 845#endif
… …
778 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
779 { 854 {
780 int i = atoi (rs[Rs_color + idx]); 855 int i = atoi (rs[Rs_color + idx]);
781 856
782 if (i >= 8 && i <= 15) 857 if (i >= 8 && i <= 15)
783 { /* bright colors */ 858 /* bright colors */
784 i -= 8;
785 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
786 return; 860 else if (i >= 0 && i <= 7)
787 } 861 /* normal colors */
788
789 if (i >= 0 && i <= 7) /* normal colors */
790 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 862 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
791 } 863 }
792} 864}
793 865
794/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
… …
909#if ENABLE_FRILLS 981#if ENABLE_FRILLS
910 if (option (Opt_borderLess)) 982 if (option (Opt_borderLess))
911 { 983 {
912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 984 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
913 { 985 {
914 /* 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");
915 attributes.override_redirect = true; 987 attributes.override_redirect = true;
916 mwmhints.flags = 0;
917 } 988 }
918 else 989 else
919 { 990 {
920 mwmhints.flags = MWM_HINTS_DECORATIONS; 991 mwmhints.flags = MWM_HINTS_DECORATIONS;
921 mwmhints.decorations = 0;
922 } 992 }
923 } 993 }
924 else
925 mwmhints.flags = 0;
926#endif 994#endif
927 995
928#if ENABLE_XEMBED 996#if ENABLE_XEMBED
929 if (rs[Rs_embed]) 997 if (rs[Rs_embed])
930 { 998 {
… …
1040 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1041 1109
1042 vt_select_input (); 1110 vt_select_input ();
1043 1111
1044 vt_ev.start (display, vt); 1112 vt_ev.start (display, vt);
1045
1046#ifdef XPM_BACKGROUND
1047 if (rs[Rs_backgroundPixmap] != NULL)
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 bgPixmap.handle_geometry (p);
1055 }
1056 else
1057 bgPixmap.set_defaultGeometry ();
1058
1059 set_bgPixmap (rs[Rs_backgroundPixmap]);
1060 scr_touch (true);
1061 }
1062#endif
1063 1113
1064 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1065 gcvalue.foreground = pix_colors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1066 gcvalue.background = pix_colors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1067 gcvalue.graphics_exposures = 0; 1117 gcvalue.graphics_exposures = 0;
… …
1249 FOO (VLNEXT, "VLNEXT"); 1299 FOO (VLNEXT, "VLNEXT");
1250# endif 1300# endif
1251 1301
1252 fprintf (stderr, "\n"); 1302 fprintf (stderr, "\n");
1253# undef FOO 1303# undef FOO
1254# endif /* HAVE_TERMIOS_H */ 1304# endif /* HAVE_TERMIOS_H */
1255#endif /* DEBUG_TTYMODE */ 1305#endif /* DEBUG_TTYMODE */
1256} 1306}
1257 1307
1258/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1259/* 1309/*
1260 * Run the command in a subprocess and return a file descriptor for the 1310 * Run the command in a subprocess and return a file descriptor for the
… …
1284 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1285 1335
1286 int er; 1336 int er;
1287 1337
1288#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1289 if (key_backspace[0] && !key_backspace[1]) 1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1290 er = key_backspace[0]; 1340 er = rs[Rs_backspace_key][0];
1291 else if (strcmp (key_backspace, "DEC") == 0) 1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1292 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1293 else 1343 else
1294#endif 1344#endif
1295 er = -1; 1345 er = -1;
1296 1346
… …
1375 1425
1376 fd = open (CONSOLE, O_WRONLY, 0); 1426 fd = open (CONSOLE, O_WRONLY, 0);
1377 if (fd >= 0) 1427 if (fd >= 0)
1378 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1428 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1379 close (fd); 1429 close (fd);
1380#endif /* SRIOCSREDIR */ 1430#endif /* SRIOCSREDIR */
1381 } 1431 }
1382 1432
1383 /* reset signals and spin off the command interpreter */ 1433 /* reset signals and spin off the command interpreter */
1384 signal (SIGINT, SIG_DFL); 1434 signal (SIGINT, SIG_DFL);
1385 signal (SIGQUIT, SIG_DFL); 1435 signal (SIGQUIT, SIG_DFL);
… …
1392 */ 1442 */
1393#ifdef SIGTSTP 1443#ifdef SIGTSTP
1394 signal (SIGTSTP, SIG_IGN); 1444 signal (SIGTSTP, SIG_IGN);
1395 signal (SIGTTIN, SIG_IGN); 1445 signal (SIGTTIN, SIG_IGN);
1396 signal (SIGTTOU, SIG_IGN); 1446 signal (SIGTTOU, SIG_IGN);
1397#endif /* SIGTSTP */ 1447#endif /* SIGTSTP */
1398 1448
1399 // unblock signals (signals are blocked by iom.C 1449 // unblock signals (signals are blocked by iom.C
1400 sigset_t ss; 1450 sigset_t ss;
1401 sigemptyset (&ss); 1451 sigemptyset (&ss);
1402 sigprocmask (SIG_SETMASK, &ss, 0); 1452 sigprocmask (SIG_SETMASK, &ss, 0);
1403 1453
1404 /* command interpreter path */ 1454 /* command interpreter path */
1405 if (argv != NULL) 1455 if (argv)
1406 { 1456 {
1407# ifdef DEBUG_CMD 1457# ifdef DEBUG_CMD
1408 int i; 1458 int i;
1409 1459
1410 for (i = 0; argv[i]; i++) 1460 for (i = 0; argv[i]; i++)
… …
1419 const char *argv0, *shell; 1469 const char *argv0, *shell;
1420 1470
1421 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1471 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1422 shell = "/bin/sh"; 1472 shell = "/bin/sh";
1423 1473
1424 argv0 = (const char *)rxvt_r_basename (shell); 1474 argv0 = (const char *)rxvt_basename (shell);
1425 1475
1426 if (option (Opt_loginShell)) 1476 if (option (Opt_loginShell))
1427 { 1477 {
1428 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1478 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1429 1479
1430 login[0] = '-'; 1480 login[0] = '-';
1431 strcpy (&login[1], argv0); 1481 strcpy (&login[1], argv0);
1432 argv0 = login; 1482 argv0 = login;
1433 } 1483 }
1434 1484
1435 execlp (shell, argv0, NULL); 1485 execlp (shell, argv0, (char *)0);
1436 /* no error message: STDERR is closed! */ 1486 /* no error message: STDERR is closed! */
1437 } 1487 }
1438 1488
1439 return -1; 1489 return -1;
1440} 1490}

Diff Legend

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