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.190 by sasha, Thu Jul 12 22:33:16 2007 UTC vs.
Revision 1.224 by ayin, Mon Nov 26 11:20:16 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
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 290#endif
187 291
188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
189 pixmap = None;
190#endif
191 292
192 MEvent.time = CurrentTime; 293 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 294 MEvent.button = AnyButton;
194 want_refresh = 1; 295 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 296 priv_modes = SavedModes = PrivMode_Default;
… …
202 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
203 304
204 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
205 306
206 oldcursor.row = oldcursor.col = -1; 307 oldcursor.row = oldcursor.col = -1;
207#ifdef XPM_BACKGROUND
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);
… …
317 if (rs[Rs_depth]) 416 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 417 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 418#endif
320 419
321#ifdef HAVE_AFTERIMAGE 420#ifdef HAVE_AFTERIMAGE
322 ::dpy = NULL ; /* init global var from libAfter... */
323 asv = AFTERIMAGE_DPY_OP(create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL)); 421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
324#endif 422#endif
325 free (r_argv); 423 free (r_argv);
326 424
327 for (int i = NUM_RESOURCES; i--; ) 425 for (int i = NUM_RESOURCES; i--; )
328 if (rs [i] == resval_undef) 426 if (rs [i] == resval_undef)
… …
345 * set any defaults not already set 443 * set any defaults not already set
346 */ 444 */
347 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
348 { 446 {
349 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
350 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
351 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
352 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
353 } 451 }
354 else 452 else
355 { 453 {
… …
393 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
394 492
395#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
396 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
397# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
398 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
399# else 497# else
400 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
401# endif 499# endif
402 else
403 {
404 val = strdup (rs[Rs_backspace_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_backspace = val;
408 }
409#endif 500#endif
410 501
411#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 506# else
416 key_delete = "\033[3~"; 507 rs[Rs_delete_key] = "\033[3~";
417# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 rxvt_Str_trim (val);
422 rxvt_Str_escaped (val);
423 key_delete = val;
424 }
425#endif 508# endif
426 if (rs[Rs_answerbackstring]) 509#endif
427 {
428 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
429 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
430 }
431 510
432#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
433 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]);
434#endif 513#endif
435 514
… …
459 color_aliases (Color_fg); 538 color_aliases (Color_fg);
460 color_aliases (Color_bg); 539 color_aliases (Color_bg);
461#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
462 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
463 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
464#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
465 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
466 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
467 color_aliases (Color_border); 546 color_aliases (Color_border);
468#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
469 color_aliases (Color_BD); 548 color_aliases (Color_BD);
470 color_aliases (Color_UL); 549 color_aliases (Color_UL);
471 color_aliases (Color_RV); 550 color_aliases (Color_RV);
472#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
473 552
474 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
475 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
476 555
477 return cmd_argv; 556 return cmd_argv;
… …
480/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
481void 560void
482rxvt_term::init_env () 561rxvt_term::init_env ()
483{ 562{
484 int i; 563 int i;
485 unsigned int u;
486 char *val; 564 char *val;
487 565
488#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
489 /* Fixup display_name for export over pty to any interested terminal 567 /* Fixup display_name for export over pty to any interested terminal
490 * 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
… …
498 */ 576 */
499 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
500 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
501 579
502 if (val == NULL) 580 if (val == NULL)
503#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
504 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
505 583
506 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
507 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
508 586
509 i = strlen (val); 587 i = strlen (val);
510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
511 589
512 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
513 591
514 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
515 593
… …
536 else 614 else
537 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
538 616
539 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
540 { 618 {
541 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);
542 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
543 putenv (env_term); 621 putenv (env_term);
544 } 622 }
545 else 623 else
546 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
548#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
549 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
550 unsetenv ("LINES"); 628 unsetenv ("LINES");
551 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
552 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
553#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
554} 632}
555 633
556/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
557/* 635/*
558 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
… …
579 657
580 this->locale = "C"; 658 this->locale = "C";
581 } 659 }
582 660
583 661
584 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
585 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
586 mbstate.reset (); 664 mbstate.reset ();
587#endif 665#endif
588 666
589#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
646 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
647 if (!option (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
648 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
649 727
650#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
651 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
652 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
653#endif 731#endif
654 732
655 /* add value for scrollBar */ 733 /* add value for scrollBar */
656 if (scrollBar.state) 734 if (scrollBar.state)
… …
669 int i; 747 int i;
670 748
671#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
672 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
673#endif 751#endif
674 752
675 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
676 { 754 {
677 const char *name = rs[Rs_color + i]; 755 const char *name = rs[Rs_color + i];
678 756
679 if (!name) 757 if (!name)
… …
757 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),
758 cscroll.a) 836 cscroll.a)
759 )) 837 ))
760 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
761 } 839 }
762#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
763 841
764#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
766 update_fade_color (i); 844 update_fade_color (i);
767#endif 845#endif
… …
775 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
776 { 854 {
777 int i = atoi (rs[Rs_color + idx]); 855 int i = atoi (rs[Rs_color + idx]);
778 856
779 if (i >= 8 && i <= 15) 857 if (i >= 8 && i <= 15)
780 { /* bright colors */ 858 /* bright colors */
781 i -= 8;
782 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
783 return; 860 else if (i >= 0 && i <= 7)
784 } 861 /* normal colors */
785
786 if (i >= 0 && i <= 7) /* normal colors */
787 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 862 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
788 } 863 }
789} 864}
790 865
791/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
… …
883rxvt_term::create_windows (int argc, const char *const *argv) 958rxvt_term::create_windows (int argc, const char *const *argv)
884{ 959{
885 XClassHint classHint; 960 XClassHint classHint;
886 XWMHints wmHint; 961 XWMHints wmHint;
887#if ENABLE_FRILLS 962#if ENABLE_FRILLS
888 MWMHints mwmhints; 963 MWMHints mwmhints = { };
889#endif 964#endif
890 XGCValues gcvalue; 965 XGCValues gcvalue;
891 XSetWindowAttributes attributes; 966 XSetWindowAttributes attributes;
892 Window top, parent; 967 Window top, parent;
893 968
… …
906#if ENABLE_FRILLS 981#if ENABLE_FRILLS
907 if (option (Opt_borderLess)) 982 if (option (Opt_borderLess))
908 { 983 {
909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 984 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
910 { 985 {
911 /* 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");
912 attributes.override_redirect = true; 987 attributes.override_redirect = true;
913 mwmhints.flags = 0;
914 } 988 }
915 else 989 else
916 { 990 {
917 mwmhints.flags = MWM_HINTS_DECORATIONS; 991 mwmhints.flags = MWM_HINTS_DECORATIONS;
918 mwmhints.decorations = 0;
919 } 992 }
920 } 993 }
921 else
922 mwmhints.flags = 0;
923#endif 994#endif
924 995
925#if ENABLE_XEMBED 996#if ENABLE_XEMBED
926 if (rs[Rs_embed]) 997 if (rs[Rs_embed])
927 { 998 {
… …
1037 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1038 1109
1039 vt_select_input (); 1110 vt_select_input ();
1040 1111
1041 vt_ev.start (display, vt); 1112 vt_ev.start (display, vt);
1042
1043#ifdef XPM_BACKGROUND
1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1046 && !option (Opt_transparent)
1047#endif
1048 )
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 scale_pixmap (p);
1056 }
1057
1058 set_bgPixmap (rs[Rs_backgroundPixmap]);
1059 scr_touch (true);
1060 }
1061#endif
1062 1113
1063 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1064 gcvalue.foreground = pix_colors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1065 gcvalue.background = pix_colors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1066 gcvalue.graphics_exposures = 0; 1117 gcvalue.graphics_exposures = 0;
… …
1248 FOO (VLNEXT, "VLNEXT"); 1299 FOO (VLNEXT, "VLNEXT");
1249# endif 1300# endif
1250 1301
1251 fprintf (stderr, "\n"); 1302 fprintf (stderr, "\n");
1252# undef FOO 1303# undef FOO
1253# endif /* HAVE_TERMIOS_H */ 1304# endif /* HAVE_TERMIOS_H */
1254#endif /* DEBUG_TTYMODE */ 1305#endif /* DEBUG_TTYMODE */
1255} 1306}
1256 1307
1257/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1258/* 1309/*
1259 * 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
… …
1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1284 1335
1285 int er; 1336 int er;
1286 1337
1287#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1288 if (key_backspace[0] && !key_backspace[1]) 1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1289 er = key_backspace[0]; 1340 er = rs[Rs_backspace_key][0];
1290 else if (strcmp (key_backspace, "DEC") == 0) 1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1291 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1292 else 1343 else
1293#endif 1344#endif
1294 er = -1; 1345 er = -1;
1295 1346
… …
1362rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1363{ 1414{
1364 char *login; 1415 char *login;
1365 1416
1366 if (option (Opt_console)) 1417 if (option (Opt_console))
1418 {
1367 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1368#ifdef TIOCCONS 1420#ifdef TIOCCONS
1369 unsigned int on = 1; 1421 unsigned int on = 1;
1370 1422
1371 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1372#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1374 1426
1375 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1376 if (fd >= 0) 1428 if (fd >= 0)
1377 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1378 close (fd); 1430 close (fd);
1379#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1380 } 1432 }
1381 1433
1382 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1383 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1384 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1391 */ 1443 */
1392#ifdef SIGTSTP 1444#ifdef SIGTSTP
1393 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1394 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1395 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1396#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1397 1449
1398 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1399 sigset_t ss; 1451 sigset_t ss;
1400 sigemptyset (&ss); 1452 sigemptyset (&ss);
1401 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1402 1454
1403 /* command interpreter path */ 1455 /* command interpreter path */
1404 if (argv != NULL) 1456 if (argv)
1405 { 1457 {
1406# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1407 int i; 1459 int i;
1408 1460
1409 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1418 const char *argv0, *shell; 1470 const char *argv0, *shell;
1419 1471
1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1421 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1422 1474
1423 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1424 1476
1425 if (option (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1426 { 1478 {
1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1428 1480
1429 login[0] = '-'; 1481 login[0] = '-';
1430 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1431 argv0 = login; 1483 argv0 = login;
1432 } 1484 }
1433 1485
1434 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1435 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1436 } 1488 }
1437 1489
1438 return -1; 1490 return -1;
1439} 1491}

Diff Legend

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