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.185 by ayin, Sat Jun 9 08:12:38 2007 UTC vs.
Revision 1.226 by ayin, Tue Dec 11 17:42:04 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
… …
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);
320 set_option (Opt_iso14755_52);
223 321
224 return true; 322 return true;
225} 323}
226 324
227void 325void
… …
236 if ((i = open ("/dev/null", O_RDONLY)) < 0) 334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 { 335 {
238 /* TODO: BOO HISS */ 336 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO); 337 dup2 (STDERR_FILENO, STDIN_FILENO);
240 } 338 }
241 else if (i > STDIN_FILENO) 339 else if (i != STDIN_FILENO)
242 { 340 {
243 dup2 (i, STDIN_FILENO); 341 dup2 (i, STDIN_FILENO);
244 close (i); 342 close (i);
245 } 343 }
246 344
… …
261/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
262const char ** 360const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 361rxvt_term::init_resources (int argc, const char *const *argv)
264{ 362{
265 int i, r_argc; 363 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 364 const char **cmd_argv, **r_argv;
268 365
269 /* 366 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 367 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 368 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 369 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 370 if (!strcmp (argv[r_argc], "-e"))
274 break; 371 break;
275 372
373 if (r_argc == argc)
374 cmd_argv = NULL;
375 else if (!argv[r_argc + 1])
376 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
377 else
378 {
379 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
380
381 for (i = 0; i < argc - r_argc - 1; i++)
382 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
383
384 cmd_argv[i] = NULL;
385 }
386
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 388
278 for (i = 0; i < r_argc; i++) 389 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 390 r_argv[i] = (const char *)argv[i];
280 391
281 r_argv[i] = NULL; 392 r_argv[i] = NULL;
282 393
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 394 rs[Rs_name] = rxvt_basename (argv[0]);
296 395
297 /* 396 /*
298 * Open display, get options/resources and create the window 397 * Open display, get options/resources and create the window
299 */ 398 */
300 399
… …
302 rs[Rs_display_name] = ":0"; 401 rs[Rs_display_name] = ":0";
303 402
304 get_options (r_argc, r_argv); 403 get_options (r_argc, r_argv);
305 404
306 if (!(display = displays.get (rs[Rs_display_name]))) 405 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 408 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
409 }
308 410
309 // using a local pointer decreases code size a lot 411 // using a local pointer decreases code size a lot
310 xa = display->xa; 412 xa = display->xa;
311 413
312 set (display); 414 set (display);
… …
315#if XFT 417#if XFT
316 if (rs[Rs_depth]) 418 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 419 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 420#endif
319 421
422#ifdef HAVE_AFTERIMAGE
423 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
424#endif
320 free (r_argv); 425 free (r_argv);
321 426
322 for (int i = NUM_RESOURCES; i--; ) 427 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 428 if (rs [i] == resval_undef)
324 rs [i] = 0; 429 rs [i] = 0;
… …
340 * set any defaults not already set 445 * set any defaults not already set
341 */ 446 */
342 if (cmd_argv && cmd_argv[0]) 447 if (cmd_argv && cmd_argv[0])
343 { 448 {
344 if (!rs[Rs_title]) 449 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 450 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346 if (!rs[Rs_iconName]) 451 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 452 rs[Rs_iconName] = rs[Rs_title];
348 } 453 }
349 else 454 else
350 { 455 {
… …
388 rs[Rs_cutchars] = CUTCHARS; 493 rs[Rs_cutchars] = CUTCHARS;
389 494
390#ifndef NO_BACKSPACE_KEY 495#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 496 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 497# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 498 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 499# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 500 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 501# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 502#endif
405 503
406#ifndef NO_DELETE_KEY 504#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 505 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 506# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 507 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 508# else
411 key_delete = "\033[3~"; 509 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 510# endif
421 if (rs[Rs_answerbackstring]) 511#endif
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426 512
427#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 514 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 515#endif
430 516
… …
454 color_aliases (Color_fg); 540 color_aliases (Color_fg);
455 color_aliases (Color_bg); 541 color_aliases (Color_bg);
456#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
457 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
458 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
459#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
460 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
461 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
462 color_aliases (Color_border); 548 color_aliases (Color_border);
463#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
464 color_aliases (Color_BD); 550 color_aliases (Color_BD);
465 color_aliases (Color_UL); 551 color_aliases (Color_UL);
466 color_aliases (Color_RV); 552 color_aliases (Color_RV);
467#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468 554
469 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
470 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471 557
472 return cmd_argv; 558 return cmd_argv;
… …
475/*----------------------------------------------------------------------*/ 561/*----------------------------------------------------------------------*/
476void 562void
477rxvt_term::init_env () 563rxvt_term::init_env ()
478{ 564{
479 int i; 565 int i;
480 unsigned int u;
481 char *val; 566 char *val;
482 567
483#ifdef DISPLAY_IS_IP 568#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 569 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 570 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
493 */ 578 */
494 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
495 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
496 581
497 if (val == NULL) 582 if (val == NULL)
498#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
499 val = XDisplayString (dpy); 584 val = XDisplayString (dpy);
500 585
501 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
503 588
504 i = strlen (val); 589 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 590 env_display = (char *)rxvt_malloc (i + 9);
506 591
507 sprintf (env_display, "DISPLAY=%s", val); 592 sprintf (env_display, "DISPLAY=%s", val);
508 593
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 594 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 595
… …
531 else 616 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 617 putenv ("COLORTERM=" COLORTERMENVFULL);
533 618
534 if (rs[Rs_term_name] != NULL) 619 if (rs[Rs_term_name] != NULL)
535 { 620 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 621 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 622 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 623 putenv (env_term);
539 } 624 }
540 else 625 else
541 putenv ("TERM=" TERMENV); 626 putenv ("TERM=" TERMENV);
… …
543#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
544 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
545 unsetenv ("LINES"); 630 unsetenv ("LINES");
546 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
547 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
548#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
549} 634}
550 635
551/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
552/* 637/*
553 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
574 659
575 this->locale = "C"; 660 this->locale = "C";
576 } 661 }
577 662
578 663
579 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
580 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
581 mbstate.reset (); 666 mbstate.reset ();
582#endif 667#endif
583 668
584#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
641 priv_modes |= PrivMode_Keypress; 726 priv_modes |= PrivMode_Keypress;
642 if (!option (Opt_jumpScroll)) 727 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 728 priv_modes |= PrivMode_smoothScroll;
644 729
645#ifndef NO_BACKSPACE_KEY 730#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 731 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 732 priv_modes |= PrivMode_HaveBackSpace;
648#endif 733#endif
649 734
650 /* add value for scrollBar */ 735 /* add value for scrollBar */
651 if (scrollBar.state) 736 if (scrollBar.state)
… …
664 int i; 749 int i;
665 750
666#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
667 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
668#endif 753#endif
669 754
670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671 { 756 {
672 const char *name = rs[Rs_color + i]; 757 const char *name = rs[Rs_color + i];
673 758
674 if (!name) 759 if (!name)
… …
752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753 cscroll.a) 838 cscroll.a)
754 )) 839 ))
755 alias_color (Color_topShadow, Color_White); 840 alias_color (Color_topShadow, Color_White);
756 } 841 }
757#endif /* KEEP_SCROLLCOLOR */ 842#endif /* KEEP_SCROLLCOLOR */
758 843
759#ifdef OFF_FOCUS_FADING 844#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i); 846 update_fade_color (i);
762#endif 847#endif
… …
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 855 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 856 {
772 int i = atoi (rs[Rs_color + idx]); 857 int i = atoi (rs[Rs_color + idx]);
773 858
774 if (i >= 8 && i <= 15) 859 if (i >= 8 && i <= 15)
775 { /* bright colors */ 860 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 861 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 862 else if (i >= 0 && i <= 7)
779 } 863 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 864 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 865 }
784} 866}
785 867
786/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 960rxvt_term::create_windows (int argc, const char *const *argv)
879{ 961{
880 XClassHint classHint; 962 XClassHint classHint;
881 XWMHints wmHint; 963 XWMHints wmHint;
882#if ENABLE_FRILLS 964#if ENABLE_FRILLS
883 MWMHints mwmhints; 965 MWMHints mwmhints = { };
884#endif 966#endif
885 XGCValues gcvalue; 967 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 968 XSetWindowAttributes attributes;
887 Window top, parent; 969 Window top, parent;
888 970
… …
901#if ENABLE_FRILLS 983#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 984 if (option (Opt_borderLess))
903 { 985 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 986 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 987 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 988 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 989 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 990 }
910 else 991 else
911 { 992 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 993 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 994 }
915 } 995 }
916 else
917 mwmhints.flags = 0;
918#endif 996#endif
919 997
920#if ENABLE_XEMBED 998#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 999 if (rs[Rs_embed])
922 { 1000 {
… …
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1111
1034 vt_select_input (); 1112 vt_select_input ();
1035 1113
1036 vt_ev.start (display, vt); 1114 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1041 && !option (Opt_transparent)
1042#endif
1043 )
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 1115
1058 /* graphics context for the vt window */ 1116 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1117 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1118 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1119 gcvalue.graphics_exposures = 0;
… …
1170 1228
1171 /* 1229 /*
1172 * Debugging 1230 * Debugging
1173 */ 1231 */
1174#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */ 1233 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1178 1235
1179 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1243 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1244# endif 1301# endif
1245 1302
1246 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1247# undef FOO 1304# undef FOO
1248# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1249#endif /* DEBUG_TTYMODE */
1250} 1306}
1251 1307
1252/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1253/* 1309/*
1254 * 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
… …
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1335
1280 int er; 1336 int er;
1281 1337
1282#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1340 er = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1287 else 1343 else
1288#endif 1344#endif
1289 er = -1; 1345 er = -1;
1290 1346
… …
1357rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1358{ 1414{
1359 char *login; 1415 char *login;
1360 1416
1361 if (option (Opt_console)) 1417 if (option (Opt_console))
1418 {
1362 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1420#ifdef TIOCCONS
1364 unsigned int on = 1; 1421 unsigned int on = 1;
1365 1422
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1369 1426
1370 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1428 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1430 close (fd);
1374#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1375 } 1432 }
1376 1433
1377 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1386 */ 1443 */
1387#ifdef SIGTSTP 1444#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1392 1449
1393 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss; 1451 sigset_t ss;
1395 sigemptyset (&ss); 1452 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1454
1398 /* command interpreter path */ 1455 /* command interpreter path */
1399 if (argv != NULL) 1456 if (argv)
1400 { 1457 {
1401# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1402 int i; 1459 int i;
1403 1460
1404 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1413 const char *argv0, *shell; 1470 const char *argv0, *shell;
1414 1471
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1417 1474
1418 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1419 1476
1420 if (option (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1421 { 1478 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1480
1424 login[0] = '-'; 1481 login[0] = '-';
1425 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1426 argv0 = login; 1483 argv0 = login;
1427 } 1484 }
1428 1485
1429 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1431 } 1488 }
1432 1489
1433 return -1; 1490 return -1;
1434} 1491}

Diff Legend

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