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.186 by ayin, Sat Jun 9 09:05:38 2007 UTC vs.
Revision 1.227 by ayin, Wed Dec 12 09:33:48 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#include <fcntl.h>
47
48#ifdef HAVE_XSETLOCALE
49# define X_LOCALE
50# include <X11/Xlocale.h>
51#else
52# ifdef HAVE_SETLOCALE
53# include <clocale>
54# endif
55#endif
56
57#ifdef HAVE_NL_LANGINFO
58# include <langinfo.h>
59#endif
60
61#ifdef DISPLAY_IS_IP
62/* On Solaris link with -lsocket and -lnsl */
63#include <sys/types.h>
64#include <sys/socket.h>
65
66/* these next two are probably only on Sun (not Solaris) */
67#ifdef HAVE_SYS_SOCKIO_H
68#include <sys/sockio.h>
69#endif
70#ifdef HAVE_SYS_BYTEORDER_H
71#include <sys/byteorder.h>
72#endif
73
74#include <netinet/in.h>
75#include <arpa/inet.h>
76#include <net/if.h>
77#include <net/if_arp.h>
78
79static char *
80rxvt_network_display (const char *display)
81{
82 char buffer[1024], *rval = NULL;
83 struct ifconf ifc;
84 struct ifreq *ifr;
85 int i, skfd;
86
87 if (display[0] != ':' && strncmp (display, "unix:", 5))
88 return (char *) display; /* nothing to do */
89
90 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
91 ifc.ifc_buf = buffer;
92
93 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
94 {
95 perror ("socket");
96 return NULL;
97 }
98
99 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
100 {
101 perror ("SIOCGIFCONF");
102 close (skfd);
103 return NULL;
104 }
105
106 for (i = 0, ifr = ifc.ifc_req;
107 i < (ifc.ifc_len / sizeof (struct ifreq));
108 i++, ifr++)
109 {
110 struct ifreq ifr2;
111
112 strcpy (ifr2.ifr_name, ifr->ifr_name);
113
114 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
115 {
116 unsigned long addr;
117 struct sockaddr_in *p_addr;
118
119 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
120 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
121
122 /*
123 * not "0.0.0.0" or "127.0.0.1" - so format the address
124 */
125 if (addr && addr != 0x7F000001)
126 {
127 char *colon = strchr (display, ':');
128
129 if (colon == NULL)
130 colon = ":0.0";
131
132 rval = rxvt_malloc (strlen (colon) + 16);
133 sprintf (rval, "%d.%d.%d.%d%s",
134 (int) ((addr >> 030) & 0xFF),
135 (int) ((addr >> 020) & 0xFF),
136 (int) ((addr >> 010) & 0xFF),
137 (int) (addr & 0xFF), colon);
138 break;
139 }
140 }
141 }
142
143 close (skfd);
144
145 return rval;
146}
147#endif
148
43const char *const def_colorName[] = 149const char *const def_colorName[] =
44 { 150 {
45 COLOR_FOREGROUND, 151 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 152 COLOR_BACKGROUND,
47 /* low-intensity colors */ 153 /* low-intensity colors */
… …
50 "rgb:00/cd/00", // 2: green (Green3) 156 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 157 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 158 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 159 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 160 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 161# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 162 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 163# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 164 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 165# endif
60 /* high-intensity colors */ 166 /* high-intensity colors */
61# ifdef XTERM_COLORS 167# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 168 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
147 253
148#ifndef NO_CURSORCOLOR 254#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 255 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 256 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 257#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 258 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 259 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 260 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 261#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 262 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 263 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 264 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 265 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 266#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 267#if ENABLE_FRILLS
162 NULL, // Color_underline 268 NULL, // Color_underline
163#endif 269#endif
164#ifdef OPTION_HC 270#ifdef OPTION_HC
165 NULL, 271 NULL,
166#endif 272#endif
167#ifdef KEEP_SCROLLCOLOR 273#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 274 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 275 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 276#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 277#if ENABLE_TRANSPARENCY
172 NULL, 278 NULL,
173#endif 279#endif
174#if OFF_FOCUS_FADING 280#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 281 "rgb:00/00/00",
176#endif 282#endif
177 }; 283 };
178 284
179bool 285void
180rxvt_term::init_vars () 286rxvt_term::init_vars ()
181{ 287{
182 pix_colors = // 288 pix_colors = //
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 290#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 291 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 292#endif
187 293
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 294
192 MEvent.time = CurrentTime; 295 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 296 MEvent.button = AnyButton;
194 want_refresh = 1; 297 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 298 priv_modes = SavedModes = PrivMode_Default;
… …
199 ext_bwidth = EXTERNALBORDERWIDTH; 302 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 303 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 304 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS; 305 numpix_colors = TOTAL_COLORS;
203 306
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 307 refresh_type = SLOW_REFRESH;
206 308
207 oldcursor.row = oldcursor.col = -1; 309 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1; 310 last_bot = last_state = -1;
215 311
216 set_option (Opt_scrollBar); 312 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 313 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 314 set_option (Opt_jumpScroll);
315 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 316 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 317 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 318 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 319 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52); 320 set_option (Opt_iso14755_52);
224
225 return true;
226} 321}
227 322
228void 323void
229rxvt_term::init_secondary () 324rxvt_term::init_secondary ()
230{ 325{
… …
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);
… …
316#if XFT 415#if XFT
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
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
321 free (r_argv); 423 free (r_argv);
322 424
323 for (int i = NUM_RESOURCES; i--; ) 425 for (int i = NUM_RESOURCES; i--; )
324 if (rs [i] == resval_undef) 426 if (rs [i] == resval_undef)
325 rs [i] = 0; 427 rs [i] = 0;
… …
341 * set any defaults not already set 443 * set any defaults not already set
342 */ 444 */
343 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
344 { 446 {
345 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
346 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
347 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
349 } 451 }
350 else 452 else
351 { 453 {
… …
389 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
390 492
391#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
392 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
393# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
394 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
395# else 497# else
396 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
397# endif 499# endif
398 else
399 {
400 val = strdup (rs[Rs_backspace_key]);
401 rxvt_Str_trim (val);
402 rxvt_Str_escaped (val);
403 key_backspace = val;
404 }
405#endif 500#endif
406 501
407#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
408 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
409# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
410 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
411# else 506# else
412 key_delete = "\033[3~"; 507 rs[Rs_delete_key] = "\033[3~";
413# endif
414 else
415 {
416 val = strdup (rs[Rs_delete_key]);
417 rxvt_Str_trim (val);
418 rxvt_Str_escaped (val);
419 key_delete = val;
420 }
421#endif 508# endif
422 if (rs[Rs_answerbackstring]) 509#endif
423 {
424 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
425 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
426 }
427 510
428#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
429 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]);
430#endif 513#endif
431 514
… …
455 color_aliases (Color_fg); 538 color_aliases (Color_fg);
456 color_aliases (Color_bg); 539 color_aliases (Color_bg);
457#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
458 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
459 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
460#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
461 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
462 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
463 color_aliases (Color_border); 546 color_aliases (Color_border);
464#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
465 color_aliases (Color_BD); 548 color_aliases (Color_BD);
466 color_aliases (Color_UL); 549 color_aliases (Color_UL);
467 color_aliases (Color_RV); 550 color_aliases (Color_RV);
468#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
469 552
470 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
471 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
472 555
473 return cmd_argv; 556 return cmd_argv;
… …
476/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
477void 560void
478rxvt_term::init_env () 561rxvt_term::init_env ()
479{ 562{
480 int i; 563 int i;
481 unsigned int u;
482 char *val; 564 char *val;
483 565
484#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
485 /* Fixup display_name for export over pty to any interested terminal 567 /* Fixup display_name for export over pty to any interested terminal
486 * 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
… …
494 */ 576 */
495 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
496 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
497 579
498 if (val == NULL) 580 if (val == NULL)
499#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
500 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
501 583
502 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
503 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
504 586
505 i = strlen (val); 587 i = strlen (val);
506 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
507 589
508 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
509 591
510 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
511 593
… …
532 else 614 else
533 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
534 616
535 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
536 { 618 {
537 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);
538 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
539 putenv (env_term); 621 putenv (env_term);
540 } 622 }
541 else 623 else
542 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
544#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
545 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
546 unsetenv ("LINES"); 628 unsetenv ("LINES");
547 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
548 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
549#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
550} 632}
551 633
552/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
553/* 635/*
554 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
… …
575 657
576 this->locale = "C"; 658 this->locale = "C";
577 } 659 }
578 660
579 661
580 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
581 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
582 mbstate.reset (); 664 mbstate.reset ();
583#endif 665#endif
584 666
585#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
642 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
643 if (!option (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
644 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
645 727
646#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
647 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
648 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
649#endif 731#endif
650 732
651 /* add value for scrollBar */ 733 /* add value for scrollBar */
652 if (scrollBar.state) 734 if (scrollBar.state)
… …
665 int i; 747 int i;
666 748
667#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
668 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
669#endif 751#endif
670 752
671 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
672 { 754 {
673 const char *name = rs[Rs_color + i]; 755 const char *name = rs[Rs_color + i];
674 756
675 if (!name) 757 if (!name)
… …
753 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),
754 cscroll.a) 836 cscroll.a)
755 )) 837 ))
756 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
757 } 839 }
758#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
759 841
760#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
761 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
762 update_fade_color (i); 844 update_fade_color (i);
763#endif 845#endif
… …
771 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772 { 854 {
773 int i = atoi (rs[Rs_color + idx]); 855 int i = atoi (rs[Rs_color + idx]);
774 856
775 if (i >= 8 && i <= 15) 857 if (i >= 8 && i <= 15)
776 { /* bright colors */ 858 /* bright colors */
777 i -= 8;
778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779 return; 860 else if (i >= 0 && i <= 7)
780 } 861 /* normal colors */
781
782 if (i >= 0 && i <= 7) /* normal colors */
783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 862 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784 } 863 }
785} 864}
786 865
787/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 958rxvt_term::create_windows (int argc, const char *const *argv)
880{ 959{
881 XClassHint classHint; 960 XClassHint classHint;
882 XWMHints wmHint; 961 XWMHints wmHint;
883#if ENABLE_FRILLS 962#if ENABLE_FRILLS
884 MWMHints mwmhints; 963 MWMHints mwmhints = { };
885#endif 964#endif
886 XGCValues gcvalue; 965 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 966 XSetWindowAttributes attributes;
888 Window top, parent; 967 Window top, parent;
889 968
… …
902#if ENABLE_FRILLS 981#if ENABLE_FRILLS
903 if (option (Opt_borderLess)) 982 if (option (Opt_borderLess))
904 { 983 {
905 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 984 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 985 {
907 /* 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");
908 attributes.override_redirect = true; 987 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 988 }
911 else 989 else
912 { 990 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 991 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 992 }
916 } 993 }
917 else
918 mwmhints.flags = 0;
919#endif 994#endif
920 995
921#if ENABLE_XEMBED 996#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 997 if (rs[Rs_embed])
923 { 998 {
… …
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1109
1035 vt_select_input (); 1110 vt_select_input ();
1036 1111
1037 vt_ev.start (display, vt); 1112 vt_ev.start (display, vt);
1038
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041#ifndef HAVE_AFTERIMAGE
1042 && !option (Opt_transparent)
1043#endif
1044 )
1045 {
1046 const char *p = rs[Rs_backgroundPixmap];
1047
1048 if ((p = strchr (p, ';')) != NULL)
1049 {
1050 p++;
1051 scale_pixmap (p);
1052 }
1053
1054 set_bgPixmap (rs[Rs_backgroundPixmap]);
1055 scr_touch (true);
1056 }
1057#endif
1058 1113
1059 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 0; 1117 gcvalue.graphics_exposures = 0;
… …
1171 1226
1172 /* 1227 /*
1173 * Debugging 1228 * Debugging
1174 */ 1229 */
1175#ifdef DEBUG_TTYMODE 1230#ifdef DEBUG_TTYMODE
1176#ifdef HAVE_TERMIOS_H
1177 /* c_iflag bits */ 1231 /* c_iflag bits */
1178 fprintf (stderr, "Input flags\n"); 1232 fprintf (stderr, "Input flags\n");
1179 1233
1180 /* cpp token stringize doesn't work on all machines <sigh> */ 1234 /* cpp token stringize doesn't work on all machines <sigh> */
1181# define FOO(flag,name) \ 1235# define FOO(flag,name) \
… …
1244 FOO (VLNEXT, "VLNEXT"); 1298 FOO (VLNEXT, "VLNEXT");
1245# endif 1299# endif
1246 1300
1247 fprintf (stderr, "\n"); 1301 fprintf (stderr, "\n");
1248# undef FOO 1302# undef FOO
1249# endif /* HAVE_TERMIOS_H */ 1303#endif /* DEBUG_TTYMODE */
1250#endif /* DEBUG_TTYMODE */
1251} 1304}
1252 1305
1253/*----------------------------------------------------------------------*/ 1306/*----------------------------------------------------------------------*/
1254/* 1307/*
1255 * 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
… …
1279 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1332 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1280 1333
1281 int er; 1334 int er;
1282 1335
1283#ifndef NO_BACKSPACE_KEY 1336#ifndef NO_BACKSPACE_KEY
1284 if (key_backspace[0] && !key_backspace[1]) 1337 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1285 er = key_backspace[0]; 1338 er = rs[Rs_backspace_key][0];
1286 else if (strcmp (key_backspace, "DEC") == 0) 1339 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1287 er = '\177'; /* the initial state anyway */ 1340 er = '\177'; /* the initial state anyway */
1288 else 1341 else
1289#endif 1342#endif
1290 er = -1; 1343 er = -1;
1291 1344
… …
1358rxvt_term::run_child (const char *const *argv) 1411rxvt_term::run_child (const char *const *argv)
1359{ 1412{
1360 char *login; 1413 char *login;
1361 1414
1362 if (option (Opt_console)) 1415 if (option (Opt_console))
1416 {
1363 { /* be virtual console, fail silently */ 1417 /* be virtual console, fail silently */
1364#ifdef TIOCCONS 1418#ifdef TIOCCONS
1365 unsigned int on = 1; 1419 unsigned int on = 1;
1366 1420
1367 ioctl (STDIN_FILENO, TIOCCONS, &on); 1421 ioctl (STDIN_FILENO, TIOCCONS, &on);
1368#elif defined (SRIOCSREDIR) 1422#elif defined (SRIOCSREDIR)
… …
1370 1424
1371 fd = open (CONSOLE, O_WRONLY, 0); 1425 fd = open (CONSOLE, O_WRONLY, 0);
1372 if (fd >= 0) 1426 if (fd >= 0)
1373 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1427 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1374 close (fd); 1428 close (fd);
1375#endif /* SRIOCSREDIR */ 1429#endif /* SRIOCSREDIR */
1376 } 1430 }
1377 1431
1378 /* reset signals and spin off the command interpreter */ 1432 /* reset signals and spin off the command interpreter */
1379 signal (SIGINT, SIG_DFL); 1433 signal (SIGINT, SIG_DFL);
1380 signal (SIGQUIT, SIG_DFL); 1434 signal (SIGQUIT, SIG_DFL);
… …
1387 */ 1441 */
1388#ifdef SIGTSTP 1442#ifdef SIGTSTP
1389 signal (SIGTSTP, SIG_IGN); 1443 signal (SIGTSTP, SIG_IGN);
1390 signal (SIGTTIN, SIG_IGN); 1444 signal (SIGTTIN, SIG_IGN);
1391 signal (SIGTTOU, SIG_IGN); 1445 signal (SIGTTOU, SIG_IGN);
1392#endif /* SIGTSTP */ 1446#endif /* SIGTSTP */
1393 1447
1394 // unblock signals (signals are blocked by iom.C 1448 // unblock signals (signals are blocked by iom.C
1395 sigset_t ss; 1449 sigset_t ss;
1396 sigemptyset (&ss); 1450 sigemptyset (&ss);
1397 sigprocmask (SIG_SETMASK, &ss, 0); 1451 sigprocmask (SIG_SETMASK, &ss, 0);
1398 1452
1399 /* command interpreter path */ 1453 /* command interpreter path */
1400 if (argv != NULL) 1454 if (argv)
1401 { 1455 {
1402# ifdef DEBUG_CMD 1456# ifdef DEBUG_CMD
1403 int i; 1457 int i;
1404 1458
1405 for (i = 0; argv[i]; i++) 1459 for (i = 0; argv[i]; i++)
… …
1414 const char *argv0, *shell; 1468 const char *argv0, *shell;
1415 1469
1416 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1470 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1417 shell = "/bin/sh"; 1471 shell = "/bin/sh";
1418 1472
1419 argv0 = (const char *)rxvt_r_basename (shell); 1473 argv0 = (const char *)rxvt_basename (shell);
1420 1474
1421 if (option (Opt_loginShell)) 1475 if (option (Opt_loginShell))
1422 { 1476 {
1423 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1477 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1424 1478
1425 login[0] = '-'; 1479 login[0] = '-';
1426 strcpy (&login[1], argv0); 1480 strcpy (&login[1], argv0);
1427 argv0 = login; 1481 argv0 = login;
1428 } 1482 }
1429 1483
1430 execlp (shell, argv0, NULL); 1484 execlp (shell, argv0, (char *)0);
1431 /* no error message: STDERR is closed! */ 1485 /* no error message: STDERR is closed! */
1432 } 1486 }
1433 1487
1434 return -1; 1488 return -1;
1435} 1489}

Diff Legend

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