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.174 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.215 by root, Mon Oct 8 15:36:13 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 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 -e 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 */
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 373
285 cmd_argv[i] = NULL; 374 cmd_argv[i] = NULL;
286 } 375 }
287 376
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 377 rs[Rs_name] = rxvt_basename (argv[0]);
289 378
290 /* 379 /*
291 * Open display, get options/resources and create the window 380 * Open display, get options/resources and create the window
292 */ 381 */
293 382
… …
308#if XFT 397#if XFT
309 if (rs[Rs_depth]) 398 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 399 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 400#endif
312 401
402#ifdef HAVE_AFTERIMAGE
403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif
313 free (r_argv); 405 free (r_argv);
314 406
315 for (int i = NUM_RESOURCES; i--; ) 407 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 408 if (rs [i] == resval_undef)
317 rs [i] = 0; 409 rs [i] = 0;
… …
333 * set any defaults not already set 425 * set any defaults not already set
334 */ 426 */
335 if (cmd_argv && cmd_argv[0]) 427 if (cmd_argv && cmd_argv[0])
336 { 428 {
337 if (!rs[Rs_title]) 429 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 430 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
341 } 433 }
342 else 434 else
343 { 435 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 473 rs[Rs_cutchars] = CUTCHARS;
382 474
383#ifndef NO_BACKSPACE_KEY 475#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 476 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 477# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 478 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 479# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 480 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 481# 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 482#endif
398 483
399#ifndef NO_DELETE_KEY 484#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 485 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 486# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 487 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 488# else
404 key_delete = "\033[3~"; 489 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 490# endif
414 if (rs[Rs_answerbackstring]) 491#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 492
420#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 494 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 495#endif
423 496
424#ifdef XTERM_REVERSE_VIDEO 497#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 498 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 499 if (option (Opt_reverseVideo))
427 { 500 {
428 if (!rs[Rs_color + Color_fg]) 501 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 502 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 503
431 if (!rs[Rs_color + Color_bg]) 504 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 510 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 511 rs[Rs_color + i] = def_colorName[i];
439 512
440#ifndef XTERM_REVERSE_VIDEO 513#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 514 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 515 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 516 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 517#endif
445 518
446 /* convenient aliases for setting fg/bg to colors */ 519 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 520 color_aliases (Color_fg);
… …
468/*----------------------------------------------------------------------*/ 541/*----------------------------------------------------------------------*/
469void 542void
470rxvt_term::init_env () 543rxvt_term::init_env ()
471{ 544{
472 int i; 545 int i;
473 unsigned int u;
474 char *val; 546 char *val;
475 547
476#ifdef DISPLAY_IS_IP 548#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 549 /* 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 550 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
493 565
494 if (rs[Rs_display_name] == NULL) 566 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 567 rs[Rs_display_name] = val; /* use broken `:0' value */
496 568
497 i = strlen (val); 569 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 570 env_display = (char *)rxvt_malloc (i + 9);
499 571
500 sprintf (env_display, "DISPLAY=%s", val); 572 sprintf (env_display, "DISPLAY=%s", val);
501 573
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 574 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 575
… …
524 else 596 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 597 putenv ("COLORTERM=" COLORTERMENVFULL);
526 598
527 if (rs[Rs_term_name] != NULL) 599 if (rs[Rs_term_name] != NULL)
528 { 600 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 601 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 602 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 603 putenv (env_term);
532 } 604 }
533 else 605 else
534 putenv ("TERM=" TERMENV); 606 putenv ("TERM=" TERMENV);
… …
621 * Initialize the command connection. 693 * Initialize the command connection.
622 * This should be called after the X server connection is established. 694 * This should be called after the X server connection is established.
623 */ 695 */
624 696
625#ifdef META8_OPTION 697#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 698 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 699#endif
628 700
629 get_ourmods (); 701 get_ourmods ();
630 702
631 if (!OPTION (Opt_scrollTtyOutput)) 703 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 704 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 705 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 706 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 707 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 708 priv_modes |= PrivMode_smoothScroll;
637 709
638#ifndef NO_BACKSPACE_KEY 710#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 711 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 712 priv_modes |= PrivMode_HaveBackSpace;
641#endif 713#endif
642 714
643 /* add value for scrollBar */ 715 /* add value for scrollBar */
644 if (scrollBar.state) 716 if (scrollBar.state)
… …
670 rxvt_color xcol; 742 rxvt_color xcol;
671 743
672 if (!set_color (xcol, name)) 744 if (!set_color (xcol, name))
673 { 745 {
674#ifndef XTERM_REVERSE_VIDEO 746#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 747 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 748 name = def_colorName [1 - i];
677 else 749 else
678#endif 750#endif
679 name = def_colorName [i]; 751 name = def_colorName [i];
680 752
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 943rxvt_term::create_windows (int argc, const char *const *argv)
872{ 944{
873 XClassHint classHint; 945 XClassHint classHint;
874 XWMHints wmHint; 946 XWMHints wmHint;
875#if ENABLE_FRILLS 947#if ENABLE_FRILLS
876 MWMHints mwmhints; 948 MWMHints mwmhints = { };
877#endif 949#endif
878 XGCValues gcvalue; 950 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 951 XSetWindowAttributes attributes;
880 Window top, parent; 952 Window top, parent;
881 953
… …
887 if (!set_fonts ()) 959 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 961
890 parent = display->root; 962 parent = display->root;
891 963
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 964 attributes.override_redirect = !!option (Opt_override_redirect);
893 965
894#if ENABLE_FRILLS 966#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 967 if (option (Opt_borderLess))
896 { 968 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 969 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 970 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 971 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900 attributes.override_redirect = true; 972 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 973 }
903 else 974 else
904 { 975 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 976 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 977 }
908 } 978 }
909 else
910 mwmhints.flags = 0;
911#endif 979#endif
912 980
913#if ENABLE_XEMBED 981#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
915 { 983 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 1018 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1019 classHint.res_class = (char *)RESCLASS;
952 1020
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1021 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1022 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1023 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1024 wmHint.window_group = top;
957 1025
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1026 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1027 &szHint, &wmHint, &classHint);
960 1028
… …
1017 attributes.bit_gravity = NorthWestGravity; 1085 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1086 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1087
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1088 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1089
1022 if (OPTION (Opt_pointerBlank)) 1090 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1091 vt_emask |= PointerMotionMask;
1024 else 1092 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1093 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1094
1027 vt_select_input (); 1095 vt_select_input ();
1028 1096
1029 vt_ev.start (display, vt); 1097 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 1098
1048 /* graphics context for the vt window */ 1099 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1100 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1101 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1102 gcvalue.graphics_exposures = 0;
… …
1079 * GET TTY CURRENT STATE * 1130 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */ 1131 * ------------------------------------------------------------------------- */
1081void 1132void
1082rxvt_get_ttymode (ttymode_t *tio, int erase) 1133rxvt_get_ttymode (ttymode_t *tio, int erase)
1083{ 1134{
1084#ifdef HAVE_TERMIOS_H
1085 /* 1135 /*
1086 * standard System V termios interface 1136 * standard System V termios interface
1087 */ 1137 */
1088 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1138 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1089 { 1139 {
… …
1156 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1206 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1157# if defined (ECHOCTL) && defined (ECHOKE) 1207# if defined (ECHOCTL) && defined (ECHOKE)
1158 | ECHOCTL | ECHOKE 1208 | ECHOCTL | ECHOKE
1159# endif 1209# endif
1160 | ECHOE | ECHOK); 1210 | 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 1211
1209 /* 1212 /*
1210 * Debugging 1213 * Debugging
1211 */ 1214 */
1212#ifdef DEBUG_TTYMODE 1215#ifdef DEBUG_TTYMODE
… …
1313 else 1316 else
1314#endif 1317#endif
1315 if (!pty->get ()) 1318 if (!pty->get ())
1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1319 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1317 1320
1321 int er;
1322
1323#ifndef NO_BACKSPACE_KEY
1324 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1325 er = rs[Rs_backspace_key][0];
1326 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */
1328 else
1329#endif
1330 er = -1;
1331
1332 rxvt_get_ttymode (&tio, er);
1333 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1318 pty->set_utf8_mode (enc_utf8); 1334 pty->set_utf8_mode (enc_utf8);
1319 1335
1320 /* set initial window size */ 1336 /* set initial window size */
1321 tt_winch (); 1337 tt_winch ();
1322
1323 int er;
1324
1325#ifndef NO_BACKSPACE_KEY
1326 if (key_backspace[0] && !key_backspace[1])
1327 er = key_backspace[0];
1328 else if (strcmp (key_backspace, "DEC") == 0)
1329 er = '\177'; /* the initial state anyway */
1330 else
1331#endif
1332 er = -1;
1333
1334 rxvt_get_ttymode (&tio, er);
1335 1338
1336#if ENABLE_FRILLS 1339#if ENABLE_FRILLS
1337 if (rs[Rs_pty_fd]) 1340 if (rs[Rs_pty_fd])
1338 return; 1341 return;
1339#endif 1342#endif
… …
1370 } 1373 }
1371 1374
1372 _exit (EXIT_FAILURE); 1375 _exit (EXIT_FAILURE);
1373 1376
1374 default: 1377 default:
1375 if (!OPTION (Opt_utmpInhibit)) 1378 if (!option (Opt_utmpInhibit))
1376 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1379 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1377 1380
1378 pty->close_tty (); 1381 pty->close_tty ();
1379 1382
1380 child_ev.start (cmd_pid); 1383 child_ev.start (cmd_pid);
1381 1384
… …
1394int 1397int
1395rxvt_term::run_child (const char *const *argv) 1398rxvt_term::run_child (const char *const *argv)
1396{ 1399{
1397 char *login; 1400 char *login;
1398 1401
1399 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1400
1401 if (OPTION (Opt_console)) 1402 if (option (Opt_console))
1402 { /* be virtual console, fail silently */ 1403 { /* be virtual console, fail silently */
1403#ifdef TIOCCONS 1404#ifdef TIOCCONS
1404 unsigned int on = 1; 1405 unsigned int on = 1;
1405 1406
1406 ioctl (STDIN_FILENO, TIOCCONS, &on); 1407 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1434 sigset_t ss; 1435 sigset_t ss;
1435 sigemptyset (&ss); 1436 sigemptyset (&ss);
1436 sigprocmask (SIG_SETMASK, &ss, 0); 1437 sigprocmask (SIG_SETMASK, &ss, 0);
1437 1438
1438 /* command interpreter path */ 1439 /* command interpreter path */
1439 if (argv != NULL) 1440 if (argv)
1440 { 1441 {
1441# ifdef DEBUG_CMD 1442# ifdef DEBUG_CMD
1442 int i; 1443 int i;
1443 1444
1444 for (i = 0; argv[i]; i++) 1445 for (i = 0; argv[i]; i++)
… …
1453 const char *argv0, *shell; 1454 const char *argv0, *shell;
1454 1455
1455 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1456 shell = "/bin/sh"; 1457 shell = "/bin/sh";
1457 1458
1458 argv0 = (const char *)rxvt_r_basename (shell); 1459 argv0 = (const char *)rxvt_basename (shell);
1459 1460
1460 if (OPTION (Opt_loginShell)) 1461 if (option (Opt_loginShell))
1461 { 1462 {
1462 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1463 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1463 1464
1464 login[0] = '-'; 1465 login[0] = '-';
1465 strcpy (&login[1], argv0); 1466 strcpy (&login[1], argv0);
1466 argv0 = login; 1467 argv0 = login;
1467 } 1468 }
1468 1469
1469 execlp (shell, argv0, NULL); 1470 execlp (shell, argv0, (char *)0);
1470 /* no error message: STDERR is closed! */ 1471 /* no error message: STDERR is closed! */
1471 } 1472 }
1472 1473
1473 return -1; 1474 return -1;
1474} 1475}

Diff Legend

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