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.125 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.214 by ayin, Fri Sep 14 17:10:34 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-2004 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 18 *
16 * This program is free software; you can redistribute it and/or modify 19 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 20 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 21 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 22 * (at your option) any later version.
… …
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 "Black", /* 0: black (#000000) */ 139 "rgb:00/00/00", // 0: black (Black)
49#ifndef NO_BRIGHTCOLOR 140 "rgb:cd/00/00", // 1: red (Red3)
50 "Red3", /* 1: red (#CD0000) */ 141 "rgb:00/cd/00", // 2: green (Green3)
51 "Green3", /* 2: green (#00CD00) */ 142 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Yellow3", /* 3: yellow (#CDCD00) */ 143 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Blue3", /* 4: blue (#0000CD) */ 144 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Magenta3", /* 5: magenta (#CD00CD) */ 145 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55 "Cyan3", /* 6: cyan (#00CDCD) */ 146# ifdef XTERM_COLORS
56# ifdef XTERM_COLORS 147 "rgb:e5/e5/e5", // 7: white (Grey90)
57 "Grey90", /* 7: white (#E5E5E5) */ 148# else
58# else 149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59 "AntiqueWhite", /* 7: white (#FAEBD7) */
60# endif 150# endif
61 /* high-intensity colors */ 151 /* high-intensity colors */
62# ifdef XTERM_COLORS 152# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 153 "rgb:4d/4d/4d", // 8: bright black (Grey30)
64# else 154# else
65 "Grey25", /* 8: bright black (#404040) */ 155 "rgb:40/40/40", // 8: bright black (Grey25)
66# endif 156# endif
67#endif /* NO_BRIGHTCOLOR */ 157 "rgb:ff/00/00", // 1/9: bright red (Reed)
68 "Red", /* 1/9: bright red (#FF0000) */ 158 "rgb:00/ff/00", // 2/10: bright green (Green)
69 "Green", /* 2/10: bright green (#00FF00) */ 159 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 160 "rgb:00/00/ff", // 4/12: bright blue (Blue)
71 "Blue", /* 4/12: bright blue (#0000FF) */ 161 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 162 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
73 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 163 "rgb:ff/ff/ff", // 7/15: bright white (White)
74 "White", /* 7/15: bright white (#FFFFFF) */
75 164
76 // 88 xterm colours 165 // 88 xterm colours
77 "rgb:00/00/00", 166 "rgb:00/00/00",
78 "rgb:00/00/8b", 167 "rgb:00/00/8b",
79 "rgb:00/00/cd", 168 "rgb:00/00/cd",
… …
168#endif 257#endif
169#ifdef KEEP_SCROLLCOLOR 258#ifdef KEEP_SCROLLCOLOR
170 COLOR_SCROLLBAR, 259 COLOR_SCROLLBAR,
171 COLOR_SCROLLTROUGH, 260 COLOR_SCROLLTROUGH,
172#endif /* KEEP_SCROLLCOLOR */ 261#endif /* KEEP_SCROLLCOLOR */
173#if TINTING 262#if ENABLE_TRANSPARENCY
174 NULL, 263 NULL,
175#endif 264#endif
176#if OFF_FOCUS_FADING 265#if OFF_FOCUS_FADING
177 "black", 266 "rgb:00/00/00",
178#endif
179 };
180
181const char *const xa_names[] =
182 {
183 "TEXT",
184 "COMPOUND_TEXT",
185 "UTF8_STRING",
186 "MULTIPLE",
187 "TARGETS",
188 "TIMESTAMP",
189 "VT_SELECTION",
190 "INCR",
191 "WM_PROTOCOLS",
192 "WM_DELETE_WINDOW",
193 "CLIPBOARD",
194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
198 "_NET_WM_PID",
199 "_NET_WM_NAME",
200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
202#endif
203#if USE_XIM
204 "WM_LOCALE_NAME",
205#endif
206#ifdef TRANSPARENT
207 "_XROOTPMAP_ID",
208 "ESETROOT_PMAP_ID",
209#endif
210#ifdef OFFIX_DND
211 "DndProtocol",
212 "DndSelection",
213#endif
214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif 267#endif
218 }; 268 };
219 269
220bool 270bool
221rxvt_term::init_vars () 271rxvt_term::init_vars ()
222{ 272{
273 pix_colors = //
223 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
224#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
226#endif 277#endif
227 pix_colors = pix_colors_focused;
228 278
229 if (pix_colors == NULL)
230 return false;
231
232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
233 pixmap = None;
234#endif
235 279
236 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
237 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
238 options = DEFAULT_OPTIONS;
239 want_refresh = 1; 282 want_refresh = 1;
240 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
241 focus = 0;
242 ncol = 80; 284 ncol = 80;
243 nrow = 24; 285 nrow = 24;
244 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
245 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
246 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
247 saveLines = SAVELINES; 289 saveLines = SAVELINES;
248 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
249 291
250 refresh_limit = 1;
251 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
252 prev_nrow = prev_ncol = 0;
253 293
254 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
255#ifdef XPM_BACKGROUND
256 /* bgPixmap.w = bgPixmap.h = 0; */
257 bgPixmap.x = bgPixmap.y = 50;
258 bgPixmap.pixmap = None;
259#endif
260
261 last_bot = last_state = -1; 295 last_bot = last_state = -1;
262 296
263#ifdef MENUBAR 297 set_option (Opt_scrollBar);
264 menu_readonly = 1; 298 set_option (Opt_scrollTtyOutput);
265# if ! (MENUBAR_MAX > 1) 299 set_option (Opt_jumpScroll);
266 CurrentBar = &BarList; 300 set_option (Opt_skipScroll);
267# endif /* (MENUBAR_MAX > 1) */ 301 set_option (Opt_secondaryScreen);
268#endif 302 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52);
269 306
270 return true; 307 return true;
271} 308}
272 309
273void 310void
… …
307/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
308const char ** 345const char **
309rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
310{ 347{
311 int i, r_argc; 348 int i, r_argc;
312 char *val;
313 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
314 350
315 /* 351 /*
316 * 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
317 */ 353 */
318 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
319 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 355 if (!strcmp (argv[r_argc], "-e"))
320 break; 356 break;
321 357
322 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
323 359
324 for (i = 0; i < r_argc; i++) 360 for (i = 0; i < r_argc; i++)
… …
336 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
337 373
338 cmd_argv[i] = NULL; 374 cmd_argv[i] = NULL;
339 } 375 }
340 376
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 377 rs[Rs_name] = rxvt_basename (argv[0]);
342 378
343 /* 379 /*
344 * Open display, get options/resources and create the window 380 * Open display, get options/resources and create the window
345 */ 381 */
382
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 383 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 384 rs[Rs_display_name] = ":0";
348 385
349 get_options (r_argc, r_argv); 386 get_options (r_argc, r_argv);
350 387
351 if (!(display = displays.get (rs[Rs_display_name]))) 388 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 390
391 // using a local pointer decreases code size a lot
392 xa = display->xa;
393
394 set (display);
354 extract_resources (); 395 extract_resources ();
396
397#if XFT
398 if (rs[Rs_depth])
399 select_visual (strtol (rs[Rs_depth], 0, 0));
400#endif
401
402#ifdef HAVE_AFTERIMAGE
403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif
355 free (r_argv); 405 free (r_argv);
406
407 for (int i = NUM_RESOURCES; i--; )
408 if (rs [i] == resval_undef)
409 rs [i] = 0;
410
411#if ENABLE_PERL
412 if (!rs[Rs_perl_ext_1])
413 rs[Rs_perl_ext_1] = "default";
414
415 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
416 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
417 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
418 {
419 rxvt_perl.init (this);
420 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
421 }
422#endif
356 423
357 /* 424 /*
358 * set any defaults not already set 425 * set any defaults not already set
359 */ 426 */
360 if (cmd_argv && cmd_argv[0]) 427 if (cmd_argv && cmd_argv[0])
361 { 428 {
362 if (!rs[Rs_title]) 429 if (!rs[Rs_title])
363 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 430 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
364 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
365 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
366 } 433 }
367 else 434 else
368 { 435 {
… …
371 if (!rs[Rs_iconName]) 438 if (!rs[Rs_iconName])
372 rs[Rs_iconName] = rs[Rs_name]; 439 rs[Rs_iconName] = rs[Rs_name];
373 } 440 }
374 441
375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
376 saveLines = min (i, std::numeric_limits<int16_t>::max ()); 443 saveLines = min (i, MAX_SAVELINES);
377 444
378#if ENABLE_FRILLS 445#if ENABLE_FRILLS
379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 446 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 447 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381 448
… …
393 pointerBlankDelay = 2; 460 pointerBlankDelay = 2;
394#endif 461#endif
395 462
396 /* no point having a scrollbar without having any scrollback! */ 463 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 464 if (!saveLines)
398 options &= ~Opt_scrollBar; 465 set_option (Opt_scrollBar, 0);
399 466
400#ifdef PRINTPIPE 467#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 468 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 469 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 470#endif
… …
406 rs[Rs_cutchars] = CUTCHARS; 473 rs[Rs_cutchars] = CUTCHARS;
407 474
408#ifndef NO_BACKSPACE_KEY 475#ifndef NO_BACKSPACE_KEY
409 if (!rs[Rs_backspace_key]) 476 if (!rs[Rs_backspace_key])
410# ifdef DEFAULT_BACKSPACE 477# ifdef DEFAULT_BACKSPACE
411 key_backspace = DEFAULT_BACKSPACE; 478 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
412# else 479# else
413 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 480 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
414# endif 481# endif
415 else
416 {
417 val = strdup (rs[Rs_backspace_key]);
418 rxvt_Str_trim (val);
419 rxvt_Str_escaped (val);
420 key_backspace = val;
421 }
422#endif 482#endif
423 483
424#ifndef NO_DELETE_KEY 484#ifndef NO_DELETE_KEY
425 if (!rs[Rs_delete_key]) 485 if (!rs[Rs_delete_key])
426# ifdef DEFAULT_DELETE 486# ifdef DEFAULT_DELETE
427 key_delete = DEFAULT_DELETE; 487 rs[Rs_delete_key] = DEFAULT_DELETE;
428# else 488# else
429 key_delete = "\033[3~"; 489 rs[Rs_delete_key] = "\033[3~";
430# endif
431 else
432 {
433 val = strdup (rs[Rs_delete_key]);
434 rxvt_Str_trim (val);
435 rxvt_Str_escaped (val);
436 key_delete = val;
437 }
438#endif 490# endif
439 if (rs[Rs_answerbackstring]) 491#endif
440 {
441 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
442 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
443 }
444 492
445#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
446 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]);
447#endif 495#endif
448 496
449#ifdef XTERM_REVERSE_VIDEO 497#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 498 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 499 if (option (Opt_reverseVideo))
452 { 500 {
453 if (!rs[Rs_color + Color_fg]) 501 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 502 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
503
455 if (!rs[Rs_color + Color_bg]) 504 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 505 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 506 }
458#endif 507#endif
459 508
… …
461 if (!rs[Rs_color + i]) 510 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 511 rs[Rs_color + i] = def_colorName[i];
463 512
464#ifndef XTERM_REVERSE_VIDEO 513#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 514 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 515 if (option (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 516 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 517#endif
469 518
470 /* convenient aliases for setting fg/bg to colors */ 519 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 520 color_aliases (Color_fg);
… …
492/*----------------------------------------------------------------------*/ 541/*----------------------------------------------------------------------*/
493void 542void
494rxvt_term::init_env () 543rxvt_term::init_env ()
495{ 544{
496 int i; 545 int i;
497 unsigned int u;
498 char *val; 546 char *val;
499 547
500#ifdef DISPLAY_IS_IP 548#ifdef DISPLAY_IS_IP
501 /* Fixup display_name for export over pty to any interested terminal 549 /* Fixup display_name for export over pty to any interested terminal
502 * 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
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 559 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 560 rs[Rs_display_name] = (const char *)val;
513 561
514 if (val == NULL) 562 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 563#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 564 val = XDisplayString (dpy);
517 565
518 if (rs[Rs_display_name] == NULL) 566 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 567 rs[Rs_display_name] = val; /* use broken `:0' value */
520 568
521 i = strlen (val); 569 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 570 env_display = (char *)rxvt_malloc (i + 9);
523 571
524 sprintf (env_display, "DISPLAY=%s", val); 572 sprintf (env_display, "DISPLAY=%s", val);
525 573
526 /* avoiding the math library: 574 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ;
530 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532
533 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)parent[0]);
535 575
536 /* add entries to the environment: 576 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 577 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 578 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 579 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 581 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 582 * @ COLORFGBG: fg;bg color codes
543 */ 583 */
544 putenv (env_display); 584 putenv (env_display);
545 putenv (env_windowid); 585 putenv (env_windowid);
586
546 if (env_colorfgbg) 587 if (env_colorfgbg)
547 putenv (env_colorfgbg); 588 putenv (env_colorfgbg);
548 589
549#ifdef RXVT_TERMINFO 590#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 591 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 592#endif
552 593
553 if (display->depth <= 2) 594 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 595 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 596 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 597 putenv ("COLORTERM=" COLORTERMENVFULL);
557 598
558 if (rs[Rs_term_name] != NULL) 599 if (rs[Rs_term_name] != NULL)
559 { 600 {
560 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);
561 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 602 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
562 putenv (env_term); 603 putenv (env_term);
563 } 604 }
564 else 605 else
565 putenv ("TERM=" TERMENV); 606 putenv ("TERM=" TERMENV);
… …
578 * This should support all European type languages. 619 * This should support all European type languages.
579 */ 620 */
580void 621void
581rxvt_term::set_locale (const char *locale) 622rxvt_term::set_locale (const char *locale)
582{ 623{
624 set_environ (envv);
625
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 626#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 627 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 628 this->locale = setlocale (LC_CTYPE, locale);
586 629
587 if (!this->locale) 630 if (!this->locale)
588 { 631 {
589 if (*locale) 632 if (*locale)
590 { 633 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 634 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 635 setlocale (LC_CTYPE, "C");
593 } 636 }
594 else 637 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 638 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 639
597 this->locale = ""; 640 this->locale = "C";
598 } 641 }
599 642
600 643
601 this->locale = rxvt_strdup (this->locale); 644 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 645 SET_LOCALE (this->locale);
… …
617} 660}
618 661
619void 662void
620rxvt_term::init_xlocale () 663rxvt_term::init_xlocale ()
621{ 664{
665 set_environ (envv);
666
622#ifdef USE_XIM 667#ifdef USE_XIM
623 if (!locale) 668 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 669 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 670 else
626 { 671 {
… …
648 * Initialize the command connection. 693 * Initialize the command connection.
649 * This should be called after the X server connection is established. 694 * This should be called after the X server connection is established.
650 */ 695 */
651 696
652#ifdef META8_OPTION 697#ifdef META8_OPTION
653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 698 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 699#endif
655 700
656 get_ourmods (); 701 get_ourmods ();
657 702
658 if (!(options & Opt_scrollTtyOutput)) 703 if (!option (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 704 priv_modes |= PrivMode_TtyOutputInh;
660 if (options & Opt_scrollTtyKeypress) 705 if (option (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 706 priv_modes |= PrivMode_Keypress;
662 if (!(options & Opt_jumpScroll)) 707 if (!option (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 708 priv_modes |= PrivMode_smoothScroll;
664 709
665#ifndef NO_BACKSPACE_KEY 710#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 711 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 712 priv_modes |= PrivMode_HaveBackSpace;
668#endif 713#endif
669 714
670 /* add value for scrollBar */ 715 /* add value for scrollBar */
671 if (scrollbar_visible ()) 716 if (scrollBar.state)
672 { 717 {
673 priv_modes |= PrivMode_scrollBar; 718 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 719 SavedModes |= PrivMode_scrollBar;
675 } 720 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 721
688 run_command (argv); 722 run_command (argv);
689} 723}
690 724
691/*----------------------------------------------------------------------*/ 725/*----------------------------------------------------------------------*/
… …
696 730
697#ifdef OFF_FOCUS_FADING 731#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 732 pix_colors = pix_colors_focused;
699#endif 733#endif
700 734
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 736 {
737 const char *name = rs[Rs_color + i];
738
739 if (!name)
740 continue;
741
703 rxvt_color xcol; 742 rxvt_color xcol;
704 743
705 if (!rs[Rs_color + i]) 744 if (!set_color (xcol, name))
706 continue;
707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 745 {
710#ifndef XTERM_REVERSE_VIDEO 746#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 747 if (i < 2 && option (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 748 name = def_colorName [1 - i];
713 else 749 else
714#endif 750#endif
715 rs[Rs_color + i] = def_colorName[i]; 751 name = def_colorName [i];
716 752
717 if (!rs[Rs_color + i]) 753 if (!name)
718 continue; 754 continue;
719 755
720 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 756 if (!set_color (xcol, name))
721 { 757 {
722 switch (i) 758 switch (i)
723 { 759 {
724 case Color_fg: 760 case Color_fg:
725 case Color_bg: 761 case Color_bg:
726 /* fatal: need bg/fg color */
727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 762 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
728 /* NOTREACHED */ 763 name = "";
729 break; 764 break;
730#ifndef NO_CURSORCOLOR 765#ifndef NO_CURSORCOLOR
731 case Color_cursor2: 766 case Color_cursor2:
732 xcol = pix_colors[Color_fg]; 767#endif
733 break;
734#endif /* ! NO_CURSORCOLOR */
735 case Color_pointer_fg: 768 case Color_pointer_fg:
736 xcol = pix_colors[Color_fg]; 769 name = rs[Rs_color + Color_fg];
770 xcol.set (this, name);
737 break; 771 break;
738 default: 772 default:
739 xcol = pix_colors[Color_bg]; /* None */ 773 name = rs[Rs_color + Color_bg];
774 xcol.set (this, name);
740 break; 775 break;
741 } 776 }
742 } 777 }
743 } 778 }
744 779
745 pix_colors[i] = xcol; 780 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i); 781 rs[Rs_color + i] = name;
747 }
748
749#ifdef OFF_FOCUS_FADING
750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
752 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
753#endif
754
755 if (display->depth <= 2)
756 { 782 }
783
784 if (depth <= 2)
785 {
757 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 786 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 787 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
759 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 788 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
760 } 789 }
761 790
762 /* 791 /*
763 * get scrollBar/menuBar shadow colors 792 * get scrollBar shadow colors
764 * 793 *
765 * The calculations of topShadow/bottomShadow values are adapted 794 * The calculations of topShadow/bottomShadow values are adapted
766 * from the fvwm window manager. 795 * from the fvwm window manager.
767 */ 796 */
768#ifdef KEEP_SCROLLCOLOR 797#ifdef KEEP_SCROLLCOLOR
769
770 if (display->depth <= 2) 798 if (depth <= 2)
771 { 799 {
772 /* Monochrome */ 800 /* Monochrome */
773 pix_colors[Color_scroll] = pix_colors[Color_fg]; 801 alias_color (Color_scroll, Color_fg);
774 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 802 alias_color (Color_topShadow, Color_bg);
775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 803 alias_color (Color_bottomShadow, Color_bg);
776 } 804 }
777 else 805 else
778 { 806 {
779 rxvt_color xcol[2]; 807 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
780 /* xcol[0] == white
781 * xcol[1] == top shadow
782 * xcol[2] == bot shadow */
783 808
784 xcol[1] = pix_colors[Color_scroll]; 809 rgba cscroll;
785 xcol[0].set (display, 65535, 65535, 65535); 810 pix_colors [Color_scroll].get (cscroll);
786
787 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
788
789 xcol[0].get (display, pr0, pg0, pb0);
790 xcol[1].get (display, pr1, pg1, pb1);
791
792 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
793 811
794 /* topShadowColor */ 812 /* topShadowColor */
795 if (!xcol[1].set (display, 813 if (!pix_colors[Color_topShadow].set (this,
796 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 814 rgba (
797 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 815 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
798 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 816 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
799 xcol[1] = pix_colors[Color_White]; 817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
800 818 cscroll.a)
801 pix_colors[Color_topShadow] = xcol[1]; 819 ))
820 alias_color (Color_topShadow, Color_White);
802 } 821 }
803#endif /* KEEP_SCROLLCOLOR */ 822#endif /* KEEP_SCROLLCOLOR */
823
824#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i);
827#endif
804} 828}
805 829
806/*----------------------------------------------------------------------*/ 830/*----------------------------------------------------------------------*/
807/* color aliases, fg/bg bright-bold */ 831/* color aliases, fg/bg bright-bold */
808void 832void
… …
813 int i = atoi (rs[Rs_color + idx]); 837 int i = atoi (rs[Rs_color + idx]);
814 838
815 if (i >= 8 && i <= 15) 839 if (i >= 8 && i <= 15)
816 { /* bright colors */ 840 { /* bright colors */
817 i -= 8; 841 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 842 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 843 return;
821#endif
822 } 844 }
823 845
824 if (i >= 0 && i <= 7) /* normal colors */ 846 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 847 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 848 }
… …
849 871
850 if (rsmod 872 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 873 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 874 requestedmeta = rsmod[3] - '0';
853 875
854 map = XGetModifierMapping (display->display); 876 map = XGetModifierMapping (dpy);
855 kc = map->modifiermap; 877 kc = map->modifiermap;
856 878
857 for (i = 1; i < 6; i++) 879 for (i = 1; i < 6; i++)
858 { 880 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 881 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 883 for (j = map->max_keypermod; j--; k++)
862 { 884 {
863 if (kc[k] == 0) 885 if (kc[k] == 0)
864 break; 886 break;
865 887
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 888 switch (XKeycodeToKeysym (dpy, kc[k], 0))
867 { 889 {
868 case XK_Num_Lock: 890 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 891 ModNumLockMask = modmasks[i - 1];
870 continue; 892 continue;
871 893
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 943rxvt_term::create_windows (int argc, const char *const *argv)
922{ 944{
923 XClassHint classHint; 945 XClassHint classHint;
924 XWMHints wmHint; 946 XWMHints wmHint;
925#if ENABLE_FRILLS 947#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 948 MWMHints mwmhints = { };
928#endif 949#endif
929 XGCValues gcvalue; 950 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 951 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 952 Window top, parent;
934 dDisp;
935 953
936#ifdef USING_W11LIB 954 dLocal (Display *, dpy);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 955
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 956 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 957 Get_Colours ();
943 958
944 if (options & Opt_transparent) 959 if (!set_fonts ())
945 { 960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 961
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 962 parent = display->root;
948 } 963
964 attributes.override_redirect = !!option (Opt_override_redirect);
949 965
950#if ENABLE_FRILLS 966#if ENABLE_FRILLS
951 if (options & Opt_borderLess) 967 if (option (Opt_borderLess))
952 { 968 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 969 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 970 {
957 /* 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");
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 972 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0;
962 } 973 }
963 else 974 else
964 { 975 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 976 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 977 }
968 } 978 }
969 else
970 mwmhints.flags = 0;
971#endif 979#endif
972
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980 980
981#if ENABLE_XEMBED 981#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
983 { 983 {
984 XWindowAttributes wattr; 984 XWindowAttributes wattr;
985 985
986 parent = strtol (rs[Rs_embed], 0, 0); 986 parent = strtol (rs[Rs_embed], 0, 0);
987 987
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 988 if (!XGetWindowAttributes (dpy, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 990
991 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
992 } 992 }
993#endif 993#endif
994 994
995 window_calc (0, 0); 995 window_calc (0, 0);
996 996
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 1000 attributes.colormap = cmap;
1001
1002 top = XCreateWindow (disp, parent, 1002 top = XCreateWindow (dpy, parent,
1003 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
1005 ext_bwidth, 1005 ext_bwidth,
1006 display->depth, InputOutput, 1006 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1007 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 1008 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 1009
1018 this->parent[0] = top; 1010 this->parent[0] = top;
1019 1011
1020 old_width = szHint.width; 1012 old_width = szHint.width;
1021 old_height = szHint.height; 1013 old_height = szHint.height;
1022 1014
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1015 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1016 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 1017
1026 classHint.res_name = (char *)rs[Rs_name]; 1018 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1019 classHint.res_class = (char *)RESCLASS;
1028 1020
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1021 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 1022 wmHint.input = True;
1031 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1023 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1024 wmHint.window_group = top;
1033 1025
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1026 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1027 &szHint, &wmHint, &classHint);
1028
1029#if ENABLE_FRILLS
1030 if (mwmhints.flags)
1031 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1032 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1033#endif
1036 1034
1037 Atom protocols[] = { 1035 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 1036 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 1037#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 1038 xa[XA_NET_WM_PING],
1041#endif 1039#endif
1042 }; 1040 };
1043 1041
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1042 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043
1044#if ENABLE_FRILLS
1045 if (rs[Rs_transient_for])
1046 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1047#endif
1045 1048
1046#if ENABLE_EWMH 1049#if ENABLE_EWMH
1047 long pid = getpid (); 1050 long pid = getpid ();
1048 1051
1049 XChangeProperty (disp, top, 1052 XChangeProperty (dpy, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1053 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1051 PropModeReplace, (unsigned char *)&pid, 1); 1054 PropModeReplace, (unsigned char *)&pid, 1);
1052 1055
1053 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1056 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1054#endif 1057#endif
1055 1058
1056 XSelectInput (disp, top, 1059 XSelectInput (dpy, top,
1057 KeyPressMask 1060 KeyPressMask
1058#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1061#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1059 | KeyReleaseMask 1062 | KeyReleaseMask
1060#endif 1063#endif
1061 | FocusChangeMask | VisibilityChangeMask 1064 | FocusChangeMask | VisibilityChangeMask
1062 | ExposureMask | StructureNotifyMask); 1065 | ExposureMask | StructureNotifyMask);
1063 1066
1064 termwin_ev.start (display, top); 1067 termwin_ev.start (display, top);
1065 1068
1066#if ENABLE_FRILLS
1067 if (mwmhints.flags)
1068 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1069 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1070#endif
1071
1072 /* vt cursor: Black-on-White is standard, but this is more popular */ 1069 /* vt cursor: Black-on-White is standard, but this is more popular */
1073 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1070 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1074 1071
1075#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1072#ifdef HAVE_SCROLLBARS
1076 /* cursor (menuBar/scrollBar): Black-on-White */ 1073 /* cursor scrollBar: Black-on-White */
1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1074 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1078#endif 1075#endif
1079 1076
1080 /* the vt window */ 1077 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1078 vt = XCreateSimpleWindow (dpy, top,
1082 window_vt_x,
1083 window_vt_y, 1079 window_vt_x, window_vt_y,
1084 TermWin_TotalWidth (), 1080 width, height,
1085 TermWin_TotalHeight (),
1086 0, 1081 0,
1087 pix_colors_focused[Color_fg], 1082 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1083 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window");
1091#endif
1092 1084
1093 attributes.bit_gravity = NorthWestGravity; 1085 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1086 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1095 1087
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1088 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1089
1098#ifdef POINTER_BLANK
1099 if (options & Opt_pointerBlank) 1090 if (option (Opt_pointerBlank))
1100 vt_emask |= PointerMotionMask; 1091 vt_emask |= PointerMotionMask;
1101 else 1092 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1093 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1094
1105 XSelectInput (disp, vt, vt_emask); 1095 vt_select_input ();
1096
1106 vt_ev.start (display, vt); 1097 vt_ev.start (display, vt);
1107 1098
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ())
1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0,
1113 TermWin_TotalWidth (),
1114 menuBar_TotalHeight (),
1115 0,
1116 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]);
1118
1119#ifdef DEBUG_X
1120 XStoreName (disp, menuBar.win, "menubar");
1121#endif
1122
1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125 XDefineCursor (disp, menuBar.win,
1126 XCreateFontCursor (disp, XC_left_ptr));
1127
1128 XSelectInput (disp, menuBar.win,
1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1130 menubar_ev.start (display, menuBar.win);
1131 }
1132#endif
1133
1134#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! (options & Opt_transparent))
1137 {
1138 const char *p = rs[Rs_backgroundPixmap];
1139
1140 if ((p = strchr (p, ';')) != NULL)
1141 {
1142 p++;
1143 scale_pixmap (p);
1144 }
1145
1146 set_bgPixmap (rs[Rs_backgroundPixmap]);
1147 scr_touch (true);
1148 }
1149#endif
1150
1151 /* graphics context for the vt window */ 1099 /* graphics context for the vt window */
1152 gcvalue.foreground = pix_colors[Color_fg]; 1100 gcvalue.foreground = pix_colors[Color_fg];
1153 gcvalue.background = pix_colors[Color_bg]; 1101 gcvalue.background = pix_colors[Color_bg];
1154 gcvalue.graphics_exposures = 1; 1102 gcvalue.graphics_exposures = 0;
1103
1155 gc = XCreateGC (disp, vt, 1104 gc = XCreateGC (dpy, vt,
1156 GCForeground | GCBackground | GCGraphicsExposures, 1105 GCForeground | GCBackground | GCGraphicsExposures,
1157 &gcvalue); 1106 &gcvalue);
1158 1107
1159 drawable = new rxvt_drawable (display, vt); 1108 drawable = new rxvt_drawable (this, vt);
1160 1109
1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1110#ifdef RXVT_SCROLLBAR
1162 gcvalue.foreground = pix_colors[Color_topShadow]; 1111 gcvalue.foreground = pix_colors[Color_topShadow];
1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1112 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1114 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1115 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1116 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1168#endif 1117#endif
1169 1118
1170#ifdef OFF_FOCUS_FADING 1119#ifdef OFF_FOCUS_FADING
1171 // initially we are in unfocused state 1120 // initially we are in unfocused state
1172 if (rs[Rs_fade]) 1121 if (rs[Rs_fade])
1173 pix_colors = pix_colors_unfocused; 1122 pix_colors = pix_colors_unfocused;
1174#endif 1123#endif
1175 1124
1176 pointer_unblank (); 1125 pointer_unblank ();
1177 scr_recolour (); 1126 scr_recolour ();
1178
1179#if ENABLE_XEMBED
1180 if (rs[Rs_embed])
1181 {
1182 long info[2] = { 0, XEMBED_MAPPED };
1183
1184 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185 32, PropModeReplace, (unsigned char *)&info, 2);
1186 }
1187#endif
1188} 1127}
1189 1128
1190/* ------------------------------------------------------------------------- * 1129/* ------------------------------------------------------------------------- *
1191 * GET TTY CURRENT STATE * 1130 * GET TTY CURRENT STATE *
1192 * ------------------------------------------------------------------------- */ 1131 * ------------------------------------------------------------------------- */
1193void 1132void
1194rxvt_get_ttymode (ttymode_t *tio, int erase) 1133rxvt_get_ttymode (ttymode_t *tio, int erase)
1195{ 1134{
1196#ifdef HAVE_TERMIOS_H
1197 /* 1135 /*
1198 * standard System V termios interface 1136 * standard System V termios interface
1199 */ 1137 */
1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1138 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1201 { 1139 {
1202 /* return error - use system defaults */ 1140 // return error - use system defaults,
1141 // where possible, and zero elsewhere
1142 memset (tio, 0, sizeof (ttymode_t));
1143
1203 tio->c_cc[VINTR] = CINTR; 1144 tio->c_cc[VINTR] = CINTR;
1204 tio->c_cc[VQUIT] = CQUIT; 1145 tio->c_cc[VQUIT] = CQUIT;
1205 tio->c_cc[VERASE] = CERASE; 1146 tio->c_cc[VERASE] = CERASE;
1147#ifdef VERASE2
1148 tio->c_cc[VERASE2] = CERASE2;
1149#endif
1206 tio->c_cc[VKILL] = CKILL; 1150 tio->c_cc[VKILL] = CKILL;
1207 tio->c_cc[VSTART] = CSTART; 1151 tio->c_cc[VSTART] = CSTART;
1208 tio->c_cc[VSTOP] = CSTOP; 1152 tio->c_cc[VSTOP] = CSTOP;
1209 tio->c_cc[VSUSP] = CSUSP; 1153 tio->c_cc[VSUSP] = CSUSP;
1210# ifdef VDSUSP 1154# ifdef VDSUSP
… …
1262 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1206 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1263# if defined (ECHOCTL) && defined (ECHOKE) 1207# if defined (ECHOCTL) && defined (ECHOKE)
1264 | ECHOCTL | ECHOKE 1208 | ECHOCTL | ECHOKE
1265# endif 1209# endif
1266 | ECHOE | ECHOK); 1210 | ECHOE | ECHOK);
1267# else /* HAVE_TERMIOS_H */
1268
1269 /*
1270 * sgtty interface
1271 */
1272
1273 /* get parameters -- gtty */
1274 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1275 {
1276 tio->sg.sg_erase = CERASE; /* ^H */
1277 tio->sg.sg_kill = CKILL; /* ^U */
1278 }
1279
1280 if (erase != -1)
1281 tio->sg.sg_erase = (char)erase;
1282
1283 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1284
1285 /* get special characters */
1286 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1287 {
1288 tio->tc.t_intrc = CINTR; /* ^C */
1289 tio->tc.t_quitc = CQUIT; /* ^\ */
1290 tio->tc.t_startc = CSTART; /* ^Q */
1291 tio->tc.t_stopc = CSTOP; /* ^S */
1292 tio->tc.t_eofc = CEOF; /* ^D */
1293 tio->tc.t_brkc = -1;
1294 }
1295
1296 /* get local special chars */
1297 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1298 {
1299 tio->lc.t_suspc = CSUSP; /* ^Z */
1300 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1301 tio->lc.t_rprntc = CRPRNT; /* ^R */
1302 tio->lc.t_flushc = CFLUSH; /* ^O */
1303 tio->lc.t_werasc = CWERASE; /* ^W */
1304 tio->lc.t_lnextc = CLNEXT; /* ^V */
1305 }
1306 /* get line discipline */
1307 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1308# ifdef NTTYDISC
1309 tio->line = NTTYDISC;
1310# endif /* NTTYDISC */
1311
1312 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1313#endif /* HAVE_TERMIOS_H */
1314 1211
1315 /* 1212 /*
1316 * Debugging 1213 * Debugging
1317 */ 1214 */
1318#ifdef DEBUG_TTYMODE 1215#ifdef DEBUG_TTYMODE
… …
1403rxvt_term::run_command (const char *const *argv) 1300rxvt_term::run_command (const char *const *argv)
1404{ 1301{
1405#if ENABLE_FRILLS 1302#if ENABLE_FRILLS
1406 if (rs[Rs_pty_fd]) 1303 if (rs[Rs_pty_fd])
1407 { 1304 {
1408 pty.pty = atoi (rs[Rs_pty_fd]); 1305 pty->pty = atoi (rs[Rs_pty_fd]);
1409 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1306
1307 if (pty->pty >= 0)
1308 {
1309 if (getfd_hook)
1310 pty->pty = (*getfd_hook) (pty->pty);
1311
1312 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1313 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1314 }
1410 } 1315 }
1411 else 1316 else
1412#endif 1317#endif
1413 if (!pty.get ()) 1318 if (!pty->get ())
1414 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1319 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1415 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 */
1416 pty.set_utf8_mode (enc_utf8); 1334 pty->set_utf8_mode (enc_utf8);
1417 1335
1418 /* set initial window size */ 1336 /* set initial window size */
1419 tt_winch (); 1337 tt_winch ();
1420
1421 int er;
1422
1423#ifndef NO_BACKSPACE_KEY
1424 if (key_backspace[0] && !key_backspace[1])
1425 er = key_backspace[0];
1426 else if (strcmp (key_backspace, "DEC") == 0)
1427 er = '\177'; /* the initial state anyway */
1428 else
1429#endif
1430 er = -1;
1431
1432 rxvt_get_ttymode (&tio, er);
1433 1338
1434#if ENABLE_FRILLS 1339#if ENABLE_FRILLS
1435 if (rs[Rs_pty_fd]) 1340 if (rs[Rs_pty_fd])
1436 return; 1341 return;
1437#endif 1342#endif
1438 1343
1439#ifndef __QNX__
1440 /* spin off the command interpreter */ 1344 /* spin off the command interpreter */
1441 switch (cmd_pid = fork ()) 1345 switch (cmd_pid = fork ())
1442 { 1346 {
1443 case -1: 1347 case -1:
1444 { 1348 {
… …
1446 rxvt_fatal ("can't fork, aborting.\n"); 1350 rxvt_fatal ("can't fork, aborting.\n");
1447 } 1351 }
1448 case 0: 1352 case 0:
1449 init_env (); 1353 init_env ();
1450 1354
1451 if (!pty.make_controlling_tty ()) 1355 if (!pty->make_controlling_tty ())
1452 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1356 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1453 else 1357 else
1454 { 1358 {
1455 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1359 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1456 dup2 (pty.tty, STDIN_FILENO); 1360 dup2 (pty->tty, STDIN_FILENO);
1457 dup2 (pty.tty, STDOUT_FILENO); 1361 dup2 (pty->tty, STDOUT_FILENO);
1458 dup2 (pty.tty, STDERR_FILENO); 1362 dup2 (pty->tty, STDERR_FILENO);
1459 1363
1460 // close all our file handles that we do no longer need 1364 // close all our file handles that we do no longer need
1461 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1365 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1462 { 1366 {
1463 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1367 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1464 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1368 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1465 } 1369 }
1466 1370
1467 run_child (argv); 1371 run_child (argv);
1468 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1372 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1469 } 1373 }
1470 1374
1471 _exit (EXIT_FAILURE); 1375 _exit (EXIT_FAILURE);
1472 1376
1473 default: 1377 default:
1474 { 1378 if (!option (Opt_utmpInhibit))
1475#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1379 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1476 int fdstdin;
1477 1380
1478 fdstdin = dup (STDIN_FILENO); 1381 pty->close_tty ();
1479 dup2 (pty.tty, STDIN_FILENO);
1480#endif
1481 1382
1482#ifdef UTMP_SUPPORT 1383 child_ev.start (cmd_pid);
1483 privileged_utmp (SAVE);
1484#endif
1485 1384
1486#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1385 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1487
1488 dup2 (fdstdin, STDIN_FILENO);
1489 close (fdstdin);
1490#endif
1491 }
1492
1493 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1494 break; 1386 break;
1495 } 1387 }
1496#else /* __QNX__ uses qnxspawn () */
1497 fchmod (pty.tty, 0622);
1498 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1499 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1500
1501 if (run_child (argv) == -1)
1502 exit (EXIT_FAILURE);
1503#endif
1504} 1388}
1505 1389
1506/* ------------------------------------------------------------------------- * 1390/* ------------------------------------------------------------------------- *
1507 * CHILD PROCESS OPERATIONS * 1391 * CHILD PROCESS OPERATIONS *
1508 * ------------------------------------------------------------------------- */ 1392 * ------------------------------------------------------------------------- */
… …
1513int 1397int
1514rxvt_term::run_child (const char *const *argv) 1398rxvt_term::run_child (const char *const *argv)
1515{ 1399{
1516 char *login; 1400 char *login;
1517 1401
1518 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1519
1520 if (options & Opt_console) 1402 if (option (Opt_console))
1521 { /* be virtual console, fail silently */ 1403 { /* be virtual console, fail silently */
1522#ifdef TIOCCONS 1404#ifdef TIOCCONS
1523 unsigned int on = 1; 1405 unsigned int on = 1;
1524 1406
1525 ioctl (STDIN_FILENO, TIOCCONS, &on); 1407 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1552 // unblock signals (signals are blocked by iom.C 1434 // unblock signals (signals are blocked by iom.C
1553 sigset_t ss; 1435 sigset_t ss;
1554 sigemptyset (&ss); 1436 sigemptyset (&ss);
1555 sigprocmask (SIG_SETMASK, &ss, 0); 1437 sigprocmask (SIG_SETMASK, &ss, 0);
1556 1438
1557#ifndef __QNX__
1558 /* command interpreter path */ 1439 /* command interpreter path */
1559 if (argv != NULL) 1440 if (argv)
1560 { 1441 {
1561# ifdef DEBUG_CMD 1442# ifdef DEBUG_CMD
1562 int i; 1443 int i;
1563 1444
1564 for (i = 0; argv[i]; i++) 1445 for (i = 0; argv[i]; i++)
… …
1568 execvp (argv[0], (char *const *)argv); 1449 execvp (argv[0], (char *const *)argv);
1569 /* no error message: STDERR is closed! */ 1450 /* no error message: STDERR is closed! */
1570 } 1451 }
1571 else 1452 else
1572 { 1453 {
1573 const char *argv0, *shell; 1454 const char *argv0, *shell;
1574 1455
1575 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1576 shell = "/bin/sh"; 1457 shell = "/bin/sh";
1577 1458
1578 argv0 = (const char *)rxvt_r_basename (shell); 1459 argv0 = (const char *)rxvt_basename (shell);
1579 1460
1580 if (options & Opt_loginShell) 1461 if (option (Opt_loginShell))
1581 { 1462 {
1582 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1463 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1583 1464
1584 login[0] = '-'; 1465 login[0] = '-';
1585 strcpy (&login[1], argv0); 1466 strcpy (&login[1], argv0);
1586 argv0 = login; 1467 argv0 = login;
1587 } 1468 }
1469
1588 execlp (shell, argv0, NULL); 1470 execlp (shell, argv0, (char *)0);
1589 /* no error message: STDERR is closed! */ 1471 /* no error message: STDERR is closed! */
1590 } 1472 }
1591
1592#else /* __QNX__ uses qnxspawn () */
1593
1594 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1595 char *command = NULL, fullcommand[_MAX_PATH];
1596 char **arg_v, *arg_a[2] = { NULL, NULL };
1597
1598 if (argv != NULL)
1599 {
1600 if (access (argv[0], X_OK) == -1)
1601 {
1602 if (strchr (argv[0], '/') == NULL)
1603 {
1604 searchenv (argv[0], "PATH", fullcommand);
1605
1606 if (fullcommand[0] != '\0')
1607 command = fullcommand;
1608 }
1609
1610 if (access (command, X_OK) == -1)
1611 return -1;
1612 }
1613 else
1614 command = argv[0];
1615
1616 arg_v = argv;
1617 }
1618 else
1619 {
1620 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1621 command = "/bin/sh";
1622
1623 arg_a[0] = my_basename (command);
1624
1625 if (options & Opt_loginShell)
1626 {
1627 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1628
1629 login[0] = '-';
1630 strcpy (&login[1], arg_a[0]);
1631 arg_a[0] = login;
1632 }
1633
1634 arg_v = arg_a;
1635 }
1636
1637 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1638 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1639 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1640 command, arg_v, environ, iov_a, 0);
1641 if (login)
1642 free (login);
1643
1644 pty.close_tty ();
1645 return pty.pty;
1646#endif
1647 1473
1648 return -1; 1474 return -1;
1649} 1475}
1650 1476
1651/*----------------------- end-of-file (C source) -----------------------*/ 1477/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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