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

Diff Legend

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