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.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.216 by ayin, Tue Oct 9 13:34:46 2007 UTC

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

Diff Legend

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