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.180 by ayin, Fri Feb 16 21:46:05 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 */
48 "rgb:00/00/00", // 0: black (Black) 154 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 155 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 156 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (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 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 297 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 298 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 299 ncol = 80;
198 nrow = 24; 300 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 301 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 302 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 303 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 304 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 305 numpix_colors = TOTAL_COLORS;
204 306
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 307 refresh_type = SLOW_REFRESH;
207 308
208 oldcursor.row = oldcursor.col = -1; 309 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 310 last_bot = last_state = -1;
311
312 set_option (Opt_scrollBar);
313 set_option (Opt_scrollTtyOutput);
314 set_option (Opt_jumpScroll);
315 set_option (Opt_skipScroll);
316 set_option (Opt_secondaryScreen);
317 set_option (Opt_secondaryScroll);
318 set_option (Opt_pastableTabs);
319 set_option (Opt_intensityStyles);
320 set_option (Opt_iso14755_52);
216 321
217 return true; 322 return true;
218} 323}
219 324
220void 325void
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 335 {
231 /* TODO: BOO HISS */ 336 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 337 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 338 }
234 else if (i > STDIN_FILENO) 339 else if (i != STDIN_FILENO)
235 { 340 {
236 dup2 (i, STDIN_FILENO); 341 dup2 (i, STDIN_FILENO);
237 close (i); 342 close (i);
238 } 343 }
239 344
… …
254/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
255const char ** 360const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 361rxvt_term::init_resources (int argc, const char *const *argv)
257{ 362{
258 int i, r_argc; 363 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 364 const char **cmd_argv, **r_argv;
261 365
262 /* 366 /*
263 * 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
264 */ 368 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 369 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 370 if (!strcmp (argv[r_argc], "-e"))
267 break; 371 break;
268 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
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 388
271 for (i = 0; i < r_argc; i++) 389 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 390 r_argv[i] = (const char *)argv[i];
273 391
274 r_argv[i] = NULL; 392 r_argv[i] = NULL;
275 393
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 394 rs[Rs_name] = rxvt_basename (argv[0]);
289 395
290 /* 396 /*
291 * Open display, get options/resources and create the window 397 * Open display, get options/resources and create the window
292 */ 398 */
293 399
… …
295 rs[Rs_display_name] = ":0"; 401 rs[Rs_display_name] = ":0";
296 402
297 get_options (r_argc, r_argv); 403 get_options (r_argc, r_argv);
298 404
299 if (!(display = displays.get (rs[Rs_display_name]))) 405 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
300 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 }
301 410
302 // using a local pointer decreases code size a lot 411 // using a local pointer decreases code size a lot
303 xa = display->xa; 412 xa = display->xa;
304 413
305 set (display); 414 set (display);
… …
308#if XFT 417#if XFT
309 if (rs[Rs_depth]) 418 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 419 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 420#endif
312 421
422#ifdef HAVE_AFTERIMAGE
423 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
424#endif
313 free (r_argv); 425 free (r_argv);
314 426
315 for (int i = NUM_RESOURCES; i--; ) 427 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 428 if (rs [i] == resval_undef)
317 rs [i] = 0; 429 rs [i] = 0;
… …
333 * set any defaults not already set 445 * set any defaults not already set
334 */ 446 */
335 if (cmd_argv && cmd_argv[0]) 447 if (cmd_argv && cmd_argv[0])
336 { 448 {
337 if (!rs[Rs_title]) 449 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 450 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 451 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 452 rs[Rs_iconName] = rs[Rs_title];
341 } 453 }
342 else 454 else
343 { 455 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 493 rs[Rs_cutchars] = CUTCHARS;
382 494
383#ifndef NO_BACKSPACE_KEY 495#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 496 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 497# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 498 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 499# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 500 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 501# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 502#endif
398 503
399#ifndef NO_DELETE_KEY 504#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 505 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 506# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 507 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 508# else
404 key_delete = "\033[3~"; 509 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 510# endif
414 if (rs[Rs_answerbackstring]) 511#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 512
420#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
421 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]);
422#endif 515#endif
423 516
424#ifdef XTERM_REVERSE_VIDEO 517#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 518 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 519 if (option (Opt_reverseVideo))
427 { 520 {
428 if (!rs[Rs_color + Color_fg]) 521 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 522 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 523
431 if (!rs[Rs_color + Color_bg]) 524 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 530 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 531 rs[Rs_color + i] = def_colorName[i];
439 532
440#ifndef XTERM_REVERSE_VIDEO 533#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 534 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 535 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 536 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 537#endif
445 538
446 /* convenient aliases for setting fg/bg to colors */ 539 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 540 color_aliases (Color_fg);
448 color_aliases (Color_bg); 541 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 548 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 550 color_aliases (Color_BD);
458 color_aliases (Color_UL); 551 color_aliases (Color_UL);
459 color_aliases (Color_RV); 552 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 554
462 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 557
465 return cmd_argv; 558 return cmd_argv;
… …
468/*----------------------------------------------------------------------*/ 561/*----------------------------------------------------------------------*/
469void 562void
470rxvt_term::init_env () 563rxvt_term::init_env ()
471{ 564{
472 int i; 565 int i;
473 unsigned int u;
474 char *val; 566 char *val;
475 567
476#ifdef DISPLAY_IS_IP 568#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 569 /* Fixup display_name for export over pty to any interested terminal
478 * 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
… …
486 */ 578 */
487 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
489 581
490 if (val == NULL) 582 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 584 val = XDisplayString (dpy);
493 585
494 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
496 588
497 i = strlen (val); 589 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 590 env_display = (char *)rxvt_malloc (i + 9);
499 591
500 sprintf (env_display, "DISPLAY=%s", val); 592 sprintf (env_display, "DISPLAY=%s", val);
501 593
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 594 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 595
… …
524 else 616 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 617 putenv ("COLORTERM=" COLORTERMENVFULL);
526 618
527 if (rs[Rs_term_name] != NULL) 619 if (rs[Rs_term_name] != NULL)
528 { 620 {
529 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);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 622 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 623 putenv (env_term);
532 } 624 }
533 else 625 else
534 putenv ("TERM=" TERMENV); 626 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 630 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
542} 634}
543 635
544/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
545/* 637/*
546 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
567 659
568 this->locale = "C"; 660 this->locale = "C";
569 } 661 }
570 662
571 663
572 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
574 mbstate.reset (); 666 mbstate.reset ();
575#endif 667#endif
576 668
577#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 713 * Initialize the command connection.
622 * This should be called after the X server connection is established. 714 * This should be called after the X server connection is established.
623 */ 715 */
624 716
625#ifdef META8_OPTION 717#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 718 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 719#endif
628 720
629 get_ourmods (); 721 get_ourmods ();
630 722
631 if (!OPTION (Opt_scrollTtyOutput)) 723 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 724 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 725 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 726 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 727 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 728 priv_modes |= PrivMode_smoothScroll;
637 729
638#ifndef NO_BACKSPACE_KEY 730#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 731 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 732 priv_modes |= PrivMode_HaveBackSpace;
641#endif 733#endif
642 734
643 /* add value for scrollBar */ 735 /* add value for scrollBar */
644 if (scrollBar.state) 736 if (scrollBar.state)
… …
657 int i; 749 int i;
658 750
659#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
661#endif 753#endif
662 754
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 756 {
665 const char *name = rs[Rs_color + i]; 757 const char *name = rs[Rs_color + i];
666 758
667 if (!name) 759 if (!name)
… …
670 rxvt_color xcol; 762 rxvt_color xcol;
671 763
672 if (!set_color (xcol, name)) 764 if (!set_color (xcol, name))
673 { 765 {
674#ifndef XTERM_REVERSE_VIDEO 766#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 767 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 768 name = def_colorName [1 - i];
677 else 769 else
678#endif 770#endif
679 name = def_colorName [i]; 771 name = def_colorName [i];
680 772
… …
745 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),
746 cscroll.a) 838 cscroll.a)
747 )) 839 ))
748 alias_color (Color_topShadow, Color_White); 840 alias_color (Color_topShadow, Color_White);
749 } 841 }
750#endif /* KEEP_SCROLLCOLOR */ 842#endif /* KEEP_SCROLLCOLOR */
751 843
752#ifdef OFF_FOCUS_FADING 844#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i); 846 update_fade_color (i);
755#endif 847#endif
… …
763 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 855 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764 { 856 {
765 int i = atoi (rs[Rs_color + idx]); 857 int i = atoi (rs[Rs_color + idx]);
766 858
767 if (i >= 8 && i <= 15) 859 if (i >= 8 && i <= 15)
768 { /* bright colors */ 860 /* bright colors */
769 i -= 8;
770 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 861 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771 return; 862 else if (i >= 0 && i <= 7)
772 } 863 /* normal colors */
773
774 if (i >= 0 && i <= 7) /* normal colors */
775 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 864 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776 } 865 }
777} 866}
778 867
779/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 960rxvt_term::create_windows (int argc, const char *const *argv)
872{ 961{
873 XClassHint classHint; 962 XClassHint classHint;
874 XWMHints wmHint; 963 XWMHints wmHint;
875#if ENABLE_FRILLS 964#if ENABLE_FRILLS
876 MWMHints mwmhints; 965 MWMHints mwmhints = { };
877#endif 966#endif
878 XGCValues gcvalue; 967 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 968 XSetWindowAttributes attributes;
880 Window top, parent; 969 Window top, parent;
881 970
… …
887 if (!set_fonts ()) 976 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 978
890 parent = display->root; 979 parent = display->root;
891 980
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 981 attributes.override_redirect = !!option (Opt_override_redirect);
893 982
894#if ENABLE_FRILLS 983#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 984 if (option (Opt_borderLess))
896 { 985 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 986 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 987 {
899 /* 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");
900 attributes.override_redirect = true; 989 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 990 }
903 else 991 else
904 { 992 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 993 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 994 }
908 } 995 }
909 else
910 mwmhints.flags = 0;
911#endif 996#endif
912 997
913#if ENABLE_XEMBED 998#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 999 if (rs[Rs_embed])
915 { 1000 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 1035 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1036 classHint.res_class = (char *)RESCLASS;
952 1037
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1038 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1039 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1040 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1041 wmHint.window_group = top;
957 1042
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1043 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1044 &szHint, &wmHint, &classHint);
960 1045
… …
1017 attributes.bit_gravity = NorthWestGravity; 1102 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1103 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1104
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1105 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1106
1022 if (OPTION (Opt_pointerBlank)) 1107 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1108 vt_emask |= PointerMotionMask;
1024 else 1109 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1111
1027 vt_select_input (); 1112 vt_select_input ();
1028 1113
1029 vt_ev.start (display, vt); 1114 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1115
1048 /* graphics context for the vt window */ 1116 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1117 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1118 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1119 gcvalue.graphics_exposures = 0;
… …
1160 1228
1161 /* 1229 /*
1162 * Debugging 1230 * Debugging
1163 */ 1231 */
1164#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1165#ifdef HAVE_TERMIOS_H
1166 /* c_iflag bits */ 1233 /* c_iflag bits */
1167 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1168 1235
1169 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1170# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1233 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1234# endif 1301# endif
1235 1302
1236 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1237# undef FOO 1304# undef FOO
1238# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1239#endif /* DEBUG_TTYMODE */
1240} 1306}
1241 1307
1242/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1243/* 1309/*
1244 * 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
… …
1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269 1335
1270 int er; 1336 int er;
1271 1337
1272#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1273 if (key_backspace[0] && !key_backspace[1]) 1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274 er = key_backspace[0]; 1340 er = rs[Rs_backspace_key][0];
1275 else if (strcmp (key_backspace, "DEC") == 0) 1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1277 else 1343 else
1278#endif 1344#endif
1279 er = -1; 1345 er = -1;
1280 1346
… …
1322 } 1388 }
1323 1389
1324 _exit (EXIT_FAILURE); 1390 _exit (EXIT_FAILURE);
1325 1391
1326 default: 1392 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1393 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1394 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1395
1330 pty->close_tty (); 1396 pty->close_tty ();
1331 1397
1332 child_ev.start (cmd_pid); 1398 child_ev.start (cmd_pid);
1333 1399
… …
1346int 1412int
1347rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1348{ 1414{
1349 char *login; 1415 char *login;
1350 1416
1351 if (OPTION (Opt_console)) 1417 if (option (Opt_console))
1418 {
1352 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1420#ifdef TIOCCONS
1354 unsigned int on = 1; 1421 unsigned int on = 1;
1355 1422
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1357#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1359 1426
1360 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1361 if (fd >= 0) 1428 if (fd >= 0)
1362 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1363 close (fd); 1430 close (fd);
1364#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1365 } 1432 }
1366 1433
1367 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1368 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1369 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1376 */ 1443 */
1377#ifdef SIGTSTP 1444#ifdef SIGTSTP
1378 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1379 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1380 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1381#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1382 1449
1383 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1384 sigset_t ss; 1451 sigset_t ss;
1385 sigemptyset (&ss); 1452 sigemptyset (&ss);
1386 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1387 1454
1388 /* command interpreter path */ 1455 /* command interpreter path */
1389 if (argv != NULL) 1456 if (argv)
1390 { 1457 {
1391# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1392 int i; 1459 int i;
1393 1460
1394 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1403 const char *argv0, *shell; 1470 const char *argv0, *shell;
1404 1471
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1407 1474
1408 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1409 1476
1410 if (OPTION (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1411 { 1478 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413 1480
1414 login[0] = '-'; 1481 login[0] = '-';
1415 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1416 argv0 = login; 1483 argv0 = login;
1417 } 1484 }
1418 1485
1419 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1420 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1421 } 1488 }
1422 1489
1423 return -1; 1490 return -1;
1424} 1491}

Diff Legend

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