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.161 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.216 by ayin, Tue Oct 9 13:34:46 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
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 DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h>
49#include <sys/socket.h>
50
51/* these next two are probably only on Sun (not Solaris) */
52#ifdef HAVE_SYS_SOCKIO_H
53#include <sys/sockio.h>
54#endif
55#ifdef HAVE_SYS_BYTEORDER_H
56#include <sys/byteorder.h>
57#endif
58
59#include <netinet/in.h>
60#include <arpa/inet.h>
61#include <net/if.h>
62#include <net/if_arp.h>
63
64static char *
65rxvt_network_display (const char *display)
66{
67 char buffer[1024], *rval = NULL;
68 struct ifconf ifc;
69 struct ifreq *ifr;
70 int i, skfd;
71
72 if (display[0] != ':' && strncmp (display, "unix:", 5))
73 return (char *) display; /* nothing to do */
74
75 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
76 ifc.ifc_buf = buffer;
77
78 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
79 {
80 perror ("socket");
81 return NULL;
82 }
83
84 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
85 {
86 perror ("SIOCGIFCONF");
87 close (skfd);
88 return NULL;
89 }
90
91 for (i = 0, ifr = ifc.ifc_req;
92 i < (ifc.ifc_len / sizeof (struct ifreq));
93 i++, ifr++)
94 {
95 struct ifreq ifr2;
96
97 strcpy (ifr2.ifr_name, ifr->ifr_name);
98
99 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
100 {
101 unsigned long addr;
102 struct sockaddr_in *p_addr;
103
104 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
105 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
106
107 /*
108 * not "0.0.0.0" or "127.0.0.1" - so format the address
109 */
110 if (addr && addr != 0x7F000001)
111 {
112 char *colon = strchr (display, ':');
113
114 if (colon == NULL)
115 colon = ":0.0";
116
117 rval = rxvt_malloc (strlen (colon) + 16);
118 sprintf (rval, "%d.%d.%d.%d%s",
119 (int) ((addr >> 030) & 0xFF),
120 (int) ((addr >> 020) & 0xFF),
121 (int) ((addr >> 010) & 0xFF),
122 (int) (addr & 0xFF), colon);
123 break;
124 }
125 }
126 }
127
128 close (skfd);
129
130 return rval;
131}
132#endif
133
43const char *const def_colorName[] = 134const char *const def_colorName[] =
44 { 135 {
45 COLOR_FOREGROUND, 136 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 137 COLOR_BACKGROUND,
47 /* low-intensity colors */ 138 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 139 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 140 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 141 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 142 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 143 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 144 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 145 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 146# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 147 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
166#endif 257#endif
167#ifdef KEEP_SCROLLCOLOR 258#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 259 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 260 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 261#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 262#if ENABLE_TRANSPARENCY
172 NULL, 263 NULL,
173#endif 264#endif
174#if OFF_FOCUS_FADING 265#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 266 "rgb:00/00/00",
176#endif 267#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 277#endif
187 278
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 279
192 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 282 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 284 ncol = 80;
198 nrow = 24; 285 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 289 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
204 291
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
207 293
208 oldcursor.row = oldcursor.col = -1; 294 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; 295 last_bot = last_state = -1;
296
297 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52);
216 306
217 return true; 307 return true;
218} 308}
219 309
220void 310void
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 320 {
231 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 323 }
234 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
235 { 325 {
236 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
237 close (i); 327 close (i);
238 } 328 }
239 329
… …
254/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
255const char ** 345const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
257{ 347{
258 int i, r_argc; 348 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
261 350
262 /* 351 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 352 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 353 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 355 if (!strcmp (argv[r_argc], "-e"))
267 break; 356 break;
357
358 if (r_argc == argc)
359 cmd_argv = NULL;
360 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n");
362 else
363 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365
366 for (i = 0; i < argc - r_argc - 1; i++)
367 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
368
369 cmd_argv[i] = NULL;
370 }
268 371
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 373
271 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
273 376
274 r_argv[i] = NULL; 377 r_argv[i] = NULL;
275 378
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]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
289 380
290 /* 381 /*
291 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
292 */ 383 */
293 384
… …
297 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
298 389
299 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 391 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 392
393 // using a local pointer decreases code size a lot
302 xa = display->xa; 394 xa = display->xa;
395
396 set (display);
397 extract_resources ();
303 398
304#if XFT 399#if XFT
305 if (rs[Rs_depth]) 400 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 401 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 402#endif
309 set (display);
310 403
311 extract_resources (); 404#ifdef HAVE_AFTERIMAGE
312 405 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
406#endif
313 free (r_argv); 407 free (r_argv);
408
409 for (int i = NUM_RESOURCES; i--; )
410 if (rs [i] == resval_undef)
411 rs [i] = 0;
314 412
315#if ENABLE_PERL 413#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 414 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 415 rs[Rs_perl_ext_1] = "default";
318 416
… …
329 * set any defaults not already set 427 * set any defaults not already set
330 */ 428 */
331 if (cmd_argv && cmd_argv[0]) 429 if (cmd_argv && cmd_argv[0])
332 { 430 {
333 if (!rs[Rs_title]) 431 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 432 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335 if (!rs[Rs_iconName]) 433 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 434 rs[Rs_iconName] = rs[Rs_title];
337 } 435 }
338 else 436 else
339 { 437 {
… …
377 rs[Rs_cutchars] = CUTCHARS; 475 rs[Rs_cutchars] = CUTCHARS;
378 476
379#ifndef NO_BACKSPACE_KEY 477#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 478 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 479# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 480 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 481# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 482 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 483# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 484#endif
394 485
395#ifndef NO_DELETE_KEY 486#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 487 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 488# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 489 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 490# else
400 key_delete = "\033[3~"; 491 rs[Rs_delete_key] = "\033[3~";
401# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 492# endif
410 if (rs[Rs_answerbackstring]) 493#endif
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415 494
416#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 496 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 497#endif
419 498
420#ifdef XTERM_REVERSE_VIDEO 499#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 500 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 501 if (option (Opt_reverseVideo))
423 { 502 {
424 if (!rs[Rs_color + Color_fg]) 503 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 504 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
505
426 if (!rs[Rs_color + Color_bg]) 506 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 507 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 508 }
429#endif 509#endif
430 510
… …
432 if (!rs[Rs_color + i]) 512 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 513 rs[Rs_color + i] = def_colorName[i];
434 514
435#ifndef XTERM_REVERSE_VIDEO 515#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 516 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 517 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 518 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 519#endif
440 520
441 /* convenient aliases for setting fg/bg to colors */ 521 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 522 color_aliases (Color_fg);
… …
463/*----------------------------------------------------------------------*/ 543/*----------------------------------------------------------------------*/
464void 544void
465rxvt_term::init_env () 545rxvt_term::init_env ()
466{ 546{
467 int i; 547 int i;
468 unsigned int u;
469 char *val; 548 char *val;
470 549
471#ifdef DISPLAY_IS_IP 550#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 551 /* Fixup display_name for export over pty to any interested terminal
473 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 552 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 561 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 562 rs[Rs_display_name] = (const char *)val;
484 563
485 if (val == NULL) 564 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 565#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 566 val = XDisplayString (dpy);
488 567
489 if (rs[Rs_display_name] == NULL) 568 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 569 rs[Rs_display_name] = val; /* use broken `:0' value */
491 570
492 i = strlen (val); 571 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 572 env_display = (char *)rxvt_malloc (i + 9);
494 573
495 sprintf (env_display, "DISPLAY=%s", val); 574 sprintf (env_display, "DISPLAY=%s", val);
496 575
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 576 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 577
… …
519 else 598 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 599 putenv ("COLORTERM=" COLORTERMENVFULL);
521 600
522 if (rs[Rs_term_name] != NULL) 601 if (rs[Rs_term_name] != NULL)
523 { 602 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 603 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 604 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 605 putenv (env_term);
527 } 606 }
528 else 607 else
529 putenv ("TERM=" TERMENV); 608 putenv ("TERM=" TERMENV);
… …
616 * Initialize the command connection. 695 * Initialize the command connection.
617 * This should be called after the X server connection is established. 696 * This should be called after the X server connection is established.
618 */ 697 */
619 698
620#ifdef META8_OPTION 699#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 700 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 701#endif
623 702
624 get_ourmods (); 703 get_ourmods ();
625 704
626 if (!OPTION (Opt_scrollTtyOutput)) 705 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 706 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 707 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 708 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 709 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 710 priv_modes |= PrivMode_smoothScroll;
632 711
633#ifndef NO_BACKSPACE_KEY 712#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 713 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 714 priv_modes |= PrivMode_HaveBackSpace;
636#endif 715#endif
637 716
638 /* add value for scrollBar */ 717 /* add value for scrollBar */
639 if (scrollBar.state) 718 if (scrollBar.state)
… …
655 pix_colors = pix_colors_focused; 734 pix_colors = pix_colors_focused;
656#endif 735#endif
657 736
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 737 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 738 {
739 const char *name = rs[Rs_color + i];
740
741 if (!name)
742 continue;
743
660 rxvt_color xcol; 744 rxvt_color xcol;
661 745
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 746 if (!set_color (xcol, name))
666 { 747 {
667#ifndef XTERM_REVERSE_VIDEO 748#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 749 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 750 name = def_colorName [1 - i];
670 else 751 else
671#endif 752#endif
672 rs[Rs_color + i] = def_colorName[i]; 753 name = def_colorName [i];
673 754
674 if (!rs[Rs_color + i]) 755 if (!name)
675 continue; 756 continue;
676 757
677 if (!set_color (xcol, rs[Rs_color + i])) 758 if (!set_color (xcol, name))
678 { 759 {
679 switch (i) 760 switch (i)
680 { 761 {
681 case Color_fg: 762 case Color_fg:
682 case Color_bg: 763 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 764 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
765 name = "";
685 break; 766 break;
686#ifndef NO_CURSORCOLOR 767#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 768 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 769#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 770 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 771 name = rs[Rs_color + Color_fg];
772 xcol.set (this, name);
693 break; 773 break;
694 default: 774 default:
695 xcol = pix_colors[Color_bg]; /* None */ 775 name = rs[Rs_color + Color_bg];
776 xcol.set (this, name);
696 break; 777 break;
697 } 778 }
698 } 779 }
699 } 780 }
700 781
701 pix_colors[i] = xcol; 782 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 783 rs[Rs_color + i] = name;
703 } 784 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
709#endif
710 785
711 if (depth <= 2) 786 if (depth <= 2)
712 { 787 {
713 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 788 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
714 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 789 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
715 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 790 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
716 } 791 }
717 792
718 /* 793 /*
719 * get scrollBar shadow colors 794 * get scrollBar shadow colors
720 * 795 *
721 * The calculations of topShadow/bottomShadow values are adapted 796 * The calculations of topShadow/bottomShadow values are adapted
722 * from the fvwm window manager. 797 * from the fvwm window manager.
723 */ 798 */
724#ifdef KEEP_SCROLLCOLOR 799#ifdef KEEP_SCROLLCOLOR
725
726 if (depth <= 2) 800 if (depth <= 2)
727 { 801 {
728 /* Monochrome */ 802 /* Monochrome */
729 pix_colors[Color_scroll] = pix_colors[Color_fg]; 803 alias_color (Color_scroll, Color_fg);
730 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 804 alias_color (Color_topShadow, Color_bg);
731 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 805 alias_color (Color_bottomShadow, Color_bg);
732 } 806 }
733 else 807 else
734 { 808 {
735 rxvt_color xcol[2]; 809 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
736 /* xcol[0] == white
737 * xcol[1] == top shadow
738 * xcol[2] == bot shadow */
739 810
740 xcol[1] = pix_colors[Color_scroll]; 811 rgba cscroll;
741 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 812 pix_colors [Color_scroll].get (cscroll);
742
743 rxvt_rgba c0, c1;
744
745 xcol[0].get (this, c0);
746 xcol[1].get (this, c1);
747
748 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
749 813
750 /* topShadowColor */ 814 /* topShadowColor */
751 if (!xcol[1].set (this, 815 if (!pix_colors[Color_topShadow].set (this,
752 rxvt_rgba ( 816 rgba (
753 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 817 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
754 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 818 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
755 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 819 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
756 c1.a) // pa1 vs. pa0: arbitrary 820 cscroll.a)
757 )); 821 ))
758 xcol[1] = pix_colors[Color_White]; 822 alias_color (Color_topShadow, Color_White);
759
760 pix_colors[Color_topShadow] = xcol[1];
761 } 823 }
762#endif /* KEEP_SCROLLCOLOR */ 824#endif /* KEEP_SCROLLCOLOR */
825
826#ifdef OFF_FOCUS_FADING
827 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
828 update_fade_color (i);
829#endif
763} 830}
764 831
765/*----------------------------------------------------------------------*/ 832/*----------------------------------------------------------------------*/
766/* color aliases, fg/bg bright-bold */ 833/* color aliases, fg/bg bright-bold */
767void 834void
… …
806 873
807 if (rsmod 874 if (rsmod
808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 875 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
809 requestedmeta = rsmod[3] - '0'; 876 requestedmeta = rsmod[3] - '0';
810 877
811 map = XGetModifierMapping (xdisp); 878 map = XGetModifierMapping (dpy);
812 kc = map->modifiermap; 879 kc = map->modifiermap;
813 880
814 for (i = 1; i < 6; i++) 881 for (i = 1; i < 6; i++)
815 { 882 {
816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 883 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
818 for (j = map->max_keypermod; j--; k++) 885 for (j = map->max_keypermod; j--; k++)
819 { 886 {
820 if (kc[k] == 0) 887 if (kc[k] == 0)
821 break; 888 break;
822 889
823 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 890 switch (XKeycodeToKeysym (dpy, kc[k], 0))
824 { 891 {
825 case XK_Num_Lock: 892 case XK_Num_Lock:
826 ModNumLockMask = modmasks[i - 1]; 893 ModNumLockMask = modmasks[i - 1];
827 continue; 894 continue;
828 895
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 945rxvt_term::create_windows (int argc, const char *const *argv)
879{ 946{
880 XClassHint classHint; 947 XClassHint classHint;
881 XWMHints wmHint; 948 XWMHints wmHint;
882#if ENABLE_FRILLS 949#if ENABLE_FRILLS
883 MWMHints mwmhints; 950 MWMHints mwmhints = { };
884#endif 951#endif
885 XGCValues gcvalue; 952 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 953 XSetWindowAttributes attributes;
887 Window top, parent; 954 Window top, parent;
888 955
889 dLocal (Display *, xdisp); 956 dLocal (Display *, dpy);
890 957
891 /* grab colors before netscape does */ 958 /* grab colors before netscape does */
892 Get_Colours (); 959 Get_Colours ();
893 960
894 if (!set_fonts ()) 961 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 962 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 963
897 parent = display->root; 964 parent = display->root;
898 965
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 966 attributes.override_redirect = !!option (Opt_override_redirect);
900 967
901#if ENABLE_FRILLS 968#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 969 if (option (Opt_borderLess))
903 { 970 {
904 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 971 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 972 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 973 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 974 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 975 }
910 else 976 else
911 { 977 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 978 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 979 }
915 } 980 }
916 else
917 mwmhints.flags = 0;
918#endif 981#endif
919 982
920#if ENABLE_XEMBED 983#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 984 if (rs[Rs_embed])
922 { 985 {
923 XWindowAttributes wattr; 986 XWindowAttributes wattr;
924 987
925 parent = strtol (rs[Rs_embed], 0, 0); 988 parent = strtol (rs[Rs_embed], 0, 0);
926 989
927 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 990 if (!XGetWindowAttributes (dpy, parent, &wattr))
928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 991 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
929 992
930 window_calc (wattr.width, wattr.height); 993 window_calc (wattr.width, wattr.height);
931 } 994 }
932#endif 995#endif
… …
936 /* sub-window placement & size in rxvt_resize_subwindows () */ 999 /* sub-window placement & size in rxvt_resize_subwindows () */
937 attributes.background_pixel = pix_colors_focused [Color_border]; 1000 attributes.background_pixel = pix_colors_focused [Color_border];
938 attributes.border_pixel = pix_colors_focused [Color_border]; 1001 attributes.border_pixel = pix_colors_focused [Color_border];
939 attributes.colormap = cmap; 1002 attributes.colormap = cmap;
940 1003
941 top = XCreateWindow (xdisp, parent, 1004 top = XCreateWindow (dpy, parent,
942 szHint.x, szHint.y, 1005 szHint.x, szHint.y,
943 szHint.width, szHint.height, 1006 szHint.width, szHint.height,
944 ext_bwidth, 1007 ext_bwidth,
945 depth, InputOutput, visual, 1008 depth, InputOutput, visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1009 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
957 classHint.res_name = (char *)rs[Rs_name]; 1020 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1021 classHint.res_class = (char *)RESCLASS;
959 1022
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1023 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 1024 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1025 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1026 wmHint.window_group = top;
964 1027
965 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1028 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1029 &szHint, &wmHint, &classHint);
967 1030
968#if ENABLE_FRILLS 1031#if ENABLE_FRILLS
969 if (mwmhints.flags) 1032 if (mwmhints.flags)
970 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1033 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1034 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 1035#endif
973 1036
974 Atom protocols[] = { 1037 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 1038 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 1039#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 1040 xa[XA_NET_WM_PING],
978#endif 1041#endif
979 }; 1042 };
980 1043
981 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1044 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982 1045
983#if ENABLE_FRILLS 1046#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 1047 if (rs[Rs_transient_for])
985 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1048 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 1049#endif
987 1050
988#if ENABLE_EWMH 1051#if ENABLE_EWMH
989 long pid = getpid (); 1052 long pid = getpid ();
990 1053
991 XChangeProperty (xdisp, top, 1054 XChangeProperty (dpy, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
994 1057
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 1059#endif
997 1060
998 XSelectInput (xdisp, top, 1061 XSelectInput (dpy, top,
999 KeyPressMask 1062 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1064 | KeyReleaseMask
1002#endif 1065#endif
1003 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 1067 | ExposureMask | StructureNotifyMask);
1005 1068
1006 termwin_ev.start (display, top); 1069 termwin_ev.start (display, top);
1007 1070
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1071 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1072 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010 1073
1011#ifdef HAVE_SCROLLBARS 1074#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */ 1075 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1076 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif 1077#endif
1015 1078
1016 /* the vt window */ 1079 /* the vt window */
1017 vt = XCreateSimpleWindow (xdisp, top, 1080 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1081 window_vt_x, window_vt_y,
1019 width, height, 1082 width, height,
1020 0, 1083 0,
1021 pix_colors_focused[Color_fg], 1084 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 1085 pix_colors_focused[Color_bg]);
1023 1086
1024 attributes.bit_gravity = NorthWestGravity; 1087 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1088 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1089
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1091
1029 if (OPTION (Opt_pointerBlank)) 1092 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1093 vt_emask |= PointerMotionMask;
1031 else 1094 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1095 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1096
1034 vt_select_input (); 1097 vt_select_input ();
1035 1098
1036 vt_ev.start (display, vt); 1099 vt_ev.start (display, vt);
1037 1100
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054
1055 /* graphics context for the vt window */ 1101 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1102 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1103 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1104 gcvalue.graphics_exposures = 0;
1059 1105
1060 gc = XCreateGC (xdisp, vt, 1106 gc = XCreateGC (dpy, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1107 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1108 &gcvalue);
1063 1109
1064 drawable = new rxvt_drawable (this, vt); 1110 drawable = new rxvt_drawable (this, vt);
1065 1111
1066#ifdef RXVT_SCROLLBAR 1112#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow]; 1113 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1114 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1115 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1116 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1117 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1118 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073#endif 1119#endif
1074 1120
1075#ifdef OFF_FOCUS_FADING 1121#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1122 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1123 if (rs[Rs_fade])
… …
1086 * GET TTY CURRENT STATE * 1132 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */ 1133 * ------------------------------------------------------------------------- */
1088void 1134void
1089rxvt_get_ttymode (ttymode_t *tio, int erase) 1135rxvt_get_ttymode (ttymode_t *tio, int erase)
1090{ 1136{
1091#ifdef HAVE_TERMIOS_H
1092 /* 1137 /*
1093 * standard System V termios interface 1138 * standard System V termios interface
1094 */ 1139 */
1095 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1140 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1096 { 1141 {
… …
1163 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1208 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1164# if defined (ECHOCTL) && defined (ECHOKE) 1209# if defined (ECHOCTL) && defined (ECHOKE)
1165 | ECHOCTL | ECHOKE 1210 | ECHOCTL | ECHOKE
1166# endif 1211# endif
1167 | ECHOE | ECHOK); 1212 | ECHOE | ECHOK);
1168# else /* HAVE_TERMIOS_H */
1169
1170 /*
1171 * sgtty interface
1172 */
1173
1174 /* get parameters -- gtty */
1175 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1176 {
1177 tio->sg.sg_erase = CERASE; /* ^H */
1178 tio->sg.sg_kill = CKILL; /* ^U */
1179 }
1180
1181 if (erase != -1)
1182 tio->sg.sg_erase = (char)erase;
1183
1184 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1185
1186 /* get special characters */
1187 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1188 {
1189 tio->tc.t_intrc = CINTR; /* ^C */
1190 tio->tc.t_quitc = CQUIT; /* ^\ */
1191 tio->tc.t_startc = CSTART; /* ^Q */
1192 tio->tc.t_stopc = CSTOP; /* ^S */
1193 tio->tc.t_eofc = CEOF; /* ^D */
1194 tio->tc.t_brkc = -1;
1195 }
1196
1197 /* get local special chars */
1198 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1199 {
1200 tio->lc.t_suspc = CSUSP; /* ^Z */
1201 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1202 tio->lc.t_rprntc = CRPRNT; /* ^R */
1203 tio->lc.t_flushc = CFLUSH; /* ^O */
1204 tio->lc.t_werasc = CWERASE; /* ^W */
1205 tio->lc.t_lnextc = CLNEXT; /* ^V */
1206 }
1207 /* get line discipline */
1208 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1209# ifdef NTTYDISC
1210 tio->line = NTTYDISC;
1211# endif /* NTTYDISC */
1212
1213 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1214#endif /* HAVE_TERMIOS_H */
1215 1213
1216 /* 1214 /*
1217 * Debugging 1215 * Debugging
1218 */ 1216 */
1219#ifdef DEBUG_TTYMODE 1217#ifdef DEBUG_TTYMODE
… …
1320 else 1318 else
1321#endif 1319#endif
1322 if (!pty->get ()) 1320 if (!pty->get ())
1323 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1324 1322
1323 int er;
1324
1325#ifndef NO_BACKSPACE_KEY
1326 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1327 er = rs[Rs_backspace_key][0];
1328 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1329 er = '\177'; /* the initial state anyway */
1330 else
1331#endif
1332 er = -1;
1333
1334 rxvt_get_ttymode (&tio, er);
1335 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1325 pty->set_utf8_mode (enc_utf8); 1336 pty->set_utf8_mode (enc_utf8);
1326 1337
1327 /* set initial window size */ 1338 /* set initial window size */
1328 tt_winch (); 1339 tt_winch ();
1329
1330 int er;
1331
1332#ifndef NO_BACKSPACE_KEY
1333 if (key_backspace[0] && !key_backspace[1])
1334 er = key_backspace[0];
1335 else if (strcmp (key_backspace, "DEC") == 0)
1336 er = '\177'; /* the initial state anyway */
1337 else
1338#endif
1339 er = -1;
1340
1341 rxvt_get_ttymode (&tio, er);
1342 1340
1343#if ENABLE_FRILLS 1341#if ENABLE_FRILLS
1344 if (rs[Rs_pty_fd]) 1342 if (rs[Rs_pty_fd])
1345 return; 1343 return;
1346#endif 1344#endif
… …
1377 } 1375 }
1378 1376
1379 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1380 1378
1381 default: 1379 default:
1382 if (!OPTION (Opt_utmpInhibit)) 1380 if (!option (Opt_utmpInhibit))
1383 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1381 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1384 1382
1385 pty->close_tty (); 1383 pty->close_tty ();
1386 1384
1387 child_ev.start (cmd_pid); 1385 child_ev.start (cmd_pid);
1388 1386
… …
1401int 1399int
1402rxvt_term::run_child (const char *const *argv) 1400rxvt_term::run_child (const char *const *argv)
1403{ 1401{
1404 char *login; 1402 char *login;
1405 1403
1406 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1407
1408 if (OPTION (Opt_console)) 1404 if (option (Opt_console))
1409 { /* be virtual console, fail silently */ 1405 { /* be virtual console, fail silently */
1410#ifdef TIOCCONS 1406#ifdef TIOCCONS
1411 unsigned int on = 1; 1407 unsigned int on = 1;
1412 1408
1413 ioctl (STDIN_FILENO, TIOCCONS, &on); 1409 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1441 sigset_t ss; 1437 sigset_t ss;
1442 sigemptyset (&ss); 1438 sigemptyset (&ss);
1443 sigprocmask (SIG_SETMASK, &ss, 0); 1439 sigprocmask (SIG_SETMASK, &ss, 0);
1444 1440
1445 /* command interpreter path */ 1441 /* command interpreter path */
1446 if (argv != NULL) 1442 if (argv)
1447 { 1443 {
1448# ifdef DEBUG_CMD 1444# ifdef DEBUG_CMD
1449 int i; 1445 int i;
1450 1446
1451 for (i = 0; argv[i]; i++) 1447 for (i = 0; argv[i]; i++)
… …
1460 const char *argv0, *shell; 1456 const char *argv0, *shell;
1461 1457
1462 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1458 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1463 shell = "/bin/sh"; 1459 shell = "/bin/sh";
1464 1460
1465 argv0 = (const char *)rxvt_r_basename (shell); 1461 argv0 = (const char *)rxvt_basename (shell);
1466 1462
1467 if (OPTION (Opt_loginShell)) 1463 if (option (Opt_loginShell))
1468 { 1464 {
1469 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1465 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1470 1466
1471 login[0] = '-'; 1467 login[0] = '-';
1472 strcpy (&login[1], argv0); 1468 strcpy (&login[1], argv0);
1473 argv0 = login; 1469 argv0 = login;
1474 } 1470 }
1475 1471
1476 execlp (shell, argv0, NULL); 1472 execlp (shell, argv0, (char *)0);
1477 /* no error message: STDERR is closed! */ 1473 /* no error message: STDERR is closed! */
1478 } 1474 }
1479 1475
1480 return -1; 1476 return -1;
1481} 1477}

Diff Legend

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