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.132 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.268 by root, Mon Jun 14 15:50:08 2010 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-2004 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 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.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 153 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 154 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 155 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 168# else
64 "Grey25", /* 8: bright black (#404040) */ 169 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 170# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 171 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 172 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 173 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
179#if !USE_256_COLORS
74 // 88 xterm colours 180 // 88 xterm colours
75 "rgb:00/00/00", 181 "rgb:00/00/00",
76 "rgb:00/00/8b", 182 "rgb:00/00/8b",
77 "rgb:00/00/cd", 183 "rgb:00/00/cd",
78 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
147 496
148#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 503 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 510#if ENABLE_FRILLS
162 NULL, // Color_underline 511 NULL, // Color_underline
163#endif 512#endif
164#ifdef OPTION_HC 513#ifdef OPTION_HC
165 NULL, 514 NULL,
515 NULL,
166#endif 516#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 520#endif
171#if TINTING 521#if ENABLE_TRANSPARENCY
172 NULL, 522 NULL,
173#endif 523#endif
174#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
175 "black", 525 "rgb:00/00/00",
176#endif 526#endif
177 }; 527 };
178 528
179const char *const xa_names[] = 529void
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 () 530rxvt_term::init_vars ()
220{ 531{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif
225 pix_colors = pix_colors_focused; 532 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 533
234 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 536 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 538 ncol = 80;
241 nrow = 24; 539 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
245 saveLines = SAVELINES; 544 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS;
247 545
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 547
252 oldcursor.row = oldcursor.col = -1; 548 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 549
259 last_bot = last_state = -1; 550 set_option (Opt_scrollBar);
260 551 set_option (Opt_scrollTtyOutput);
261#ifdef MENUBAR 552 set_option (Opt_jumpScroll);
262 menu_readonly = 1; 553 set_option (Opt_skipScroll);
263# if ! (MENUBAR_MAX > 1) 554 set_option (Opt_secondaryScreen);
264 CurrentBar = &BarList; 555 set_option (Opt_secondaryScroll);
265# endif /* (MENUBAR_MAX > 1) */ 556 set_option (Opt_pastableTabs);
266#endif 557 set_option (Opt_intensityStyles);
267 558 set_option (Opt_iso14755);
268 return true; 559 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered);
269} 561}
270 562
271void 563static void
272rxvt_term::init_secondary () 564init_secondary ()
273{ 565{
274 int i; 566 int i;
275 567
276 /*
277 * Close all unused file descriptors
278 * We don't want them, we don't need them.
279 */
280 if ((i = open ("/dev/null", O_RDONLY)) < 0) 568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
281 { 569 {
282 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO); 570 dup2 (STDERR_FILENO, STDIN_FILENO);
284 } 571 }
285 else if (i > STDIN_FILENO) 572 else if (i != STDIN_FILENO)
286 { 573 {
287 dup2 (i, STDIN_FILENO); 574 dup2 (i, STDIN_FILENO);
288 close (i); 575 close (i);
289 } 576 }
290 577
291 dup2 (STDERR_FILENO, STDOUT_FILENO); 578 dup2 (STDERR_FILENO, STDOUT_FILENO);
292
293#if 0 // schmorp sayz closing filies is murder
294 for (i = STDERR_FILENO + 1; i < num_fds; i++)
295 {
296#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
297 if (i == 4 || i == 7)
298 continue;
299#endif
300 close (i);
301 }
302#endif
303} 579}
304 580
305/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
306const char ** 582const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 583rxvt_term::init_resources (int argc, const char *const *argv)
308{ 584{
309 int i, r_argc; 585 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 586 const char **cmd_argv, **r_argv;
312 587
313 /* 588 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 589 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 590 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 591 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 592 if (!strcmp (argv[r_argc], "-e"))
318 break; 593 break;
594
595 if (r_argc == argc)
596 cmd_argv = NULL;
597 else if (!argv[r_argc + 1])
598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599 else
600 {
601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
602
603 for (i = 0; i < argc - r_argc - 1; i++)
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605
606 cmd_argv[i] = NULL;
607 }
319 608
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 610
322 for (i = 0; i < r_argc; i++) 611 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i]; 612 r_argv[i] = (const char *)argv[i];
324 613
325 r_argv[i] = NULL; 614 r_argv[i] = NULL;
326 615
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]); 616 rs[Rs_name] = rxvt_basename (argv[0]);
340 617
341 /* 618 /*
342 * Open display, get options/resources and create the window 619 * Open display, get options/resources and create the window
343 */ 620 */
621
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 623 rs[Rs_display_name] = ":0";
346 624
347 get_options (r_argc, r_argv); 625 get_options (r_argc, r_argv);
348 626
349 if (!(display = displays.get (rs[Rs_display_name]))) 627 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
351 632
633 // using a local pointer decreases code size a lot
634 xa = display->xa;
635
636 set (display);
352 extract_resources (); 637 extract_resources ();
638
639#if XFT
640 if (rs[Rs_depth])
641 select_visual (strtol (rs[Rs_depth], 0, 0));
642#endif
643
353 free (r_argv); 644 free (r_argv);
645
646 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef)
648 rs [i] = 0;
649
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
654
655#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default";
658
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
660 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
661 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
662 {
663 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 }
666#endif
354 667
355 /* 668 /*
356 * set any defaults not already set 669 * set any defaults not already set
357 */ 670 */
358 if (cmd_argv && cmd_argv[0]) 671 if (cmd_argv && cmd_argv[0])
359 { 672 {
360 if (!rs[Rs_title]) 673 if (!rs[Rs_title])
361 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 674 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
675
362 if (!rs[Rs_iconName]) 676 if (!rs[Rs_iconName])
363 rs[Rs_iconName] = rs[Rs_title]; 677 rs[Rs_iconName] = rs[Rs_title];
364 } 678 }
365 else 679 else
366 { 680 {
367 if (!rs[Rs_title]) 681 if (!rs[Rs_title])
368 rs[Rs_title] = rs[Rs_name]; 682 rs[Rs_title] = rs[Rs_name];
683
369 if (!rs[Rs_iconName]) 684 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 685 rs[Rs_iconName] = rs[Rs_name];
371 } 686 }
372 687
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 688 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 695 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 696 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382 697
383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 698 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
384 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 699 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
700
701 if (rs[Rs_letterSpace])
702 letterSpace = atoi (rs[Rs_letterSpace]);
385#endif 703#endif
386 704
387#ifdef POINTER_BLANK 705#ifdef POINTER_BLANK
388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
389 pointerBlankDelay = i; 707 pointerBlankDelay = i;
… …
391 pointerBlankDelay = 2; 709 pointerBlankDelay = 2;
392#endif 710#endif
393 711
394 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 713 if (!saveLines)
396 CLR_OPTION (Opt_scrollBar); 714 set_option (Opt_scrollBar, 0);
397
398#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE;
401#endif
402 715
403 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
404 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
405 718
406#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
407 if (!rs[Rs_backspace_key]) 720 if (!rs[Rs_backspace_key])
408# ifdef DEFAULT_BACKSPACE 721# ifdef DEFAULT_BACKSPACE
409 key_backspace = DEFAULT_BACKSPACE; 722 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
410# else 723# else
411 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 724 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
412# endif 725# endif
413 else
414 {
415 val = strdup (rs[Rs_backspace_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_backspace = val;
419 }
420#endif 726#endif
421 727
422#ifndef NO_DELETE_KEY 728#ifndef NO_DELETE_KEY
423 if (!rs[Rs_delete_key]) 729 if (!rs[Rs_delete_key])
424# ifdef DEFAULT_DELETE 730# ifdef DEFAULT_DELETE
425 key_delete = DEFAULT_DELETE; 731 rs[Rs_delete_key] = DEFAULT_DELETE;
426# else 732# else
427 key_delete = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
428# endif
429 else
430 {
431 val = strdup (rs[Rs_delete_key]);
432 rxvt_Str_trim (val);
433 rxvt_Str_escaped (val);
434 key_delete = val;
435 }
436#endif 734# endif
437 if (rs[Rs_answerbackstring])
438 {
439 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
440 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
441 }
442
443#ifdef HAVE_SCROLLBARS
444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
445#endif 735#endif
736
737 scrollBar.setup (this);
446 738
447#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
448 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
449 if (OPTION (Opt_reverseVideo)) 741 if (option (Opt_reverseVideo))
450 { 742 {
451 if (!rs[Rs_color + Color_fg]) 743 if (!rs[Rs_color + Color_fg])
452 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 744 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
745
453 if (!rs[Rs_color + Color_bg]) 746 if (!rs[Rs_color + Color_bg])
454 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 747 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
455 } 748 }
456#endif 749#endif
457 750
… …
459 if (!rs[Rs_color + i]) 752 if (!rs[Rs_color + i])
460 rs[Rs_color + i] = def_colorName[i]; 753 rs[Rs_color + i] = def_colorName[i];
461 754
462#ifndef XTERM_REVERSE_VIDEO 755#ifndef XTERM_REVERSE_VIDEO
463 /* this is how we implement reverseVideo */ 756 /* this is how we implement reverseVideo */
464 if (OPTION (Opt_reverseVideo)) 757 if (option (Opt_reverseVideo))
465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 758 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
466#endif 759#endif
467 760
468 /* convenient aliases for setting fg/bg to colors */ 761 /* convenient aliases for setting fg/bg to colors */
469 color_aliases (Color_fg); 762 color_aliases (Color_fg);
470 color_aliases (Color_bg); 763 color_aliases (Color_bg);
471#ifndef NO_CURSORCOLOR 764#ifndef NO_CURSORCOLOR
472 color_aliases (Color_cursor); 765 color_aliases (Color_cursor);
473 color_aliases (Color_cursor2); 766 color_aliases (Color_cursor2);
474#endif /* NO_CURSORCOLOR */ 767#endif /* NO_CURSORCOLOR */
475 color_aliases (Color_pointer_fg); 768 color_aliases (Color_pointer_fg);
476 color_aliases (Color_pointer_bg); 769 color_aliases (Color_pointer_bg);
477 color_aliases (Color_border); 770 color_aliases (Color_border);
478#ifndef NO_BOLD_UNDERLINE_REVERSE 771#ifndef NO_BOLD_UNDERLINE_REVERSE
479 color_aliases (Color_BD); 772 color_aliases (Color_BD);
480 color_aliases (Color_UL); 773 color_aliases (Color_UL);
481 color_aliases (Color_RV); 774 color_aliases (Color_RV);
482#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 775#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
483 776
484 if (!rs[Rs_color + Color_border]) 777 if (!rs[Rs_color + Color_border])
485 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 778 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
486 779
487 return cmd_argv; 780 return cmd_argv;
781}
782
783/*----------------------------------------------------------------------*/
784void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
786{
787 this->envv = envv;
788
789 SET_R (this);
790 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :(
792
793 init_vars ();
794
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv);
798
799#ifdef KEYSYM_RESOURCE
800 keyboard->register_done ();
801#endif
802
803 if (const char *path = rs[Rs_chdir])
804 if (*path) // ignored if empty
805 {
806 if (*path != '/')
807 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
808
809 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 }
812
813 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
815
816 pty = ptytty::create ();
817
818 create_windows (argc, argv);
819
820 init_xlocale ();
821
822 scr_poweron (); // initialize screen
823
824#if 0
825 XSynchronize (dpy, True);
826#endif
827
828 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP
831 {
832 bgPixmap.set_target (this);
833 bgPixmap.invalidate ();
834
835#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent))
837 {
838 bgPixmap.set_transparent ();
839
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843#endif
844 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846
847 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]);
849
850 bgPixmap.set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root);
853 }
854#endif
855
856#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ())
871 update_background ();
872 }
873#endif
874 }
875#endif
876
877#if ENABLE_PERL
878 rootwin_ev.start (display, display->root);
879#endif
880
881 set_colorfgbg ();
882
883 init_command (cmd_argv);
884
885 free (cmd_argv);
886
887 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ);
889
890 HOOK_INVOKE ((this, HOOK_START, DT_END));
891
892#if ENABLE_XEMBED
893 if (rs[Rs_embed])
894 {
895 long info[2] = { 0, XEMBED_MAPPED };
896
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2);
899 }
900#endif
901
902 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]);
904
905 refresh_check ();
488} 906}
489 907
490/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
491void 909void
492rxvt_term::init_env () 910rxvt_term::init_env ()
493{ 911{
494 int i; 912 int i;
495 unsigned int u;
496 char *val; 913 char *val;
497 914
498#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
499 /* Fixup display_name for export over pty to any interested terminal 916 /* Fixup display_name for export over pty to any interested terminal
500 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
508 */ 925 */
509 val = rxvt_network_display (rs[Rs_display_name]); 926 val = rxvt_network_display (rs[Rs_display_name]);
510 rs[Rs_display_name] = (const char *)val; 927 rs[Rs_display_name] = (const char *)val;
511 928
512 if (val == NULL) 929 if (val == NULL)
513#endif /* DISPLAY_IS_IP */ 930#endif /* DISPLAY_IS_IP */
514 val = XDisplayString (display->display); 931 val = XDisplayString (dpy);
515 932
516 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
517 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
518 935
519 i = strlen (val); 936 i = strlen (val);
520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 937 env_display = (char *)rxvt_malloc (i + 9);
521 938
522 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
523 940
524 /* avoiding the math library: 941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
527 ;
528 max_it (i, 1);
529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
530
531 sprintf (env_windowid, "WINDOWID=%u",
532 (unsigned int)parent[0]);
533 942
534 /* add entries to the environment: 943 /* add entries to the environment:
535 * @ DISPLAY: in case we started with -display 944 * @ DISPLAY: in case we started with -display
536 * @ WINDOWID: X window id number of the window 945 * @ WINDOWID: X window id number of the window
537 * @ COLORTERM: terminal sub-name and also indicates its color 946 * @ COLORTERM: terminal sub-name and also indicates its color
… …
539 * @ TERMINFO: path to terminfo directory 948 * @ TERMINFO: path to terminfo directory
540 * @ COLORFGBG: fg;bg color codes 949 * @ COLORFGBG: fg;bg color codes
541 */ 950 */
542 putenv (env_display); 951 putenv (env_display);
543 putenv (env_windowid); 952 putenv (env_windowid);
953
544 if (env_colorfgbg) 954 if (env_colorfgbg)
545 putenv (env_colorfgbg); 955 putenv (env_colorfgbg);
546 956
547#ifdef RXVT_TERMINFO 957#ifdef RXVT_TERMINFO
548 putenv ("TERMINFO=" RXVT_TERMINFO); 958 putenv ("TERMINFO=" RXVT_TERMINFO);
549#endif 959#endif
550 960
551 if (display->depth <= 2) 961 if (depth <= 2)
552 putenv ("COLORTERM=" COLORTERMENV "-mono"); 962 putenv ("COLORTERM=" COLORTERMENV "-mono");
553 else 963 else
554 putenv ("COLORTERM=" COLORTERMENVFULL); 964 putenv ("COLORTERM=" COLORTERMENVFULL);
555 965
556 if (rs[Rs_term_name] != NULL) 966 if (rs[Rs_term_name] != NULL)
557 { 967 {
558 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 968 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
559 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 969 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
560 putenv (env_term); 970 putenv (env_term);
561 } 971 }
562 else 972 else
563 putenv ("TERM=" TERMENV); 973 putenv ("TERM=" TERMENV);
… …
565#ifdef HAVE_UNSETENV 975#ifdef HAVE_UNSETENV
566 /* avoid passing old settings and confusing term size */ 976 /* avoid passing old settings and confusing term size */
567 unsetenv ("LINES"); 977 unsetenv ("LINES");
568 unsetenv ("COLUMNS"); 978 unsetenv ("COLUMNS");
569 unsetenv ("TERMCAP"); /* terminfo should be okay */ 979 unsetenv ("TERMCAP"); /* terminfo should be okay */
570#endif /* HAVE_UNSETENV */ 980#endif /* HAVE_UNSETENV */
571} 981}
572 982
573/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
574/* 984/*
575 * This is more or less stolen straight from XFree86 xterm. 985 * This is more or less stolen straight from XFree86 xterm.
576 * This should support all European type languages. 986 * This should support all European type languages.
577 */ 987 */
578void 988void
579rxvt_term::set_locale (const char *locale) 989rxvt_term::set_locale (const char *locale)
580{ 990{
991 set_environ (envv);
992
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 994 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 995 this->locale = setlocale (LC_CTYPE, locale);
584 996
585 if (!this->locale) 997 if (!this->locale)
586 { 998 {
587 if (*locale) 999 if (*locale)
588 { 1000 {
589 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 1001 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590 setlocale (LC_CTYPE, ""); 1002 setlocale (LC_CTYPE, "C");
591 } 1003 }
592 else 1004 else
593 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 1005 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594 1006
595 this->locale = ""; 1007 this->locale = "C";
596 } 1008 }
597 1009
598 1010
599 this->locale = rxvt_strdup (this->locale); 1011 this->locale = strdup (this->locale);
600 SET_LOCALE (this->locale); 1012 SET_LOCALE (this->locale);
601 mbstate.reset (); 1013 mbstate.reset ();
602#endif 1014#endif
603 1015
604#if HAVE_NL_LANGINFO 1016#if HAVE_NL_LANGINFO
… …
615} 1027}
616 1028
617void 1029void
618rxvt_term::init_xlocale () 1030rxvt_term::init_xlocale ()
619{ 1031{
1032 set_environ (envv);
1033
620#ifdef USE_XIM 1034#ifdef USE_XIM
621 if (!locale) 1035 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 1036 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 1037 else
624 { 1038 {
… …
646 * Initialize the command connection. 1060 * Initialize the command connection.
647 * This should be called after the X server connection is established. 1061 * This should be called after the X server connection is established.
648 */ 1062 */
649 1063
650#ifdef META8_OPTION 1064#ifdef META8_OPTION
651 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1065 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
652#endif 1066#endif
653 1067
654 get_ourmods (); 1068 get_ourmods ();
655 1069
656 if (!OPTION (Opt_scrollTtyOutput)) 1070 if (!option (Opt_scrollTtyOutput))
657 priv_modes |= PrivMode_TtyOutputInh; 1071 priv_modes |= PrivMode_TtyOutputInh;
658 if (OPTION (Opt_scrollTtyKeypress)) 1072 if (option (Opt_scrollTtyKeypress))
659 priv_modes |= PrivMode_Keypress; 1073 priv_modes |= PrivMode_Keypress;
660 if (!OPTION (Opt_jumpScroll)) 1074 if (!option (Opt_jumpScroll))
661 priv_modes |= PrivMode_smoothScroll; 1075 priv_modes |= PrivMode_smoothScroll;
662 1076
663#ifndef NO_BACKSPACE_KEY 1077#ifndef NO_BACKSPACE_KEY
664 if (strcmp (key_backspace, "DEC") == 0) 1078 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 1079 priv_modes |= PrivMode_HaveBackSpace;
666#endif 1080#endif
667 1081
668 /* add value for scrollBar */ 1082 /* add value for scrollBar */
669 if (scrollbar_visible ()) 1083 if (scrollBar.state)
670 { 1084 {
671 priv_modes |= PrivMode_scrollBar; 1085 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 1086 SavedModes |= PrivMode_scrollBar;
673 } 1087 }
674 1088
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 }
680
681 run_command (argv); 1089 run_command (argv);
682} 1090}
683 1091
684/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
685void 1093void
686rxvt_term::Get_Colours () 1094rxvt_term::get_colours ()
687{ 1095{
688 int i; 1096 int i;
689 1097
690#ifdef OFF_FOCUS_FADING 1098#ifdef OFF_FOCUS_FADING
691 pix_colors = pix_colors_focused; 1099 pix_colors = pix_colors_focused;
692#endif 1100#endif
693 1101
694 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
695 { 1103 {
1104 const char *name = rs[Rs_color + i];
1105
1106 if (!name)
1107 continue;
1108
696 rxvt_color xcol; 1109 rxvt_color xcol;
697 1110
698 if (!rs[Rs_color + i]) 1111 if (!set_color (xcol, name))
699 continue;
700
701 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
702 { 1112 {
703#ifndef XTERM_REVERSE_VIDEO 1113#ifndef XTERM_REVERSE_VIDEO
704 if (i < 2 && OPTION (Opt_reverseVideo)) 1114 if (i < 2 && option (Opt_reverseVideo))
705 rs[Rs_color + i] = def_colorName[!i]; 1115 name = def_colorName [1 - i];
706 else 1116 else
707#endif 1117#endif
708 rs[Rs_color + i] = def_colorName[i]; 1118 name = def_colorName [i];
709 1119
710 if (!rs[Rs_color + i]) 1120 if (!name)
711 continue; 1121 continue;
712 1122
713 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1123 if (!set_color (xcol, name))
714 { 1124 {
715 switch (i) 1125 switch (i)
716 { 1126 {
717 case Color_fg: 1127 case Color_fg:
718 case Color_bg: 1128 case Color_bg:
719 /* fatal: need bg/fg color */
720 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 1129 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
721 /* NOTREACHED */ 1130 name = "";
722 break; 1131 break;
723#ifndef NO_CURSORCOLOR 1132#ifndef NO_CURSORCOLOR
724 case Color_cursor2: 1133 case Color_cursor2:
725 xcol = pix_colors[Color_fg]; 1134#endif
726 break;
727#endif /* ! NO_CURSORCOLOR */
728 case Color_pointer_fg: 1135 case Color_pointer_fg:
729 xcol = pix_colors[Color_fg]; 1136 name = rs[Rs_color + Color_fg];
1137 xcol.set (this, name);
730 break; 1138 break;
731 default: 1139 default:
732 xcol = pix_colors[Color_bg]; /* None */ 1140 name = rs[Rs_color + Color_bg];
1141 xcol.set (this, name);
733 break; 1142 break;
734 } 1143 }
735 } 1144 }
736 } 1145 }
737 1146
738 pix_colors[i] = xcol; 1147 pix_colors[i] = xcol;
739 SET_PIXCOLOR (i); 1148 rs[Rs_color + i] = name;
740 }
741
742#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade])
744 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
745 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
746#endif
747
748 if (display->depth <= 2)
749 { 1149 }
1150
1151 if (depth <= 2)
1152 {
750 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1153 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
751 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 1154 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
752 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 1155 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
753 } 1156 }
754 1157
755 /* 1158 /*
756 * get scrollBar/menuBar shadow colors 1159 * get scrollBar shadow colors
757 * 1160 *
758 * The calculations of topShadow/bottomShadow values are adapted 1161 * The calculations of topShadow/bottomShadow values are adapted
759 * from the fvwm window manager. 1162 * from the fvwm window manager.
760 */ 1163 */
761#ifdef KEEP_SCROLLCOLOR 1164#ifdef RXVT_SCROLLBAR
762
763 if (display->depth <= 2) 1165 if (depth <= 2)
764 { 1166 {
765 /* Monochrome */ 1167 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1168 alias_color (Color_scroll, Color_fg);
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1169 alias_color (Color_topShadow, Color_bg);
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1170 alias_color (Color_bottomShadow, Color_bg);
769 } 1171 }
770 else 1172 else
771 { 1173 {
772 rxvt_color xcol[2]; 1174 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
773 /* xcol[0] == white
774 * xcol[1] == top shadow
775 * xcol[2] == bot shadow */
776 1175
777 xcol[1] = pix_colors[Color_scroll]; 1176 rgba cscroll;
778 xcol[0].set (display, 65535, 65535, 65535); 1177 pix_colors [Color_scroll].get (cscroll);
779
780 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
781
782 xcol[0].get (display, pr0, pg0, pb0);
783 xcol[1].get (display, pr1, pg1, pb1);
784
785 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
786 1178
787 /* topShadowColor */ 1179 /* topShadowColor */
788 if (!xcol[1].set (display, 1180 if (!pix_colors[Color_topShadow].set (this,
789 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1181 rgba (
790 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1182 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
791 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1183 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
792 xcol[1] = pix_colors[Color_White]; 1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
793 1185 cscroll.a)
794 pix_colors[Color_topShadow] = xcol[1]; 1186 ))
1187 alias_color (Color_topShadow, Color_White);
795 } 1188 }
796#endif /* KEEP_SCROLLCOLOR */ 1189#endif
1190
1191#ifdef OFF_FOCUS_FADING
1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1193 update_fade_color (i);
1194#endif
797} 1195}
798 1196
799/*----------------------------------------------------------------------*/ 1197/*----------------------------------------------------------------------*/
800/* color aliases, fg/bg bright-bold */ 1198/* color aliases, fg/bg bright-bold */
801void 1199void
… …
804 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
805 { 1203 {
806 int i = atoi (rs[Rs_color + idx]); 1204 int i = atoi (rs[Rs_color + idx]);
807 1205
808 if (i >= 8 && i <= 15) 1206 if (i >= 8 && i <= 15)
809 { /* bright colors */ 1207 /* bright colors */
810 i -= 8;
811 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1208 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
812 return; 1209 else if (i >= 0 && i <= 7)
813 } 1210 /* normal colors */
814
815 if (i >= 0 && i <= 7) /* normal colors */
816 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1211 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
817 } 1212 }
818} 1213}
819 1214
820/*----------------------------------------------------------------------*/ 1215/*----------------------------------------------------------------------*/
… …
840 1235
841 if (rsmod 1236 if (rsmod
842 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1237 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
843 requestedmeta = rsmod[3] - '0'; 1238 requestedmeta = rsmod[3] - '0';
844 1239
845 map = XGetModifierMapping (display->display); 1240 map = XGetModifierMapping (dpy);
846 kc = map->modifiermap; 1241 kc = map->modifiermap;
847 1242
848 for (i = 1; i < 6; i++) 1243 for (i = 1; i < 6; i++)
849 { 1244 {
850 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1245 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
852 for (j = map->max_keypermod; j--; k++) 1247 for (j = map->max_keypermod; j--; k++)
853 { 1248 {
854 if (kc[k] == 0) 1249 if (kc[k] == 0)
855 break; 1250 break;
856 1251
857 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1252 switch (XKeycodeToKeysym (dpy, kc[k], 0))
858 { 1253 {
859 case XK_Num_Lock: 1254 case XK_Num_Lock:
860 ModNumLockMask = modmasks[i - 1]; 1255 ModNumLockMask = modmasks[i - 1];
861 continue; 1256 continue;
862 1257
… …
912rxvt_term::create_windows (int argc, const char *const *argv) 1307rxvt_term::create_windows (int argc, const char *const *argv)
913{ 1308{
914 XClassHint classHint; 1309 XClassHint classHint;
915 XWMHints wmHint; 1310 XWMHints wmHint;
916#if ENABLE_FRILLS 1311#if ENABLE_FRILLS
917 Atom prop = None;
918 MWMHints mwmhints; 1312 MWMHints mwmhints = { };
919#endif 1313#endif
920 XGCValues gcvalue; 1314 XGCValues gcvalue;
921 long vt_emask;
922 XSetWindowAttributes attributes; 1315 XSetWindowAttributes attributes;
923 XWindowAttributes gattr;
924 Window top, parent; 1316 Window top, parent;
925 dDisp;
926 1317
927#ifdef USING_W11LIB 1318 dLocal (Display *, dpy);
928 /* enable W11 callbacks */
929 W11AddEventHandler (disp, rxvt_W11_process_x_event);
930#endif
931 1319
932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1320 /* grab colors before netscape does */
933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 1321 get_colours ();
934 1322
935 if (OPTION (Opt_transparent)) 1323 if (!set_fonts ())
936 { 1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 1325
938 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1326 parent = display->root;
939 } 1327
1328 attributes.override_redirect = !!option (Opt_override_redirect);
940 1329
941#if ENABLE_FRILLS 1330#if ENABLE_FRILLS
942 if (OPTION (Opt_borderLess)) 1331 if (option (Opt_borderLess))
943 { 1332 {
944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 1333 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
945
946 if (prop == None)
947 { 1334 {
948 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1335 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
949#ifdef PREFER_24BIT
950 attributes.override_redirect = TRUE; 1336 attributes.override_redirect = true;
951#endif
952 mwmhints.flags = 0;
953 } 1337 }
954 else 1338 else
955 { 1339 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 1340 mwmhints.flags = MWM_HINTS_DECORATIONS;
957 mwmhints.decorations = 0;
958 } 1341 }
959 } 1342 }
960 else
961 mwmhints.flags = 0;
962#endif 1343#endif
963
964 /* grab colors before netscape does */
965 Get_Colours ();
966
967 if (!set_fonts ())
968 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
969
970 parent = DefaultRootWindow (disp);
971 1344
972#if ENABLE_XEMBED 1345#if ENABLE_XEMBED
973 if (rs[Rs_embed]) 1346 if (rs[Rs_embed])
974 { 1347 {
975 XWindowAttributes wattr; 1348 XWindowAttributes wattr;
976 1349
977 parent = strtol (rs[Rs_embed], 0, 0); 1350 parent = strtol (rs[Rs_embed], 0, 0);
978 1351
979 if (!XGetWindowAttributes (disp, parent, &wattr)) 1352 if (!XGetWindowAttributes (dpy, parent, &wattr))
980 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1353 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
981 1354
982 window_calc (wattr.width, wattr.height); 1355 window_calc (wattr.width, wattr.height);
983 } 1356 }
984#endif 1357#endif
985 1358
986 window_calc (0, 0); 1359 window_calc (0, 0);
987 1360
988 /* sub-window placement & size in rxvt_resize_subwindows () */ 1361 /* sub-window placement & size in rxvt_resize_subwindows () */
989#ifdef PREFER_24BIT
990 attributes.background_pixel = pix_colors_focused[Color_border]; 1362 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 1363 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 1364 attributes.colormap = cmap;
1365
993 top = XCreateWindow (disp, parent, 1366 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 1367 szHint.x, szHint.y,
995 szHint.width, szHint.height, 1368 szHint.width, szHint.height,
996 ext_bwidth, 1369 ext_bwidth,
997 display->depth, InputOutput, 1370 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000#else 1372 &attributes);
1001 top = XCreateSimpleWindow (disp, parent,
1002 szHint.x, szHint.y,
1003 szHint.width, szHint.height,
1004 ext_bwidth,
1005 pix_colors_focused[Color_border],
1006 pix_colors_focused[Color_border]);
1007#endif
1008 1373
1009 this->parent[0] = top; 1374 this->parent[0] = top;
1010 1375
1011 old_width = szHint.width; 1376 old_width = szHint.width;
1012 old_height = szHint.height; 1377 old_height = szHint.height;
1013 1378
1014 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1379 set_title (rs [Rs_title]);
1015 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1380 set_icon_name (rs [Rs_iconName]);
1016 1381
1017 classHint.res_name = (char *)rs[Rs_name]; 1382 classHint.res_name = (char *)rs[Rs_name];
1018 classHint.res_class = (char *)RESCLASS; 1383 classHint.res_class = (char *)RESCLASS;
1019 1384
1020 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1385 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1021 wmHint.input = True; 1386 wmHint.input = True;
1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1023 wmHint.window_group = top; 1388 wmHint.window_group = top;
1024 1389
1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1026 &szHint, &wmHint, &classHint); 1391 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /*
1395 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1397 */
1398
1399 if (rs [Rs_iconfile])
1400 {
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif
1442
1443#if ENABLE_FRILLS
1444 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1446 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1447#endif
1027 1448
1028 Atom protocols[] = { 1449 Atom protocols[] = {
1029 xa[XA_WM_DELETE_WINDOW], 1450 xa[XA_WM_DELETE_WINDOW],
1030#if ENABLE_EWMH 1451#if ENABLE_EWMH
1031 xa[XA_NET_WM_PING], 1452 xa[XA_NET_WM_PING],
1032#endif 1453#endif
1033 }; 1454 };
1034 1455
1035 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1457
1458#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif
1036 1462
1037#if ENABLE_EWMH 1463#if ENABLE_EWMH
1038 long pid = getpid (); 1464 long pid = getpid ();
1039 1465
1040 XChangeProperty (disp, top, 1466 XChangeProperty (dpy, top,
1041 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1467 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1042 PropModeReplace, (unsigned char *)&pid, 1); 1468 PropModeReplace, (unsigned char *)&pid, 1);
1043 1469
1044 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1470 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1045#endif 1471#endif
1046 1472
1047 XSelectInput (disp, top, 1473 XSelectInput (dpy, top,
1048 KeyPressMask 1474 KeyPressMask
1049#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1475#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1050 | KeyReleaseMask 1476 | KeyReleaseMask
1051#endif 1477#endif
1052 | FocusChangeMask | VisibilityChangeMask 1478 | FocusChangeMask | VisibilityChangeMask
1053 | ExposureMask | StructureNotifyMask); 1479 | ExposureMask | StructureNotifyMask);
1054 1480
1055 termwin_ev.start (display, top); 1481 termwin_ev.start (display, top);
1056 1482
1057#if ENABLE_FRILLS
1058 if (mwmhints.flags)
1059 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1060 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1061#endif
1062
1063 /* vt cursor: Black-on-White is standard, but this is more popular */ 1483 /* vt cursor: Black-on-White is standard, but this is more popular */
1064 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1065
1066#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1067 /* cursor (menuBar/scrollBar): Black-on-White */
1068 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1069#endif
1070 1485
1071 /* the vt window */ 1486 /* the vt window */
1072 vt = XCreateSimpleWindow (disp, top, 1487 vt = XCreateSimpleWindow (dpy, top,
1073 window_vt_x,
1074 window_vt_y, 1488 window_vt_x, window_vt_y,
1075 width,
1076 height, 1489 width, height,
1077 0, 1490 0,
1078 pix_colors_focused[Color_fg], 1491 pix_colors_focused[Color_fg],
1079 pix_colors_focused[Color_bg]); 1492 pix_colors_focused[Color_bg]);
1080#ifdef DEBUG_X
1081 XStoreName (disp, vt, "vt window");
1082#endif
1083 1493
1084 attributes.bit_gravity = NorthWestGravity; 1494 attributes.bit_gravity = NorthWestGravity;
1085 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1495 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1086 1496
1087 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1497 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1088 1498
1089#ifdef POINTER_BLANK
1090 if (OPTION (Opt_pointerBlank)) 1499 if (option (Opt_pointerBlank))
1091 vt_emask |= PointerMotionMask; 1500 vt_emask |= PointerMotionMask;
1092 else 1501 else
1093#endif
1094 vt_emask |= Button1MotionMask | Button3MotionMask; 1502 vt_emask |= Button1MotionMask | Button3MotionMask;
1095 1503
1096 XSelectInput (disp, vt, vt_emask); 1504 vt_select_input ();
1505
1097 vt_ev.start (display, vt); 1506 vt_ev.start (display, vt);
1098 1507
1099#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1100 if (menuBar_height ())
1101 {
1102 menuBar.win = XCreateSimpleWindow (disp, top,
1103 window_vt_x, 0,
1104 width,
1105 menuBar_TotalHeight (),
1106 0,
1107 pix_colors_focused[Color_fg],
1108 pix_colors_focused[Color_scroll]);
1109
1110#ifdef DEBUG_X
1111 XStoreName (disp, menuBar.win, "menubar");
1112#endif
1113
1114 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1115
1116 XDefineCursor (disp, menuBar.win,
1117 XCreateFontCursor (disp, XC_left_ptr));
1118
1119 XSelectInput (disp, menuBar.win,
1120 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1121 menubar_ev.start (display, menuBar.win);
1122 }
1123#endif
1124
1125#ifdef XPM_BACKGROUND
1126 if (rs[Rs_backgroundPixmap] != NULL
1127 && ! OPTION (Opt_transparent))
1128 {
1129 const char *p = rs[Rs_backgroundPixmap];
1130
1131 if ((p = strchr (p, ';')) != NULL)
1132 {
1133 p++;
1134 scale_pixmap (p);
1135 }
1136
1137 set_bgPixmap (rs[Rs_backgroundPixmap]);
1138 scr_touch (true);
1139 }
1140#endif
1141
1142 /* graphics context for the vt window */ 1508 /* graphics context for the vt window */
1143 gcvalue.foreground = pix_colors[Color_fg]; 1509 gcvalue.foreground = pix_colors[Color_fg];
1144 gcvalue.background = pix_colors[Color_bg]; 1510 gcvalue.background = pix_colors[Color_bg];
1145 gcvalue.graphics_exposures = 1; 1511 gcvalue.graphics_exposures = 0;
1512
1146 gc = XCreateGC (disp, vt, 1513 gc = XCreateGC (dpy, vt,
1147 GCForeground | GCBackground | GCGraphicsExposures, 1514 GCForeground | GCBackground | GCGraphicsExposures,
1148 &gcvalue); 1515 &gcvalue);
1149 1516
1150 drawable = new rxvt_drawable (display, vt); 1517 drawable = new rxvt_drawable (this, vt);
1151
1152#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1153 gcvalue.foreground = pix_colors[Color_topShadow];
1154 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1155 gcvalue.foreground = pix_colors[Color_bottomShadow];
1156 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1158 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159#endif
1160 1518
1161#ifdef OFF_FOCUS_FADING 1519#ifdef OFF_FOCUS_FADING
1162 // initially we are in unfocused state 1520 // initially we are in unfocused state
1163 if (rs[Rs_fade]) 1521 if (rs[Rs_fade])
1164 pix_colors = pix_colors_unfocused; 1522 pix_colors = pix_colors_unfocused;
1165#endif 1523#endif
1166 1524
1167 pointer_unblank (); 1525 pointer_unblank ();
1168 scr_recolour (); 1526 scr_recolour ();
1169
1170#if ENABLE_XEMBED
1171 if (rs[Rs_embed])
1172 {
1173 long info[2] = { 0, XEMBED_MAPPED };
1174
1175 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1176 32, PropModeReplace, (unsigned char *)&info, 2);
1177 }
1178#endif
1179} 1527}
1180 1528
1181/* ------------------------------------------------------------------------- * 1529/* ------------------------------------------------------------------------- *
1182 * GET TTY CURRENT STATE * 1530 * GET TTY CURRENT STATE *
1183 * ------------------------------------------------------------------------- */ 1531 * ------------------------------------------------------------------------- */
1184void 1532void
1185rxvt_get_ttymode (ttymode_t *tio, int erase) 1533rxvt_get_ttymode (struct termios *tio, int erase)
1186{ 1534{
1187#ifdef HAVE_TERMIOS_H
1188 /* 1535 /*
1189 * standard System V termios interface 1536 * standard System V termios interface
1190 */ 1537 */
1191 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1538 // does not work as stdin is not a tty
1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1192 { 1541 {
1193 // return error - use system defaults, 1542 // return error - use system defaults,
1194 // where possible, and zero elsewhere 1543 // where possible, and zero elsewhere
1195 memset (tio, 0, sizeof (ttymode_t)); 1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1196 1548
1197 tio->c_cc[VINTR] = CINTR; 1549 tio->c_cc[VINTR] = CINTR;
1198 tio->c_cc[VQUIT] = CQUIT; 1550 tio->c_cc[VQUIT] = CQUIT;
1199 tio->c_cc[VERASE] = CERASE; 1551 tio->c_cc[VERASE] = CERASE;
1200#ifdef VERASE2 1552#ifdef VERASE2
… …
1220 tio->c_cc[VLNEXT] = CLNEXT; 1572 tio->c_cc[VLNEXT] = CLNEXT;
1221# endif 1573# endif
1222 } 1574 }
1223 1575
1224 tio->c_cc[VEOF] = CEOF; 1576 tio->c_cc[VEOF] = CEOF;
1225 tio->c_cc[VEOL] = VDISABLE;
1226# ifdef VEOL2
1227 tio->c_cc[VEOL2] = VDISABLE;
1228# endif
1229# ifdef VSWTC
1230 tio->c_cc[VSWTC] = VDISABLE;
1231# endif
1232# ifdef VSWTCH
1233 tio->c_cc[VSWTCH] = VDISABLE;
1234# endif
1235# if VMIN != VEOF 1577# if VMIN != VEOF
1236 tio->c_cc[VMIN] = 1; 1578 tio->c_cc[VMIN] = 1;
1237# endif 1579# endif
1238# if VTIME != VEOL 1580# if VTIME != VEOL
1239 tio->c_cc[VTIME] = 0; 1581 tio->c_cc[VTIME] = 0;
… …
1259 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1601 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1260# if defined (ECHOCTL) && defined (ECHOKE) 1602# if defined (ECHOCTL) && defined (ECHOKE)
1261 | ECHOCTL | ECHOKE 1603 | ECHOCTL | ECHOKE
1262# endif 1604# endif
1263 | ECHOE | ECHOK); 1605 | ECHOE | ECHOK);
1264# else /* HAVE_TERMIOS_H */
1265
1266 /*
1267 * sgtty interface
1268 */
1269
1270 /* get parameters -- gtty */
1271 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1272 {
1273 tio->sg.sg_erase = CERASE; /* ^H */
1274 tio->sg.sg_kill = CKILL; /* ^U */
1275 }
1276
1277 if (erase != -1)
1278 tio->sg.sg_erase = (char)erase;
1279
1280 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1281
1282 /* get special characters */
1283 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1284 {
1285 tio->tc.t_intrc = CINTR; /* ^C */
1286 tio->tc.t_quitc = CQUIT; /* ^\ */
1287 tio->tc.t_startc = CSTART; /* ^Q */
1288 tio->tc.t_stopc = CSTOP; /* ^S */
1289 tio->tc.t_eofc = CEOF; /* ^D */
1290 tio->tc.t_brkc = -1;
1291 }
1292
1293 /* get local special chars */
1294 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1295 {
1296 tio->lc.t_suspc = CSUSP; /* ^Z */
1297 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1298 tio->lc.t_rprntc = CRPRNT; /* ^R */
1299 tio->lc.t_flushc = CFLUSH; /* ^O */
1300 tio->lc.t_werasc = CWERASE; /* ^W */
1301 tio->lc.t_lnextc = CLNEXT; /* ^V */
1302 }
1303 /* get line discipline */
1304 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1305# ifdef NTTYDISC
1306 tio->line = NTTYDISC;
1307# endif /* NTTYDISC */
1308
1309 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1310#endif /* HAVE_TERMIOS_H */
1311 1606
1312 /* 1607 /*
1313 * Debugging 1608 * Debugging
1314 */ 1609 */
1315#ifdef DEBUG_TTYMODE 1610#ifdef DEBUG_TTYMODE
1316#ifdef HAVE_TERMIOS_H
1317 /* c_iflag bits */ 1611 /* c_iflag bits */
1318 fprintf (stderr, "Input flags\n"); 1612 fprintf (stderr, "Input flags\n");
1319 1613
1320 /* cpp token stringize doesn't work on all machines <sigh> */ 1614 /* cpp token stringize doesn't work on all machines <sigh> */
1321# define FOO(flag,name) \ 1615# define FOO(flag,name) \
… …
1384 FOO (VLNEXT, "VLNEXT"); 1678 FOO (VLNEXT, "VLNEXT");
1385# endif 1679# endif
1386 1680
1387 fprintf (stderr, "\n"); 1681 fprintf (stderr, "\n");
1388# undef FOO 1682# undef FOO
1389# endif /* HAVE_TERMIOS_H */ 1683#endif /* DEBUG_TTYMODE */
1390#endif /* DEBUG_TTYMODE */
1391} 1684}
1392 1685
1393/*----------------------------------------------------------------------*/ 1686/*----------------------------------------------------------------------*/
1394/* 1687/*
1395 * Run the command in a subprocess and return a file descriptor for the 1688 * Run the command in a subprocess and return a file descriptor for the
… …
1400rxvt_term::run_command (const char *const *argv) 1693rxvt_term::run_command (const char *const *argv)
1401{ 1694{
1402#if ENABLE_FRILLS 1695#if ENABLE_FRILLS
1403 if (rs[Rs_pty_fd]) 1696 if (rs[Rs_pty_fd])
1404 { 1697 {
1405 pty.pty = atoi (rs[Rs_pty_fd]); 1698 pty->pty = atoi (rs[Rs_pty_fd]);
1406 1699
1407 if (pty.pty >= 0) 1700 if (pty->pty >= 0)
1408 { 1701 {
1409 if (getfd_hook) 1702 if (getfd_hook)
1410 pty.pty = (*getfd_hook) (pty.pty); 1703 pty->pty = (*getfd_hook) (pty->pty);
1411 1704
1412 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1705 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1413 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1706 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1414 } 1707 }
1415 } 1708 }
1416 else 1709 else
1417#endif 1710#endif
1418 if (!pty.get ()) 1711 if (!pty->get ())
1419 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1712 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1420 1713
1714 int er;
1715
1716#ifndef NO_BACKSPACE_KEY
1717 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1718 er = rs[Rs_backspace_key][0];
1719 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1720 er = '\177'; /* the initial state anyway */
1721 else
1722#endif
1723 er = -1;
1724
1725 rxvt_get_ttymode (&tio, er);
1726 /* init terminal attributes */
1727 cfsetospeed (&tio, BAUDRATE);
1728 cfsetispeed (&tio, BAUDRATE);
1729 tcsetattr (pty->tty, TCSANOW, &tio);
1421 pty.set_utf8_mode (enc_utf8); 1730 pty->set_utf8_mode (enc_utf8);
1422 1731
1423 /* set initial window size */ 1732 /* set initial window size */
1424 tt_winch (); 1733 tt_winch ();
1425
1426 int er;
1427
1428#ifndef NO_BACKSPACE_KEY
1429 if (key_backspace[0] && !key_backspace[1])
1430 er = key_backspace[0];
1431 else if (strcmp (key_backspace, "DEC") == 0)
1432 er = '\177'; /* the initial state anyway */
1433 else
1434#endif
1435 er = -1;
1436
1437 rxvt_get_ttymode (&tio, er);
1438 1734
1439#if ENABLE_FRILLS 1735#if ENABLE_FRILLS
1440 if (rs[Rs_pty_fd]) 1736 if (rs[Rs_pty_fd])
1441 return; 1737 return;
1442#endif 1738#endif
1443 1739
1444#ifndef __QNX__
1445 /* spin off the command interpreter */ 1740 /* spin off the command interpreter */
1446 switch (cmd_pid = fork ()) 1741 switch (cmd_pid = fork ())
1447 { 1742 {
1448 case -1: 1743 case -1:
1449 { 1744 {
… …
1451 rxvt_fatal ("can't fork, aborting.\n"); 1746 rxvt_fatal ("can't fork, aborting.\n");
1452 } 1747 }
1453 case 0: 1748 case 0:
1454 init_env (); 1749 init_env ();
1455 1750
1456 if (!pty.make_controlling_tty ()) 1751 if (!pty->make_controlling_tty ())
1457 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1752 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1458 else 1753 else
1459 { 1754 {
1460 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1755 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1461 dup2 (pty.tty, STDIN_FILENO); 1756 dup2 (pty->tty, STDIN_FILENO);
1462 dup2 (pty.tty, STDOUT_FILENO); 1757 dup2 (pty->tty, STDOUT_FILENO);
1463 dup2 (pty.tty, STDERR_FILENO); 1758 dup2 (pty->tty, STDERR_FILENO);
1464 1759
1465 // close all our file handles that we do no longer need 1760 // close all our file handles that we do no longer need
1466 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1761 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1467 { 1762 {
1468 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1763 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1469 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1764 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1470 } 1765 }
1471 1766
1472 run_child (argv); 1767 run_child (argv);
1473 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1768 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1474 } 1769 }
1475 1770
1476 _exit (EXIT_FAILURE); 1771 _exit (EXIT_FAILURE);
1477 1772
1478 default: 1773 default:
1479 { 1774 if (!option (Opt_utmpInhibit))
1480#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1775 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1481 int fdstdin;
1482 1776
1483 fdstdin = dup (STDIN_FILENO); 1777 pty->close_tty ();
1484 dup2 (pty.tty, STDIN_FILENO);
1485#endif
1486 1778
1487#ifdef UTMP_SUPPORT 1779 child_ev.start (cmd_pid);
1488 privileged_utmp (SAVE);
1489#endif
1490 1780
1491#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1781 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1492
1493 dup2 (fdstdin, STDIN_FILENO);
1494 close (fdstdin);
1495#endif
1496 }
1497
1498 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1499 break; 1782 break;
1500 } 1783 }
1501#else /* __QNX__ uses qnxspawn () */
1502 fchmod (pty.tty, 0622);
1503 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1504 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1505
1506 if (run_child (argv) == -1)
1507 exit (EXIT_FAILURE);
1508#endif
1509} 1784}
1510 1785
1511/* ------------------------------------------------------------------------- * 1786/* ------------------------------------------------------------------------- *
1512 * CHILD PROCESS OPERATIONS * 1787 * CHILD PROCESS OPERATIONS *
1513 * ------------------------------------------------------------------------- */ 1788 * ------------------------------------------------------------------------- */
… …
1518int 1793int
1519rxvt_term::run_child (const char *const *argv) 1794rxvt_term::run_child (const char *const *argv)
1520{ 1795{
1521 char *login; 1796 char *login;
1522 1797
1523 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1524
1525 if (OPTION (Opt_console)) 1798 if (option (Opt_console))
1799 {
1526 { /* be virtual console, fail silently */ 1800 /* be virtual console, fail silently */
1527#ifdef TIOCCONS 1801#ifdef TIOCCONS
1528 unsigned int on = 1; 1802 unsigned int on = 1;
1529 1803
1530 ioctl (STDIN_FILENO, TIOCCONS, &on); 1804 ioctl (STDIN_FILENO, TIOCCONS, &on);
1531#elif defined (SRIOCSREDIR) 1805#elif defined (SRIOCSREDIR)
… …
1533 1807
1534 fd = open (CONSOLE, O_WRONLY, 0); 1808 fd = open (CONSOLE, O_WRONLY, 0);
1535 if (fd >= 0) 1809 if (fd >= 0)
1536 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1810 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1537 close (fd); 1811 close (fd);
1538#endif /* SRIOCSREDIR */ 1812#endif /* SRIOCSREDIR */
1539 } 1813 }
1540 1814
1541 /* reset signals and spin off the command interpreter */ 1815 /* reset signals and spin off the command interpreter */
1542 signal (SIGINT, SIG_DFL); 1816 signal (SIGINT, SIG_DFL);
1543 signal (SIGQUIT, SIG_DFL); 1817 signal (SIGQUIT, SIG_DFL);
… …
1550 */ 1824 */
1551#ifdef SIGTSTP 1825#ifdef SIGTSTP
1552 signal (SIGTSTP, SIG_IGN); 1826 signal (SIGTSTP, SIG_IGN);
1553 signal (SIGTTIN, SIG_IGN); 1827 signal (SIGTTIN, SIG_IGN);
1554 signal (SIGTTOU, SIG_IGN); 1828 signal (SIGTTOU, SIG_IGN);
1555#endif /* SIGTSTP */ 1829#endif /* SIGTSTP */
1556 1830
1557 // unblock signals (signals are blocked by iom.C
1558 sigset_t ss;
1559 sigemptyset (&ss);
1560 sigprocmask (SIG_SETMASK, &ss, 0);
1561
1562#ifndef __QNX__
1563 /* command interpreter path */ 1831 /* command interpreter path */
1564 if (argv != NULL) 1832 if (argv)
1565 { 1833 {
1566# ifdef DEBUG_CMD 1834# ifdef DEBUG_CMD
1567 int i; 1835 int i;
1568 1836
1569 for (i = 0; argv[i]; i++) 1837 for (i = 0; argv[i]; i++)
… …
1573 execvp (argv[0], (char *const *)argv); 1841 execvp (argv[0], (char *const *)argv);
1574 /* no error message: STDERR is closed! */ 1842 /* no error message: STDERR is closed! */
1575 } 1843 }
1576 else 1844 else
1577 { 1845 {
1578 const char *argv0, *shell; 1846 const char *argv0, *shell;
1579 1847
1580 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1848 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1581 shell = "/bin/sh"; 1849 shell = "/bin/sh";
1582 1850
1583 argv0 = (const char *)rxvt_r_basename (shell); 1851 argv0 = rxvt_basename (shell);
1584 1852
1585 if (OPTION (Opt_loginShell)) 1853 if (option (Opt_loginShell))
1586 { 1854 {
1587 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1855 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1588 1856
1589 login[0] = '-'; 1857 login[0] = '-';
1590 strcpy (&login[1], argv0); 1858 strcpy (&login[1], argv0);
1591 argv0 = login; 1859 argv0 = login;
1592 } 1860 }
1861
1593 execlp (shell, argv0, NULL); 1862 execlp (shell, argv0, (char *)0);
1594 /* no error message: STDERR is closed! */ 1863 /* no error message: STDERR is closed! */
1595 } 1864 }
1596
1597#else /* __QNX__ uses qnxspawn () */
1598
1599 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1600 char *command = NULL, fullcommand[_MAX_PATH];
1601 char **arg_v, *arg_a[2] = { NULL, NULL };
1602
1603 if (argv != NULL)
1604 {
1605 if (access (argv[0], X_OK) == -1)
1606 {
1607 if (strchr (argv[0], '/') == NULL)
1608 {
1609 searchenv (argv[0], "PATH", fullcommand);
1610
1611 if (fullcommand[0] != '\0')
1612 command = fullcommand;
1613 }
1614
1615 if (access (command, X_OK) == -1)
1616 return -1;
1617 }
1618 else
1619 command = argv[0];
1620
1621 arg_v = argv;
1622 }
1623 else
1624 {
1625 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1626 command = "/bin/sh";
1627
1628 arg_a[0] = my_basename (command);
1629
1630 if (OPTION (Opt_loginShell))
1631 {
1632 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1633
1634 login[0] = '-';
1635 strcpy (&login[1], arg_a[0]);
1636 arg_a[0] = login;
1637 }
1638
1639 arg_v = arg_a;
1640 }
1641
1642 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1643 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1644 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1645 command, arg_v, environ, iov_a, 0);
1646 if (login)
1647 free (login);
1648
1649 pty.close_tty ();
1650 return pty.pty;
1651#endif
1652 1865
1653 return -1; 1866 return -1;
1654} 1867}
1655 1868
1656/*----------------------- end-of-file (C source) -----------------------*/ 1869/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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