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.176 by root, Sat Jan 20 00:40:23 2007 UTC vs.
Revision 1.224 by ayin, Mon Nov 26 11:20:16 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#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 */
48 "rgb:00/00/00", // 0: black (Black) 152 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 153 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (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
… …
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 291
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 292
192 MEvent.time = CurrentTime; 293 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 294 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 295 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 296 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 297 ncol = 80;
198 nrow = 24; 298 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 299 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 300 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 301 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 302 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
204 304
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
207 306
208 oldcursor.row = oldcursor.col = -1; 307 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 308 last_bot = last_state = -1;
309
310 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52);
216 319
217 return true; 320 return true;
218} 321}
219 322
220void 323void
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 333 {
231 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 336 }
234 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
235 { 338 {
236 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
237 close (i); 340 close (i);
238 } 341 }
239 342
… …
254/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
255const char ** 358const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 359rxvt_term::init_resources (int argc, const char *const *argv)
257{ 360{
258 int i, r_argc; 361 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 362 const char **cmd_argv, **r_argv;
261 363
262 /* 364 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 365 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 366 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 368 if (!strcmp (argv[r_argc], "-e"))
267 break; 369 break;
268 370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
384
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 386
271 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
273 389
274 r_argv[i] = NULL; 390 r_argv[i] = NULL;
275 391
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]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
289 393
290 /* 394 /*
291 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
292 */ 396 */
293 397
… …
295 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
296 400
297 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
298 402
299 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 406 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
407 }
301 408
302 // using a local pointer decreases code size a lot 409 // using a local pointer decreases code size a lot
303 xa = display->xa; 410 xa = display->xa;
304 411
305 set (display); 412 set (display);
… …
308#if XFT 415#if XFT
309 if (rs[Rs_depth]) 416 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 417 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 418#endif
312 419
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
313 free (r_argv); 423 free (r_argv);
314 424
315 for (int i = NUM_RESOURCES; i--; ) 425 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 426 if (rs [i] == resval_undef)
317 rs [i] = 0; 427 rs [i] = 0;
… …
333 * set any defaults not already set 443 * set any defaults not already set
334 */ 444 */
335 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
336 { 446 {
337 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
341 } 451 }
342 else 452 else
343 { 453 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
382 492
383#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 497# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 499# 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 500#endif
398 501
399#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 506# else
404 key_delete = "\033[3~"; 507 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 508# endif
414 if (rs[Rs_answerbackstring]) 509#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 510
420#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 513#endif
423 514
424#ifdef XTERM_REVERSE_VIDEO 515#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 516 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 517 if (option (Opt_reverseVideo))
427 { 518 {
428 if (!rs[Rs_color + Color_fg]) 519 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 520 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 521
431 if (!rs[Rs_color + Color_bg]) 522 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 528 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 529 rs[Rs_color + i] = def_colorName[i];
439 530
440#ifndef XTERM_REVERSE_VIDEO 531#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 532 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 533 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 534 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 535#endif
445 536
446 /* convenient aliases for setting fg/bg to colors */ 537 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 538 color_aliases (Color_fg);
448 color_aliases (Color_bg); 539 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 546 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 548 color_aliases (Color_BD);
458 color_aliases (Color_UL); 549 color_aliases (Color_UL);
459 color_aliases (Color_RV); 550 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 552
462 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 555
465 return cmd_argv; 556 return cmd_argv;
… …
468/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
469void 560void
470rxvt_term::init_env () 561rxvt_term::init_env ()
471{ 562{
472 int i; 563 int i;
473 unsigned int u;
474 char *val; 564 char *val;
475 565
476#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 567 /* 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 568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 576 */
487 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
489 579
490 if (val == NULL) 580 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
493 583
494 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
496 586
497 i = strlen (val); 587 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
499 589
500 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
501 591
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 593
… …
524 else 614 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
526 616
527 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
528 { 618 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 619 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 621 putenv (env_term);
532 } 622 }
533 else 623 else
534 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 628 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
542} 632}
543 633
544/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
545/* 635/*
546 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
… …
567 657
568 this->locale = "C"; 658 this->locale = "C";
569 } 659 }
570 660
571 661
572 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
574 mbstate.reset (); 664 mbstate.reset ();
575#endif 665#endif
576 666
577#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 711 * Initialize the command connection.
622 * This should be called after the X server connection is established. 712 * This should be called after the X server connection is established.
623 */ 713 */
624 714
625#ifdef META8_OPTION 715#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 716 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 717#endif
628 718
629 get_ourmods (); 719 get_ourmods ();
630 720
631 if (!OPTION (Opt_scrollTtyOutput)) 721 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 722 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 723 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
637 727
638#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
641#endif 731#endif
642 732
643 /* add value for scrollBar */ 733 /* add value for scrollBar */
644 if (scrollBar.state) 734 if (scrollBar.state)
… …
657 int i; 747 int i;
658 748
659#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
661#endif 751#endif
662 752
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 754 {
665 const char *name = rs[Rs_color + i]; 755 const char *name = rs[Rs_color + i];
666 756
667 if (!name) 757 if (!name)
… …
670 rxvt_color xcol; 760 rxvt_color xcol;
671 761
672 if (!set_color (xcol, name)) 762 if (!set_color (xcol, name))
673 { 763 {
674#ifndef XTERM_REVERSE_VIDEO 764#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 765 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 766 name = def_colorName [1 - i];
677 else 767 else
678#endif 768#endif
679 name = def_colorName [i]; 769 name = def_colorName [i];
680 770
… …
745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746 cscroll.a) 836 cscroll.a)
747 )) 837 ))
748 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
749 } 839 }
750#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
751 841
752#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i); 844 update_fade_color (i);
755#endif 845#endif
… …
763 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764 { 854 {
765 int i = atoi (rs[Rs_color + idx]); 855 int i = atoi (rs[Rs_color + idx]);
766 856
767 if (i >= 8 && i <= 15) 857 if (i >= 8 && i <= 15)
768 { /* bright colors */ 858 /* bright colors */
769 i -= 8;
770 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771 return; 860 else if (i >= 0 && i <= 7)
772 } 861 /* normal colors */
773
774 if (i >= 0 && i <= 7) /* normal colors */
775 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 862 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776 } 863 }
777} 864}
778 865
779/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 958rxvt_term::create_windows (int argc, const char *const *argv)
872{ 959{
873 XClassHint classHint; 960 XClassHint classHint;
874 XWMHints wmHint; 961 XWMHints wmHint;
875#if ENABLE_FRILLS 962#if ENABLE_FRILLS
876 MWMHints mwmhints; 963 MWMHints mwmhints = { };
877#endif 964#endif
878 XGCValues gcvalue; 965 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 966 XSetWindowAttributes attributes;
880 Window top, parent; 967 Window top, parent;
881 968
… …
887 if (!set_fonts ()) 974 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 976
890 parent = display->root; 977 parent = display->root;
891 978
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 979 attributes.override_redirect = !!option (Opt_override_redirect);
893 980
894#if ENABLE_FRILLS 981#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 982 if (option (Opt_borderLess))
896 { 983 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 984 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 985 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 986 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900 attributes.override_redirect = true; 987 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 988 }
903 else 989 else
904 { 990 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 991 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 992 }
908 } 993 }
909 else
910 mwmhints.flags = 0;
911#endif 994#endif
912 995
913#if ENABLE_XEMBED 996#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 997 if (rs[Rs_embed])
915 { 998 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 1033 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1034 classHint.res_class = (char *)RESCLASS;
952 1035
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1036 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1037 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1038 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1039 wmHint.window_group = top;
957 1040
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1041 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1042 &szHint, &wmHint, &classHint);
960 1043
… …
1017 attributes.bit_gravity = NorthWestGravity; 1100 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1101 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1102
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1103 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1104
1022 if (OPTION (Opt_pointerBlank)) 1105 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1106 vt_emask |= PointerMotionMask;
1024 else 1107 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1109
1027 vt_select_input (); 1110 vt_select_input ();
1028 1111
1029 vt_ev.start (display, vt); 1112 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 1113
1048 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1117 gcvalue.graphics_exposures = 0;
… …
1079 * GET TTY CURRENT STATE * 1145 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */ 1146 * ------------------------------------------------------------------------- */
1081void 1147void
1082rxvt_get_ttymode (ttymode_t *tio, int erase) 1148rxvt_get_ttymode (ttymode_t *tio, int erase)
1083{ 1149{
1084#ifdef HAVE_TERMIOS_H
1085 /* 1150 /*
1086 * standard System V termios interface 1151 * standard System V termios interface
1087 */ 1152 */
1088 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1089 { 1154 {
… …
1156 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1157# if defined (ECHOCTL) && defined (ECHOKE) 1222# if defined (ECHOCTL) && defined (ECHOKE)
1158 | ECHOCTL | ECHOKE 1223 | ECHOCTL | ECHOKE
1159# endif 1224# endif
1160 | ECHOE | ECHOK); 1225 | ECHOE | ECHOK);
1161# else /* HAVE_TERMIOS_H */
1162
1163 /*
1164 * sgtty interface
1165 */
1166
1167 /* get parameters -- gtty */
1168 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1169 {
1170 tio->sg.sg_erase = CERASE; /* ^H */
1171 tio->sg.sg_kill = CKILL; /* ^U */
1172 }
1173
1174 if (erase != -1)
1175 tio->sg.sg_erase = (char)erase;
1176
1177 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1178
1179 /* get special characters */
1180 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1181 {
1182 tio->tc.t_intrc = CINTR; /* ^C */
1183 tio->tc.t_quitc = CQUIT; /* ^\ */
1184 tio->tc.t_startc = CSTART; /* ^Q */
1185 tio->tc.t_stopc = CSTOP; /* ^S */
1186 tio->tc.t_eofc = CEOF; /* ^D */
1187 tio->tc.t_brkc = -1;
1188 }
1189
1190 /* get local special chars */
1191 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1192 {
1193 tio->lc.t_suspc = CSUSP; /* ^Z */
1194 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1195 tio->lc.t_rprntc = CRPRNT; /* ^R */
1196 tio->lc.t_flushc = CFLUSH; /* ^O */
1197 tio->lc.t_werasc = CWERASE; /* ^W */
1198 tio->lc.t_lnextc = CLNEXT; /* ^V */
1199 }
1200 /* get line discipline */
1201 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1202# ifdef NTTYDISC
1203 tio->line = NTTYDISC;
1204# endif /* NTTYDISC */
1205
1206 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1207#endif /* HAVE_TERMIOS_H */
1208 1226
1209 /* 1227 /*
1210 * Debugging 1228 * Debugging
1211 */ 1229 */
1212#ifdef DEBUG_TTYMODE 1230#ifdef DEBUG_TTYMODE
… …
1281 FOO (VLNEXT, "VLNEXT"); 1299 FOO (VLNEXT, "VLNEXT");
1282# endif 1300# endif
1283 1301
1284 fprintf (stderr, "\n"); 1302 fprintf (stderr, "\n");
1285# undef FOO 1303# undef FOO
1286# endif /* HAVE_TERMIOS_H */ 1304# endif /* HAVE_TERMIOS_H */
1287#endif /* DEBUG_TTYMODE */ 1305#endif /* DEBUG_TTYMODE */
1288} 1306}
1289 1307
1290/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1291/* 1309/*
1292 * 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
… …
1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1317 1335
1318 int er; 1336 int er;
1319 1337
1320#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1321 if (key_backspace[0] && !key_backspace[1]) 1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1322 er = key_backspace[0]; 1340 er = rs[Rs_backspace_key][0];
1323 else if (strcmp (key_backspace, "DEC") == 0) 1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1324 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1325 else 1343 else
1326#endif 1344#endif
1327 er = -1; 1345 er = -1;
1328 1346
1329 rxvt_get_ttymode (&tio, er); 1347 rxvt_get_ttymode (&tio, er);
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1330 pty->set_utf8_mode (enc_utf8); 1349 pty->set_utf8_mode (enc_utf8);
1331 SET_TTYMODE (pty->tty, &tio); /* init terminal attributes */
1332 1350
1333 /* set initial window size */ 1351 /* set initial window size */
1334 tt_winch (); 1352 tt_winch ();
1335 1353
1336#if ENABLE_FRILLS 1354#if ENABLE_FRILLS
… …
1370 } 1388 }
1371 1389
1372 _exit (EXIT_FAILURE); 1390 _exit (EXIT_FAILURE);
1373 1391
1374 default: 1392 default:
1375 if (!OPTION (Opt_utmpInhibit)) 1393 if (!option (Opt_utmpInhibit))
1376 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1394 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1377 1395
1378 pty->close_tty (); 1396 pty->close_tty ();
1379 1397
1380 child_ev.start (cmd_pid); 1398 child_ev.start (cmd_pid);
1381 1399
… …
1394int 1412int
1395rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1396{ 1414{
1397 char *login; 1415 char *login;
1398 1416
1399 if (OPTION (Opt_console)) 1417 if (option (Opt_console))
1418 {
1400 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1420#ifdef TIOCCONS
1402 unsigned int on = 1; 1421 unsigned int on = 1;
1403 1422
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1405#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1407 1426
1408 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1409 if (fd >= 0) 1428 if (fd >= 0)
1410 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1411 close (fd); 1430 close (fd);
1412#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1413 } 1432 }
1414 1433
1415 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1416 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1417 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1424 */ 1443 */
1425#ifdef SIGTSTP 1444#ifdef SIGTSTP
1426 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1427 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1428 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1429#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1430 1449
1431 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1432 sigset_t ss; 1451 sigset_t ss;
1433 sigemptyset (&ss); 1452 sigemptyset (&ss);
1434 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1435 1454
1436 /* command interpreter path */ 1455 /* command interpreter path */
1437 if (argv != NULL) 1456 if (argv)
1438 { 1457 {
1439# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1440 int i; 1459 int i;
1441 1460
1442 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1451 const char *argv0, *shell; 1470 const char *argv0, *shell;
1452 1471
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1455 1474
1456 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1457 1476
1458 if (OPTION (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1459 { 1478 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1461 1480
1462 login[0] = '-'; 1481 login[0] = '-';
1463 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1464 argv0 = login; 1483 argv0 = login;
1465 } 1484 }
1466 1485
1467 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1468 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1469 } 1488 }
1470 1489
1471 return -1; 1490 return -1;
1472} 1491}

Diff Legend

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