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.188 by root, Mon Jun 18 13:38:12 2007 UTC vs.
Revision 1.232 by sasha, Tue Dec 18 15:44:55 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
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif 290#endif
191 291
192 MEvent.time = CurrentTime; 292 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 293 MEvent.button = AnyButton;
194 want_refresh = 1; 294 want_refresh = 1;
… …
197 nrow = 24; 297 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 298 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 299 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 300 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 301 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 302
204 refresh_type = SLOW_REFRESH; 303 refresh_type = SLOW_REFRESH;
205 304
206 oldcursor.row = oldcursor.col = -1; 305 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; 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);
… …
316#if XFT 411#if XFT
317 if (rs[Rs_depth]) 412 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 413 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 414#endif
320 415
416#ifdef HAVE_AFTERIMAGE
417 set_application_name ((char*)rs[Rs_name]);
418 set_output_threshold (OUTPUT_LEVEL_WARNING);
419 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
420#endif
321 free (r_argv); 421 free (r_argv);
322 422
323 for (int i = NUM_RESOURCES; i--; ) 423 for (int i = NUM_RESOURCES; i--; )
324 if (rs [i] == resval_undef) 424 if (rs [i] == resval_undef)
325 rs [i] = 0; 425 rs [i] = 0;
… …
341 * set any defaults not already set 441 * set any defaults not already set
342 */ 442 */
343 if (cmd_argv && cmd_argv[0]) 443 if (cmd_argv && cmd_argv[0])
344 { 444 {
345 if (!rs[Rs_title]) 445 if (!rs[Rs_title])
346 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 446 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
347 if (!rs[Rs_iconName]) 447 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_title]; 448 rs[Rs_iconName] = rs[Rs_title];
349 } 449 }
350 else 450 else
351 { 451 {
… …
389 rs[Rs_cutchars] = CUTCHARS; 489 rs[Rs_cutchars] = CUTCHARS;
390 490
391#ifndef NO_BACKSPACE_KEY 491#ifndef NO_BACKSPACE_KEY
392 if (!rs[Rs_backspace_key]) 492 if (!rs[Rs_backspace_key])
393# ifdef DEFAULT_BACKSPACE 493# ifdef DEFAULT_BACKSPACE
394 key_backspace = DEFAULT_BACKSPACE; 494 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
395# else 495# else
396 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 496 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
397# endif 497# 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 498#endif
406 499
407#ifndef NO_DELETE_KEY 500#ifndef NO_DELETE_KEY
408 if (!rs[Rs_delete_key]) 501 if (!rs[Rs_delete_key])
409# ifdef DEFAULT_DELETE 502# ifdef DEFAULT_DELETE
410 key_delete = DEFAULT_DELETE; 503 rs[Rs_delete_key] = DEFAULT_DELETE;
411# else 504# else
412 key_delete = "\033[3~"; 505 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 506# endif
422 if (rs[Rs_answerbackstring]) 507#endif
423 {
424 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
425 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
426 }
427 508
428#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
429 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 510 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
430#endif 511#endif
431 512
… …
455 color_aliases (Color_fg); 536 color_aliases (Color_fg);
456 color_aliases (Color_bg); 537 color_aliases (Color_bg);
457#ifndef NO_CURSORCOLOR 538#ifndef NO_CURSORCOLOR
458 color_aliases (Color_cursor); 539 color_aliases (Color_cursor);
459 color_aliases (Color_cursor2); 540 color_aliases (Color_cursor2);
460#endif /* NO_CURSORCOLOR */ 541#endif /* NO_CURSORCOLOR */
461 color_aliases (Color_pointer_fg); 542 color_aliases (Color_pointer_fg);
462 color_aliases (Color_pointer_bg); 543 color_aliases (Color_pointer_bg);
463 color_aliases (Color_border); 544 color_aliases (Color_border);
464#ifndef NO_BOLD_UNDERLINE_REVERSE 545#ifndef NO_BOLD_UNDERLINE_REVERSE
465 color_aliases (Color_BD); 546 color_aliases (Color_BD);
466 color_aliases (Color_UL); 547 color_aliases (Color_UL);
467 color_aliases (Color_RV); 548 color_aliases (Color_RV);
468#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 549#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
469 550
470 if (!rs[Rs_color + Color_border]) 551 if (!rs[Rs_color + Color_border])
471 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 552 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
472 553
473 return cmd_argv; 554 return cmd_argv;
… …
476/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
477void 558void
478rxvt_term::init_env () 559rxvt_term::init_env ()
479{ 560{
480 int i; 561 int i;
481 unsigned int u;
482 char *val; 562 char *val;
483 563
484#ifdef DISPLAY_IS_IP 564#ifdef DISPLAY_IS_IP
485 /* Fixup display_name for export over pty to any interested terminal 565 /* 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 566 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
494 */ 574 */
495 val = rxvt_network_display (rs[Rs_display_name]); 575 val = rxvt_network_display (rs[Rs_display_name]);
496 rs[Rs_display_name] = (const char *)val; 576 rs[Rs_display_name] = (const char *)val;
497 577
498 if (val == NULL) 578 if (val == NULL)
499#endif /* DISPLAY_IS_IP */ 579#endif /* DISPLAY_IS_IP */
500 val = XDisplayString (dpy); 580 val = XDisplayString (dpy);
501 581
502 if (rs[Rs_display_name] == NULL) 582 if (rs[Rs_display_name] == NULL)
503 rs[Rs_display_name] = val; /* use broken `:0' value */ 583 rs[Rs_display_name] = val; /* use broken `:0' value */
504 584
505 i = strlen (val); 585 i = strlen (val);
506 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 586 env_display = (char *)rxvt_malloc (i + 9);
507 587
508 sprintf (env_display, "DISPLAY=%s", val); 588 sprintf (env_display, "DISPLAY=%s", val);
509 589
510 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 590 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
511 591
… …
532 else 612 else
533 putenv ("COLORTERM=" COLORTERMENVFULL); 613 putenv ("COLORTERM=" COLORTERMENVFULL);
534 614
535 if (rs[Rs_term_name] != NULL) 615 if (rs[Rs_term_name] != NULL)
536 { 616 {
537 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 617 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
538 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 618 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
539 putenv (env_term); 619 putenv (env_term);
540 } 620 }
541 else 621 else
542 putenv ("TERM=" TERMENV); 622 putenv ("TERM=" TERMENV);
… …
544#ifdef HAVE_UNSETENV 624#ifdef HAVE_UNSETENV
545 /* avoid passing old settings and confusing term size */ 625 /* avoid passing old settings and confusing term size */
546 unsetenv ("LINES"); 626 unsetenv ("LINES");
547 unsetenv ("COLUMNS"); 627 unsetenv ("COLUMNS");
548 unsetenv ("TERMCAP"); /* terminfo should be okay */ 628 unsetenv ("TERMCAP"); /* terminfo should be okay */
549#endif /* HAVE_UNSETENV */ 629#endif /* HAVE_UNSETENV */
550} 630}
551 631
552/*----------------------------------------------------------------------*/ 632/*----------------------------------------------------------------------*/
553/* 633/*
554 * This is more or less stolen straight from XFree86 xterm. 634 * This is more or less stolen straight from XFree86 xterm.
… …
575 655
576 this->locale = "C"; 656 this->locale = "C";
577 } 657 }
578 658
579 659
580 this->locale = rxvt_strdup (this->locale); 660 this->locale = strdup (this->locale);
581 SET_LOCALE (this->locale); 661 SET_LOCALE (this->locale);
582 mbstate.reset (); 662 mbstate.reset ();
583#endif 663#endif
584 664
585#if HAVE_NL_LANGINFO 665#if HAVE_NL_LANGINFO
… …
642 priv_modes |= PrivMode_Keypress; 722 priv_modes |= PrivMode_Keypress;
643 if (!option (Opt_jumpScroll)) 723 if (!option (Opt_jumpScroll))
644 priv_modes |= PrivMode_smoothScroll; 724 priv_modes |= PrivMode_smoothScroll;
645 725
646#ifndef NO_BACKSPACE_KEY 726#ifndef NO_BACKSPACE_KEY
647 if (strcmp (key_backspace, "DEC") == 0) 727 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
648 priv_modes |= PrivMode_HaveBackSpace; 728 priv_modes |= PrivMode_HaveBackSpace;
649#endif 729#endif
650 730
651 /* add value for scrollBar */ 731 /* add value for scrollBar */
652 if (scrollBar.state) 732 if (scrollBar.state)
… …
665 int i; 745 int i;
666 746
667#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
668 pix_colors = pix_colors_focused; 748 pix_colors = pix_colors_focused;
669#endif 749#endif
670 750
671 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 751 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
672 { 752 {
673 const char *name = rs[Rs_color + i]; 753 const char *name = rs[Rs_color + i];
674 754
675 if (!name) 755 if (!name)
… …
753 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 833 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
754 cscroll.a) 834 cscroll.a)
755 )) 835 ))
756 alias_color (Color_topShadow, Color_White); 836 alias_color (Color_topShadow, Color_White);
757 } 837 }
758#endif /* KEEP_SCROLLCOLOR */ 838#endif /* KEEP_SCROLLCOLOR */
759 839
760#ifdef OFF_FOCUS_FADING 840#ifdef OFF_FOCUS_FADING
761 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 841 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
762 update_fade_color (i); 842 update_fade_color (i);
763#endif 843#endif
… …
771 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 851 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772 { 852 {
773 int i = atoi (rs[Rs_color + idx]); 853 int i = atoi (rs[Rs_color + idx]);
774 854
775 if (i >= 8 && i <= 15) 855 if (i >= 8 && i <= 15)
776 { /* bright colors */ 856 /* bright colors */
777 i -= 8;
778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 857 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779 return; 858 else if (i >= 0 && i <= 7)
780 } 859 /* normal colors */
781
782 if (i >= 0 && i <= 7) /* normal colors */
783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 860 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784 } 861 }
785} 862}
786 863
787/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 956rxvt_term::create_windows (int argc, const char *const *argv)
880{ 957{
881 XClassHint classHint; 958 XClassHint classHint;
882 XWMHints wmHint; 959 XWMHints wmHint;
883#if ENABLE_FRILLS 960#if ENABLE_FRILLS
884 MWMHints mwmhints; 961 MWMHints mwmhints = { };
885#endif 962#endif
886 XGCValues gcvalue; 963 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 964 XSetWindowAttributes attributes;
888 Window top, parent; 965 Window top, parent;
889 966
… …
902#if ENABLE_FRILLS 979#if ENABLE_FRILLS
903 if (option (Opt_borderLess)) 980 if (option (Opt_borderLess))
904 { 981 {
905 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 982 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 983 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 984 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908 attributes.override_redirect = true; 985 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 986 }
911 else 987 else
912 { 988 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 989 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 990 }
916 } 991 }
917 else
918 mwmhints.flags = 0;
919#endif 992#endif
920 993
921#if ENABLE_XEMBED 994#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 995 if (rs[Rs_embed])
923 { 996 {
… …
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1106 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1107
1035 vt_select_input (); 1108 vt_select_input ();
1036 1109
1037 vt_ev.start (display, vt); 1110 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 1111
1059 /* graphics context for the vt window */ 1112 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1113 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1114 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 0; 1115 gcvalue.graphics_exposures = 0;
… …
1171 1224
1172 /* 1225 /*
1173 * Debugging 1226 * Debugging
1174 */ 1227 */
1175#ifdef DEBUG_TTYMODE 1228#ifdef DEBUG_TTYMODE
1176#ifdef HAVE_TERMIOS_H
1177 /* c_iflag bits */ 1229 /* c_iflag bits */
1178 fprintf (stderr, "Input flags\n"); 1230 fprintf (stderr, "Input flags\n");
1179 1231
1180 /* cpp token stringize doesn't work on all machines <sigh> */ 1232 /* cpp token stringize doesn't work on all machines <sigh> */
1181# define FOO(flag,name) \ 1233# define FOO(flag,name) \
… …
1244 FOO (VLNEXT, "VLNEXT"); 1296 FOO (VLNEXT, "VLNEXT");
1245# endif 1297# endif
1246 1298
1247 fprintf (stderr, "\n"); 1299 fprintf (stderr, "\n");
1248# undef FOO 1300# undef FOO
1249# endif /* HAVE_TERMIOS_H */ 1301#endif /* DEBUG_TTYMODE */
1250#endif /* DEBUG_TTYMODE */
1251} 1302}
1252 1303
1253/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1254/* 1305/*
1255 * Run the command in a subprocess and return a file descriptor for the 1306 * Run the command in a subprocess and return a file descriptor for the
… …
1279 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1280 1331
1281 int er; 1332 int er;
1282 1333
1283#ifndef NO_BACKSPACE_KEY 1334#ifndef NO_BACKSPACE_KEY
1284 if (key_backspace[0] && !key_backspace[1]) 1335 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1285 er = key_backspace[0]; 1336 er = rs[Rs_backspace_key][0];
1286 else if (strcmp (key_backspace, "DEC") == 0) 1337 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1287 er = '\177'; /* the initial state anyway */ 1338 er = '\177'; /* the initial state anyway */
1288 else 1339 else
1289#endif 1340#endif
1290 er = -1; 1341 er = -1;
1291 1342
… …
1358rxvt_term::run_child (const char *const *argv) 1409rxvt_term::run_child (const char *const *argv)
1359{ 1410{
1360 char *login; 1411 char *login;
1361 1412
1362 if (option (Opt_console)) 1413 if (option (Opt_console))
1414 {
1363 { /* be virtual console, fail silently */ 1415 /* be virtual console, fail silently */
1364#ifdef TIOCCONS 1416#ifdef TIOCCONS
1365 unsigned int on = 1; 1417 unsigned int on = 1;
1366 1418
1367 ioctl (STDIN_FILENO, TIOCCONS, &on); 1419 ioctl (STDIN_FILENO, TIOCCONS, &on);
1368#elif defined (SRIOCSREDIR) 1420#elif defined (SRIOCSREDIR)
… …
1370 1422
1371 fd = open (CONSOLE, O_WRONLY, 0); 1423 fd = open (CONSOLE, O_WRONLY, 0);
1372 if (fd >= 0) 1424 if (fd >= 0)
1373 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1425 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1374 close (fd); 1426 close (fd);
1375#endif /* SRIOCSREDIR */ 1427#endif /* SRIOCSREDIR */
1376 } 1428 }
1377 1429
1378 /* reset signals and spin off the command interpreter */ 1430 /* reset signals and spin off the command interpreter */
1379 signal (SIGINT, SIG_DFL); 1431 signal (SIGINT, SIG_DFL);
1380 signal (SIGQUIT, SIG_DFL); 1432 signal (SIGQUIT, SIG_DFL);
… …
1387 */ 1439 */
1388#ifdef SIGTSTP 1440#ifdef SIGTSTP
1389 signal (SIGTSTP, SIG_IGN); 1441 signal (SIGTSTP, SIG_IGN);
1390 signal (SIGTTIN, SIG_IGN); 1442 signal (SIGTTIN, SIG_IGN);
1391 signal (SIGTTOU, SIG_IGN); 1443 signal (SIGTTOU, SIG_IGN);
1392#endif /* SIGTSTP */ 1444#endif /* SIGTSTP */
1393 1445
1394 // unblock signals (signals are blocked by iom.C 1446 // unblock signals (signals are blocked by iom.C
1395 sigset_t ss; 1447 sigset_t ss;
1396 sigemptyset (&ss); 1448 sigemptyset (&ss);
1397 sigprocmask (SIG_SETMASK, &ss, 0); 1449 sigprocmask (SIG_SETMASK, &ss, 0);
1398 1450
1399 /* command interpreter path */ 1451 /* command interpreter path */
1400 if (argv != NULL) 1452 if (argv)
1401 { 1453 {
1402# ifdef DEBUG_CMD 1454# ifdef DEBUG_CMD
1403 int i; 1455 int i;
1404 1456
1405 for (i = 0; argv[i]; i++) 1457 for (i = 0; argv[i]; i++)
… …
1414 const char *argv0, *shell; 1466 const char *argv0, *shell;
1415 1467
1416 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1468 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1417 shell = "/bin/sh"; 1469 shell = "/bin/sh";
1418 1470
1419 argv0 = (const char *)rxvt_r_basename (shell); 1471 argv0 = (const char *)rxvt_basename (shell);
1420 1472
1421 if (option (Opt_loginShell)) 1473 if (option (Opt_loginShell))
1422 { 1474 {
1423 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1475 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1424 1476
1425 login[0] = '-'; 1477 login[0] = '-';
1426 strcpy (&login[1], argv0); 1478 strcpy (&login[1], argv0);
1427 argv0 = login; 1479 argv0 = login;
1428 } 1480 }
1429 1481
1430 execlp (shell, argv0, NULL); 1482 execlp (shell, argv0, (char *)0);
1431 /* no error message: STDERR is closed! */ 1483 /* no error message: STDERR is closed! */
1432 } 1484 }
1433 1485
1434 return -1; 1486 return -1;
1435} 1487}

Diff Legend

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