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.231 by ayin, Tue Dec 18 12:04:50 2007 UTC

… …
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
38 39
39#include <limits> 40#include <limits>
40 41
41#include <csignal> 42#include <csignal>
42 43
44#include <fcntl.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
59#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h>
62#include <sys/socket.h>
63
64/* these next two are probably only on Sun (not Solaris) */
65#ifdef HAVE_SYS_SOCKIO_H
66#include <sys/sockio.h>
67#endif
68#ifdef HAVE_SYS_BYTEORDER_H
69#include <sys/byteorder.h>
70#endif
71
72#include <netinet/in.h>
73#include <arpa/inet.h>
74#include <net/if.h>
75#include <net/if_arp.h>
76
77static char *
78rxvt_network_display (const char *display)
79{
80 char buffer[1024], *rval = NULL;
81 struct ifconf ifc;
82 struct ifreq *ifr;
83 int i, skfd;
84
85 if (display[0] != ':' && strncmp (display, "unix:", 5))
86 return (char *) display; /* nothing to do */
87
88 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
89 ifc.ifc_buf = buffer;
90
91 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
92 {
93 perror ("socket");
94 return NULL;
95 }
96
97 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
98 {
99 perror ("SIOCGIFCONF");
100 close (skfd);
101 return NULL;
102 }
103
104 for (i = 0, ifr = ifc.ifc_req;
105 i < (ifc.ifc_len / sizeof (struct ifreq));
106 i++, ifr++)
107 {
108 struct ifreq ifr2;
109
110 strcpy (ifr2.ifr_name, ifr->ifr_name);
111
112 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
113 {
114 unsigned long addr;
115 struct sockaddr_in *p_addr;
116
117 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
118 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
119
120 /*
121 * not "0.0.0.0" or "127.0.0.1" - so format the address
122 */
123 if (addr && addr != 0x7F000001)
124 {
125 char *colon = strchr (display, ':');
126
127 if (colon == NULL)
128 colon = ":0.0";
129
130 rval = rxvt_malloc (strlen (colon) + 16);
131 sprintf (rval, "%d.%d.%d.%d%s",
132 (int) ((addr >> 030) & 0xFF),
133 (int) ((addr >> 020) & 0xFF),
134 (int) ((addr >> 010) & 0xFF),
135 (int) (addr & 0xFF), colon);
136 break;
137 }
138 }
139 }
140
141 close (skfd);
142
143 return rval;
144}
145#endif
146
43const char *const def_colorName[] = 147const char *const def_colorName[] =
44 { 148 {
45 COLOR_FOREGROUND, 149 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 150 COLOR_BACKGROUND,
47 /* low-intensity colors */ 151 /* low-intensity colors */
… …
50 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 156 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 160 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 161# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 163# endif
60 /* high-intensity colors */ 164 /* high-intensity colors */
61# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
147 251
148#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 258 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 265#if ENABLE_FRILLS
162 NULL, // Color_underline 266 NULL, // Color_underline
163#endif 267#endif
164#ifdef OPTION_HC 268#ifdef OPTION_HC
165 NULL, 269 NULL,
166#endif 270#endif
167#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
171#if 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
177 }; 281 };
178 282
179bool 283void
180rxvt_term::init_vars () 284rxvt_term::init_vars ()
181{ 285{
182 pix_colors = // 286 pix_colors = //
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
188 291
189 MEvent.time = CurrentTime; 292 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 293 MEvent.button = AnyButton;
191 want_refresh = 1; 294 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 295 priv_modes = SavedModes = PrivMode_Default;
… …
194 nrow = 24; 297 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 298 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 299 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 300 lineSpace = LINESPACE;
198 saveLines = SAVELINES; 301 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 302
201 refresh_type = SLOW_REFRESH; 303 refresh_type = SLOW_REFRESH;
202 304
203 oldcursor.row = oldcursor.col = -1; 305 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; 306 last_bot = last_state = -1;
214 307
215 set_option (Opt_scrollBar); 308 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 309 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 310 set_option (Opt_jumpScroll);
… …
219 set_option (Opt_secondaryScreen); 312 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 313 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 314 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 315 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52); 316 set_option (Opt_iso14755_52);
224
225 return true;
226} 317}
227 318
228void 319void
229rxvt_term::init_secondary () 320rxvt_term::init_secondary ()
230{ 321{
… …
237 if ((i = open ("/dev/null", O_RDONLY)) < 0) 328 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 { 329 {
239 /* TODO: BOO HISS */ 330 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO); 331 dup2 (STDERR_FILENO, STDIN_FILENO);
241 } 332 }
242 else if (i > STDIN_FILENO) 333 else if (i != STDIN_FILENO)
243 { 334 {
244 dup2 (i, STDIN_FILENO); 335 dup2 (i, STDIN_FILENO);
245 close (i); 336 close (i);
246 } 337 }
247 338
… …
262/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
263const char ** 354const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 355rxvt_term::init_resources (int argc, const char *const *argv)
265{ 356{
266 int i, r_argc; 357 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 358 const char **cmd_argv, **r_argv;
269 359
270 /* 360 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args 361 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */ 362 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 363 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 364 if (!strcmp (argv[r_argc], "-e"))
275 break; 365 break;
276 366
367 if (r_argc == argc)
368 cmd_argv = NULL;
369 else if (!argv[r_argc + 1])
370 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
371 else
372 {
373 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
374
375 for (i = 0; i < argc - r_argc - 1; i++)
376 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
377
378 cmd_argv[i] = NULL;
379 }
380
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 381 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 382
279 for (i = 0; i < r_argc; i++) 383 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 384 r_argv[i] = (const char *)argv[i];
281 385
282 r_argv[i] = NULL; 386 r_argv[i] = NULL;
283 387
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]); 388 rs[Rs_name] = rxvt_basename (argv[0]);
297 389
298 /* 390 /*
299 * Open display, get options/resources and create the window 391 * Open display, get options/resources and create the window
300 */ 392 */
301 393
… …
303 rs[Rs_display_name] = ":0"; 395 rs[Rs_display_name] = ":0";
304 396
305 get_options (r_argc, r_argv); 397 get_options (r_argc, r_argv);
306 398
307 if (!(display = displays.get (rs[Rs_display_name]))) 399 if (!(display = displays.get (rs[Rs_display_name])))
400 {
401 free (r_argv);
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 402 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
403 }
309 404
310 // using a local pointer decreases code size a lot 405 // using a local pointer decreases code size a lot
311 xa = display->xa; 406 xa = display->xa;
312 407
313 set (display); 408 set (display);
… …
344 * set any defaults not already set 439 * set any defaults not already set
345 */ 440 */
346 if (cmd_argv && cmd_argv[0]) 441 if (cmd_argv && cmd_argv[0])
347 { 442 {
348 if (!rs[Rs_title]) 443 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 444 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
350 if (!rs[Rs_iconName]) 445 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 446 rs[Rs_iconName] = rs[Rs_title];
352 } 447 }
353 else 448 else
354 { 449 {
… …
392 rs[Rs_cutchars] = CUTCHARS; 487 rs[Rs_cutchars] = CUTCHARS;
393 488
394#ifndef NO_BACKSPACE_KEY 489#ifndef NO_BACKSPACE_KEY
395 if (!rs[Rs_backspace_key]) 490 if (!rs[Rs_backspace_key])
396# ifdef DEFAULT_BACKSPACE 491# ifdef DEFAULT_BACKSPACE
397 key_backspace = DEFAULT_BACKSPACE; 492 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
398# else 493# else
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 494 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
400# endif 495# 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 496#endif
409 497
410#ifndef NO_DELETE_KEY 498#ifndef NO_DELETE_KEY
411 if (!rs[Rs_delete_key]) 499 if (!rs[Rs_delete_key])
412# ifdef DEFAULT_DELETE 500# ifdef DEFAULT_DELETE
413 key_delete = DEFAULT_DELETE; 501 rs[Rs_delete_key] = DEFAULT_DELETE;
414# else 502# else
415 key_delete = "\033[3~"; 503 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 504# endif
425 if (rs[Rs_answerbackstring]) 505#endif
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430 506
431#ifdef HAVE_SCROLLBARS 507#ifdef HAVE_SCROLLBARS
432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 508 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
433#endif 509#endif
434 510
… …
458 color_aliases (Color_fg); 534 color_aliases (Color_fg);
459 color_aliases (Color_bg); 535 color_aliases (Color_bg);
460#ifndef NO_CURSORCOLOR 536#ifndef NO_CURSORCOLOR
461 color_aliases (Color_cursor); 537 color_aliases (Color_cursor);
462 color_aliases (Color_cursor2); 538 color_aliases (Color_cursor2);
463#endif /* NO_CURSORCOLOR */ 539#endif /* NO_CURSORCOLOR */
464 color_aliases (Color_pointer_fg); 540 color_aliases (Color_pointer_fg);
465 color_aliases (Color_pointer_bg); 541 color_aliases (Color_pointer_bg);
466 color_aliases (Color_border); 542 color_aliases (Color_border);
467#ifndef NO_BOLD_UNDERLINE_REVERSE 543#ifndef NO_BOLD_UNDERLINE_REVERSE
468 color_aliases (Color_BD); 544 color_aliases (Color_BD);
469 color_aliases (Color_UL); 545 color_aliases (Color_UL);
470 color_aliases (Color_RV); 546 color_aliases (Color_RV);
471#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 547#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
472 548
473 if (!rs[Rs_color + Color_border]) 549 if (!rs[Rs_color + Color_border])
474 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 550 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
475 551
476 return cmd_argv; 552 return cmd_argv;
… …
479/*----------------------------------------------------------------------*/ 555/*----------------------------------------------------------------------*/
480void 556void
481rxvt_term::init_env () 557rxvt_term::init_env ()
482{ 558{
483 int i; 559 int i;
484 unsigned int u;
485 char *val; 560 char *val;
486 561
487#ifdef DISPLAY_IS_IP 562#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 563 /* 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 564 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
497 */ 572 */
498 val = rxvt_network_display (rs[Rs_display_name]); 573 val = rxvt_network_display (rs[Rs_display_name]);
499 rs[Rs_display_name] = (const char *)val; 574 rs[Rs_display_name] = (const char *)val;
500 575
501 if (val == NULL) 576 if (val == NULL)
502#endif /* DISPLAY_IS_IP */ 577#endif /* DISPLAY_IS_IP */
503 val = XDisplayString (dpy); 578 val = XDisplayString (dpy);
504 579
505 if (rs[Rs_display_name] == NULL) 580 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 581 rs[Rs_display_name] = val; /* use broken `:0' value */
507 582
508 i = strlen (val); 583 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 584 env_display = (char *)rxvt_malloc (i + 9);
510 585
511 sprintf (env_display, "DISPLAY=%s", val); 586 sprintf (env_display, "DISPLAY=%s", val);
512 587
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 588 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
514 589
… …
535 else 610 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 611 putenv ("COLORTERM=" COLORTERMENVFULL);
537 612
538 if (rs[Rs_term_name] != NULL) 613 if (rs[Rs_term_name] != NULL)
539 { 614 {
540 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 615 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 616 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 617 putenv (env_term);
543 } 618 }
544 else 619 else
545 putenv ("TERM=" TERMENV); 620 putenv ("TERM=" TERMENV);
… …
547#ifdef HAVE_UNSETENV 622#ifdef HAVE_UNSETENV
548 /* avoid passing old settings and confusing term size */ 623 /* avoid passing old settings and confusing term size */
549 unsetenv ("LINES"); 624 unsetenv ("LINES");
550 unsetenv ("COLUMNS"); 625 unsetenv ("COLUMNS");
551 unsetenv ("TERMCAP"); /* terminfo should be okay */ 626 unsetenv ("TERMCAP"); /* terminfo should be okay */
552#endif /* HAVE_UNSETENV */ 627#endif /* HAVE_UNSETENV */
553} 628}
554 629
555/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
556/* 631/*
557 * This is more or less stolen straight from XFree86 xterm. 632 * This is more or less stolen straight from XFree86 xterm.
… …
578 653
579 this->locale = "C"; 654 this->locale = "C";
580 } 655 }
581 656
582 657
583 this->locale = rxvt_strdup (this->locale); 658 this->locale = strdup (this->locale);
584 SET_LOCALE (this->locale); 659 SET_LOCALE (this->locale);
585 mbstate.reset (); 660 mbstate.reset ();
586#endif 661#endif
587 662
588#if HAVE_NL_LANGINFO 663#if HAVE_NL_LANGINFO
… …
645 priv_modes |= PrivMode_Keypress; 720 priv_modes |= PrivMode_Keypress;
646 if (!option (Opt_jumpScroll)) 721 if (!option (Opt_jumpScroll))
647 priv_modes |= PrivMode_smoothScroll; 722 priv_modes |= PrivMode_smoothScroll;
648 723
649#ifndef NO_BACKSPACE_KEY 724#ifndef NO_BACKSPACE_KEY
650 if (strcmp (key_backspace, "DEC") == 0) 725 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
651 priv_modes |= PrivMode_HaveBackSpace; 726 priv_modes |= PrivMode_HaveBackSpace;
652#endif 727#endif
653 728
654 /* add value for scrollBar */ 729 /* add value for scrollBar */
655 if (scrollBar.state) 730 if (scrollBar.state)
… …
668 int i; 743 int i;
669 744
670#ifdef OFF_FOCUS_FADING 745#ifdef OFF_FOCUS_FADING
671 pix_colors = pix_colors_focused; 746 pix_colors = pix_colors_focused;
672#endif 747#endif
673 748
674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 749 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
675 { 750 {
676 const char *name = rs[Rs_color + i]; 751 const char *name = rs[Rs_color + i];
677 752
678 if (!name) 753 if (!name)
… …
756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 831 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 cscroll.a) 832 cscroll.a)
758 )) 833 ))
759 alias_color (Color_topShadow, Color_White); 834 alias_color (Color_topShadow, Color_White);
760 } 835 }
761#endif /* KEEP_SCROLLCOLOR */ 836#endif /* KEEP_SCROLLCOLOR */
762 837
763#ifdef OFF_FOCUS_FADING 838#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 839 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i); 840 update_fade_color (i);
766#endif 841#endif
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 849 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 850 {
776 int i = atoi (rs[Rs_color + idx]); 851 int i = atoi (rs[Rs_color + idx]);
777 852
778 if (i >= 8 && i <= 15) 853 if (i >= 8 && i <= 15)
779 { /* bright colors */ 854 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 855 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 856 else if (i >= 0 && i <= 7)
783 } 857 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 858 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 859 }
788} 860}
789 861
790/*----------------------------------------------------------------------*/ 862/*----------------------------------------------------------------------*/
… …
905#if ENABLE_FRILLS 977#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 978 if (option (Opt_borderLess))
907 { 979 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 980 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 981 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 982 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 983 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 984 }
914 else 985 else
915 { 986 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 987 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 988 }
919 } 989 }
920 else
921 mwmhints.flags = 0;
922#endif 990#endif
923 991
924#if ENABLE_XEMBED 992#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 993 if (rs[Rs_embed])
926 { 994 {
… …
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1104 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1105
1038 vt_select_input (); 1106 vt_select_input ();
1039 1107
1040 vt_ev.start (display, vt); 1108 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 1109
1058 /* graphics context for the vt window */ 1110 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1111 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1112 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1113 gcvalue.graphics_exposures = 0;
… …
1170 1222
1171 /* 1223 /*
1172 * Debugging 1224 * Debugging
1173 */ 1225 */
1174#ifdef DEBUG_TTYMODE 1226#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */ 1227 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n"); 1228 fprintf (stderr, "Input flags\n");
1178 1229
1179 /* cpp token stringize doesn't work on all machines <sigh> */ 1230 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \ 1231# define FOO(flag,name) \
… …
1243 FOO (VLNEXT, "VLNEXT"); 1294 FOO (VLNEXT, "VLNEXT");
1244# endif 1295# endif
1245 1296
1246 fprintf (stderr, "\n"); 1297 fprintf (stderr, "\n");
1247# undef FOO 1298# undef FOO
1248# endif /* HAVE_TERMIOS_H */ 1299#endif /* DEBUG_TTYMODE */
1249#endif /* DEBUG_TTYMODE */
1250} 1300}
1251 1301
1252/*----------------------------------------------------------------------*/ 1302/*----------------------------------------------------------------------*/
1253/* 1303/*
1254 * Run the command in a subprocess and return a file descriptor for the 1304 * Run the command in a subprocess and return a file descriptor for the
… …
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1328 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1329
1280 int er; 1330 int er;
1281 1331
1282#ifndef NO_BACKSPACE_KEY 1332#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1333 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1334 er = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1335 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1336 er = '\177'; /* the initial state anyway */
1287 else 1337 else
1288#endif 1338#endif
1289 er = -1; 1339 er = -1;
1290 1340
… …
1357rxvt_term::run_child (const char *const *argv) 1407rxvt_term::run_child (const char *const *argv)
1358{ 1408{
1359 char *login; 1409 char *login;
1360 1410
1361 if (option (Opt_console)) 1411 if (option (Opt_console))
1412 {
1362 { /* be virtual console, fail silently */ 1413 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1414#ifdef TIOCCONS
1364 unsigned int on = 1; 1415 unsigned int on = 1;
1365 1416
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1417 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1418#elif defined (SRIOCSREDIR)
… …
1369 1420
1370 fd = open (CONSOLE, O_WRONLY, 0); 1421 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1422 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1423 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1424 close (fd);
1374#endif /* SRIOCSREDIR */ 1425#endif /* SRIOCSREDIR */
1375 } 1426 }
1376 1427
1377 /* reset signals and spin off the command interpreter */ 1428 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1429 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1430 signal (SIGQUIT, SIG_DFL);
… …
1386 */ 1437 */
1387#ifdef SIGTSTP 1438#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1439 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1440 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1441 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1442#endif /* SIGTSTP */
1392 1443
1393 // unblock signals (signals are blocked by iom.C 1444 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss; 1445 sigset_t ss;
1395 sigemptyset (&ss); 1446 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0); 1447 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1448
1398 /* command interpreter path */ 1449 /* command interpreter path */
1399 if (argv != NULL) 1450 if (argv)
1400 { 1451 {
1401# ifdef DEBUG_CMD 1452# ifdef DEBUG_CMD
1402 int i; 1453 int i;
1403 1454
1404 for (i = 0; argv[i]; i++) 1455 for (i = 0; argv[i]; i++)
… …
1413 const char *argv0, *shell; 1464 const char *argv0, *shell;
1414 1465
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1467 shell = "/bin/sh";
1417 1468
1418 argv0 = (const char *)rxvt_r_basename (shell); 1469 argv0 = (const char *)rxvt_basename (shell);
1419 1470
1420 if (option (Opt_loginShell)) 1471 if (option (Opt_loginShell))
1421 { 1472 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1473 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1474
1424 login[0] = '-'; 1475 login[0] = '-';
1425 strcpy (&login[1], argv0); 1476 strcpy (&login[1], argv0);
1426 argv0 = login; 1477 argv0 = login;
1427 } 1478 }
1428 1479
1429 execlp (shell, argv0, NULL); 1480 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1481 /* no error message: STDERR is closed! */
1431 } 1482 }
1432 1483
1433 return -1; 1484 return -1;
1434} 1485}

Diff Legend

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