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

Diff Legend

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