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.124 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.279 by sf-exg, Sun Aug 29 15:05: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"
40
41#include <limits>
38 42
39#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
40 147
41const char *const def_colorName[] = 148const char *const def_colorName[] =
42 { 149 {
43 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
45 /* low-intensity colors */ 152 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 153 "rgb:00/00/00", // 0: black (Black)
47#ifndef NO_BRIGHTCOLOR 154 "rgb:cd/00/00", // 1: red (Red3)
48 "Red3", /* 1: red (#CD0000) */ 155 "rgb:00/cd/00", // 2: green (Green3)
49 "Green3", /* 2: green (#00CD00) */ 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
50 "Yellow3", /* 3: yellow (#CDCD00) */ 157 "rgb:00/00/cd", // 4: blue (Blue3)
51 "Blue3", /* 4: blue (#0000CD) */ 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
52 "Magenta3", /* 5: magenta (#CD00CD) */ 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
53 "Cyan3", /* 6: cyan (#00CDCD) */
54# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
55 "Grey90", /* 7: white (#E5E5E5) */ 161 "rgb:e5/e5/e5", // 7: white (Grey90)
56# else 162# else
57 "AntiqueWhite", /* 7: white (#FAEBD7) */ 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
58# endif 164# endif
59 /* high-intensity colors */ 165 /* high-intensity colors */
60# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
62# else 168# else
63 "Grey25", /* 8: bright black (#404040) */ 169 "rgb:40/40/40", // 8: bright black (Grey25)
64# endif 170# endif
65#endif /* NO_BRIGHTCOLOR */ 171 "rgb:ff/00/00", // 1/9: bright red (Reed)
66 "Red", /* 1/9: bright red (#FF0000) */ 172 "rgb:00/ff/00", // 2/10: bright green (Green)
67 "Green", /* 2/10: bright green (#00FF00) */ 173 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
72 "White", /* 7/15: bright white (#FFFFFF) */
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);
269} 560 set_option (Opt_buffered);
270
271void
272rxvt_term::init_secondary ()
273{
274 int i;
275
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)
281 {
282 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO);
284 }
285 else if (i > STDIN_FILENO)
286 {
287 dup2 (i, STDIN_FILENO);
288 close (i);
289 }
290
291 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} 561}
304 562
305/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
306const char ** 564const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
308{ 566{
309 int i, r_argc; 567 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
312 569
313 /* 570 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 571 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 572 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 574 if (!strcmp (argv[r_argc], "-e"))
318 break; 575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
319 590
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 592
322 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
324 595
325 r_argv[i] = NULL; 596 r_argv[i] = NULL;
326 597
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]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
340 599
341 /* 600 /*
342 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
343 */ 602 */
603
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
346 606
347 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
348 608
349 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
351 614
615 // using a local pointer decreases code size a lot
616 xa = display->xa;
617
618 set (display);
352 extract_resources (); 619 extract_resources ();
620
621#if XFT
622 if (rs[Rs_depth])
623 select_visual (strtol (rs[Rs_depth], 0, 0));
624#endif
625
353 free (r_argv); 626 free (r_argv);
627
628 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef)
630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#if ENABLE_PERL
638 if (!rs[Rs_perl_ext_1])
639 rs[Rs_perl_ext_1] = "default";
640
641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
642 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
643 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
644 {
645 rxvt_perl.init (this);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 }
648#endif
354 649
355 /* 650 /*
356 * set any defaults not already set 651 * set any defaults not already set
357 */ 652 */
358 if (cmd_argv && cmd_argv[0]) 653 if (cmd_argv && cmd_argv[0])
359 { 654 {
360 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
361 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 656 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
657
362 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
363 rs[Rs_iconName] = rs[Rs_title]; 659 rs[Rs_iconName] = rs[Rs_title];
364 } 660 }
365 else 661 else
366 { 662 {
367 if (!rs[Rs_title]) 663 if (!rs[Rs_title])
368 rs[Rs_title] = rs[Rs_name]; 664 rs[Rs_title] = rs[Rs_name];
665
369 if (!rs[Rs_iconName]) 666 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 667 rs[Rs_iconName] = rs[Rs_name];
371 } 668 }
372 669
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 670 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = min (i, MAX_POSITIVE_INT16); 671 saveLines = min (i, MAX_SAVELINES);
375 672
376#if ENABLE_FRILLS 673#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 674 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, MAX_POSITIVE_INT16); 675 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379 676
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 677 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 ext_bwidth = min (i, MAX_POSITIVE_INT16); 678 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382 679
383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 680 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
384 lineSpace = min (i, MAX_POSITIVE_INT16); 681 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
682
683 if (rs[Rs_letterSpace])
684 letterSpace = atoi (rs[Rs_letterSpace]);
385#endif 685#endif
386 686
387#ifdef POINTER_BLANK 687#ifdef POINTER_BLANK
388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
389 pointerBlankDelay = i; 689 pointerBlankDelay = i;
… …
391 pointerBlankDelay = 2; 691 pointerBlankDelay = 2;
392#endif 692#endif
393 693
394 /* no point having a scrollbar without having any scrollback! */ 694 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 695 if (!saveLines)
396 options &= ~Opt_scrollBar; 696 set_option (Opt_scrollBar, 0);
397
398#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE;
401#endif
402 697
403 if (!rs[Rs_cutchars]) 698 if (!rs[Rs_cutchars])
404 rs[Rs_cutchars] = CUTCHARS; 699 rs[Rs_cutchars] = CUTCHARS;
405 700
406#ifndef NO_BACKSPACE_KEY 701#ifndef NO_BACKSPACE_KEY
407 if (!rs[Rs_backspace_key]) 702 if (!rs[Rs_backspace_key])
408# ifdef DEFAULT_BACKSPACE 703# ifdef DEFAULT_BACKSPACE
409 key_backspace = DEFAULT_BACKSPACE; 704 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
410# else 705# else
411 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 706 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
412# endif 707# 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 708#endif
421 709
422#ifndef NO_DELETE_KEY 710#ifndef NO_DELETE_KEY
423 if (!rs[Rs_delete_key]) 711 if (!rs[Rs_delete_key])
424# ifdef DEFAULT_DELETE 712# ifdef DEFAULT_DELETE
425 key_delete = DEFAULT_DELETE; 713 rs[Rs_delete_key] = DEFAULT_DELETE;
426# else 714# else
427 key_delete = "\033[3~"; 715 rs[Rs_delete_key] = "\033[3~";
428# endif 716# 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 717#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 718
443#ifdef HAVE_SCROLLBARS 719 scrollBar.setup (this);
444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
445#endif
446 720
447#ifdef XTERM_REVERSE_VIDEO 721#ifdef XTERM_REVERSE_VIDEO
448 /* this is how xterm implements reverseVideo */ 722 /* this is how xterm implements reverseVideo */
449 if (options & Opt_reverseVideo) 723 if (option (Opt_reverseVideo))
450 { 724 {
451 if (!rs[Rs_color + Color_fg]) 725 if (!rs[Rs_color + Color_fg])
452 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 726 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
727
453 if (!rs[Rs_color + Color_bg]) 728 if (!rs[Rs_color + Color_bg])
454 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 729 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
455 } 730 }
456#endif 731#endif
457 732
… …
459 if (!rs[Rs_color + i]) 734 if (!rs[Rs_color + i])
460 rs[Rs_color + i] = def_colorName[i]; 735 rs[Rs_color + i] = def_colorName[i];
461 736
462#ifndef XTERM_REVERSE_VIDEO 737#ifndef XTERM_REVERSE_VIDEO
463 /* this is how we implement reverseVideo */ 738 /* this is how we implement reverseVideo */
464 if (options & Opt_reverseVideo) 739 if (option (Opt_reverseVideo))
465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 740 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
466#endif 741#endif
467 742
468 /* convenient aliases for setting fg/bg to colors */ 743 /* convenient aliases for setting fg/bg to colors */
469 color_aliases (Color_fg); 744 color_aliases (Color_fg);
470 color_aliases (Color_bg); 745 color_aliases (Color_bg);
471#ifndef NO_CURSORCOLOR 746#ifndef NO_CURSORCOLOR
472 color_aliases (Color_cursor); 747 color_aliases (Color_cursor);
473 color_aliases (Color_cursor2); 748 color_aliases (Color_cursor2);
474#endif /* NO_CURSORCOLOR */ 749#endif /* NO_CURSORCOLOR */
475 color_aliases (Color_pointer_fg); 750 color_aliases (Color_pointer_fg);
476 color_aliases (Color_pointer_bg); 751 color_aliases (Color_pointer_bg);
477 color_aliases (Color_border); 752 color_aliases (Color_border);
478#ifndef NO_BOLD_UNDERLINE_REVERSE 753#ifndef NO_BOLD_UNDERLINE_REVERSE
479 color_aliases (Color_BD); 754 color_aliases (Color_BD);
480 color_aliases (Color_UL); 755 color_aliases (Color_UL);
481 color_aliases (Color_RV); 756 color_aliases (Color_RV);
482#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 757#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
483 758
484 if (!rs[Rs_color + Color_border]) 759 if (!rs[Rs_color + Color_border])
485 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 760 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
486 761
487 return cmd_argv; 762 return cmd_argv;
763}
764
765/*----------------------------------------------------------------------*/
766void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
768{
769 this->envv = envv;
770
771 SET_R (this);
772 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :(
774
775 init_vars ();
776
777 const char **cmd_argv = init_resources (argc, argv);
778
779#ifdef KEYSYM_RESOURCE
780 keyboard->register_done ();
781#endif
782
783 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty
785 {
786 if (*path != '/')
787 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
788
789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 }
792
793 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bgPixmap.set_target (this);
813 bgPixmap.invalidate ();
814
815#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent))
817 {
818 bgPixmap.set_transparent ();
819
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823#endif
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856
857#if ENABLE_PERL
858 rootwin_ev.start (display, display->root);
859#endif
860
861 set_colorfgbg ();
862
863 init_command (cmd_argv);
864
865 free (cmd_argv);
866
867 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ);
869
870 HOOK_INVOKE ((this, HOOK_START, DT_END));
871
872#if ENABLE_XEMBED
873 if (rs[Rs_embed])
874 {
875 long info[2] = { 0, XEMBED_MAPPED };
876
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2);
879 }
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]);
884
885 refresh_check ();
488} 886}
489 887
490/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
491void 889void
492rxvt_term::init_env () 890rxvt_term::init_env ()
493{ 891{
494 int i; 892 int i;
495 unsigned int u;
496 char *val; 893 char *val;
497 894
498#ifdef DISPLAY_IS_IP 895#ifdef DISPLAY_IS_IP
499 /* Fixup display_name for export over pty to any interested terminal 896 /* 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 897 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
508 */ 905 */
509 val = rxvt_network_display (rs[Rs_display_name]); 906 val = rxvt_network_display (rs[Rs_display_name]);
510 rs[Rs_display_name] = (const char *)val; 907 rs[Rs_display_name] = (const char *)val;
511 908
512 if (val == NULL) 909 if (val == NULL)
513#endif /* DISPLAY_IS_IP */ 910#endif /* DISPLAY_IS_IP */
514 val = XDisplayString (display->display); 911 val = XDisplayString (dpy);
515 912
516 if (rs[Rs_display_name] == NULL) 913 if (rs[Rs_display_name] == NULL)
517 rs[Rs_display_name] = val; /* use broken `:0' value */ 914 rs[Rs_display_name] = val; /* use broken `:0' value */
518 915
519 i = strlen (val); 916 i = strlen (val);
520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 917 env_display = (char *)rxvt_malloc (i + 9);
521 918
522 sprintf (env_display, "DISPLAY=%s", val); 919 sprintf (env_display, "DISPLAY=%s", val);
523 920
524 /* avoiding the math library: 921 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 922
534 /* add entries to the environment: 923 /* add entries to the environment:
535 * @ DISPLAY: in case we started with -display 924 * @ DISPLAY: in case we started with -display
536 * @ WINDOWID: X window id number of the window 925 * @ WINDOWID: X window id number of the window
537 * @ COLORTERM: terminal sub-name and also indicates its color 926 * @ COLORTERM: terminal sub-name and also indicates its color
… …
539 * @ TERMINFO: path to terminfo directory 928 * @ TERMINFO: path to terminfo directory
540 * @ COLORFGBG: fg;bg color codes 929 * @ COLORFGBG: fg;bg color codes
541 */ 930 */
542 putenv (env_display); 931 putenv (env_display);
543 putenv (env_windowid); 932 putenv (env_windowid);
933
544 if (env_colorfgbg) 934 if (env_colorfgbg)
545 putenv (env_colorfgbg); 935 putenv (env_colorfgbg);
546 936
547#ifdef RXVT_TERMINFO 937#ifdef RXVT_TERMINFO
548 putenv ("TERMINFO=" RXVT_TERMINFO); 938 putenv ("TERMINFO=" RXVT_TERMINFO);
549#endif 939#endif
550 940
551 if (display->depth <= 2) 941 if (depth <= 2)
552 putenv ("COLORTERM=" COLORTERMENV "-mono"); 942 putenv ("COLORTERM=" COLORTERMENV "-mono");
553 else 943 else
554 putenv ("COLORTERM=" COLORTERMENVFULL); 944 putenv ("COLORTERM=" COLORTERMENVFULL);
555 945
556 if (rs[Rs_term_name] != NULL) 946 if (rs[Rs_term_name] != NULL)
557 { 947 {
558 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 948 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
559 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 949 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
560 putenv (env_term); 950 putenv (env_term);
561 } 951 }
562 else 952 else
563 putenv ("TERM=" TERMENV); 953 putenv ("TERM=" TERMENV);
… …
565#ifdef HAVE_UNSETENV 955#ifdef HAVE_UNSETENV
566 /* avoid passing old settings and confusing term size */ 956 /* avoid passing old settings and confusing term size */
567 unsetenv ("LINES"); 957 unsetenv ("LINES");
568 unsetenv ("COLUMNS"); 958 unsetenv ("COLUMNS");
569 unsetenv ("TERMCAP"); /* terminfo should be okay */ 959 unsetenv ("TERMCAP"); /* terminfo should be okay */
570#endif /* HAVE_UNSETENV */ 960#endif /* HAVE_UNSETENV */
571} 961}
572 962
573/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
574/* 964/*
575 * This is more or less stolen straight from XFree86 xterm. 965 * This is more or less stolen straight from XFree86 xterm.
576 * This should support all European type languages. 966 * This should support all European type languages.
577 */ 967 */
578void 968void
579rxvt_term::set_locale (const char *locale) 969rxvt_term::set_locale (const char *locale)
580{ 970{
971 set_environ (envv);
972
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 973#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 974 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 975 this->locale = setlocale (LC_CTYPE, locale);
584 976
585 if (!this->locale) 977 if (!this->locale)
586 { 978 {
587 if (*locale) 979 if (*locale)
588 { 980 {
589 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 981 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590 setlocale (LC_CTYPE, ""); 982 setlocale (LC_CTYPE, "C");
591 } 983 }
592 else 984 else
593 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 985 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594 986
595 this->locale = ""; 987 this->locale = "C";
596 } 988 }
597 989
598 990
599 this->locale = rxvt_strdup (this->locale); 991 this->locale = strdup (this->locale);
600 SET_LOCALE (this->locale); 992 SET_LOCALE (this->locale);
601 mbstate.reset (); 993 mbstate.reset ();
602#endif 994#endif
603 995
604#if HAVE_NL_LANGINFO 996#if HAVE_NL_LANGINFO
… …
615} 1007}
616 1008
617void 1009void
618rxvt_term::init_xlocale () 1010rxvt_term::init_xlocale ()
619{ 1011{
1012 set_environ (envv);
1013
620#ifdef USE_XIM 1014#ifdef USE_XIM
621 if (!locale) 1015 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 1016 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 1017 else
624 { 1018 {
… …
646 * Initialize the command connection. 1040 * Initialize the command connection.
647 * This should be called after the X server connection is established. 1041 * This should be called after the X server connection is established.
648 */ 1042 */
649 1043
650#ifdef META8_OPTION 1044#ifdef META8_OPTION
651 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 1045 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
652#endif 1046#endif
653 1047
654 get_ourmods (); 1048 get_ourmods ();
655 1049
656 if (!(options & Opt_scrollTtyOutput)) 1050 if (!option (Opt_scrollTtyOutput))
657 priv_modes |= PrivMode_TtyOutputInh; 1051 priv_modes |= PrivMode_TtyOutputInh;
658 if (options & Opt_scrollTtyKeypress) 1052 if (option (Opt_scrollTtyKeypress))
659 priv_modes |= PrivMode_Keypress; 1053 priv_modes |= PrivMode_Keypress;
660 if (!(options & Opt_jumpScroll)) 1054 if (!option (Opt_jumpScroll))
661 priv_modes |= PrivMode_smoothScroll; 1055 priv_modes |= PrivMode_smoothScroll;
662 1056
663#ifndef NO_BACKSPACE_KEY 1057#ifndef NO_BACKSPACE_KEY
664 if (strcmp (key_backspace, "DEC") == 0) 1058 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 1059 priv_modes |= PrivMode_HaveBackSpace;
666#endif 1060#endif
667 1061
668 /* add value for scrollBar */ 1062 /* add value for scrollBar */
669 if (scrollbar_visible ()) 1063 if (scrollBar.state)
670 { 1064 {
671 priv_modes |= PrivMode_scrollBar; 1065 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 1066 SavedModes |= PrivMode_scrollBar;
673 } 1067 }
674 1068
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 }
680
681#ifdef CURSOR_BLINK
682 if (options & Opt_cursorBlink)
683 (void)gettimeofday (&lastcursorchange, NULL);
684#endif
685
686 run_command (argv); 1069 run_command (argv);
687} 1070}
688 1071
689/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
690void 1073void
691rxvt_term::Get_Colours () 1074rxvt_term::get_colours ()
692{ 1075{
693 int i; 1076 int i;
694 1077
695#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
696 pix_colors = pix_colors_focused; 1079 pix_colors = pix_colors_focused;
697#endif 1080#endif
698 1081
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
700 { 1083 {
1084 const char *name = rs[Rs_color + i];
1085
1086 if (!name)
1087 continue;
1088
701 rxvt_color xcol; 1089 rxvt_color xcol;
702 1090
703 if (!rs[Rs_color + i]) 1091 if (!set_color (xcol, name))
704 continue;
705
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707 { 1092 {
708#ifndef XTERM_REVERSE_VIDEO 1093#ifndef XTERM_REVERSE_VIDEO
709 if (i < 2 && (options & Opt_reverseVideo)) 1094 if (i < 2 && option (Opt_reverseVideo))
710 rs[Rs_color + i] = def_colorName[!i]; 1095 name = def_colorName [1 - i];
711 else 1096 else
712#endif 1097#endif
713 rs[Rs_color + i] = def_colorName[i]; 1098 name = def_colorName [i];
714 1099
715 if (!rs[Rs_color + i]) 1100 if (!name)
716 continue; 1101 continue;
717 1102
718 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1103 if (!set_color (xcol, name))
719 { 1104 {
720 switch (i) 1105 switch (i)
721 { 1106 {
722 case Color_fg: 1107 case Color_fg:
723 case Color_bg: 1108 case Color_bg:
724 /* fatal: need bg/fg color */
725 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 1109 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
726 /* NOTREACHED */ 1110 name = "";
727 break; 1111 break;
728#ifndef NO_CURSORCOLOR 1112#ifndef NO_CURSORCOLOR
729 case Color_cursor2: 1113 case Color_cursor2:
730 xcol = pix_colors[Color_fg]; 1114#endif
731 break;
732#endif /* ! NO_CURSORCOLOR */
733 case Color_pointer_fg: 1115 case Color_pointer_fg:
734 xcol = pix_colors[Color_fg]; 1116 name = rs[Rs_color + Color_fg];
1117 xcol.set (this, name);
735 break; 1118 break;
736 default: 1119 default:
737 xcol = pix_colors[Color_bg]; /* None */ 1120 name = rs[Rs_color + Color_bg];
1121 xcol.set (this, name);
738 break; 1122 break;
739 } 1123 }
740 } 1124 }
741 } 1125 }
742 1126
743 pix_colors[i] = xcol; 1127 pix_colors[i] = xcol;
744 SET_PIXCOLOR (i); 1128 rs[Rs_color + i] = name;
745 }
746
747#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade])
749 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
750 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
751#endif
752
753 if (display->depth <= 2)
754 { 1129 }
1130
1131 if (depth <= 2)
1132 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1133 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 1134 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
757 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 1135 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
758 } 1136 }
759 1137
760 /* 1138 /*
761 * get scrollBar/menuBar shadow colors 1139 * get scrollBar shadow colors
762 * 1140 *
763 * The calculations of topShadow/bottomShadow values are adapted 1141 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 1142 * from the fvwm window manager.
765 */ 1143 */
766#ifdef KEEP_SCROLLCOLOR 1144#ifdef RXVT_SCROLLBAR
767
768 if (display->depth <= 2) 1145 if (depth <= 2)
769 { 1146 {
770 /* Monochrome */ 1147 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1148 alias_color (Color_scroll, Color_fg);
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1149 alias_color (Color_topShadow, Color_bg);
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1150 alias_color (Color_bottomShadow, Color_bg);
774 } 1151 }
775 else 1152 else
776 { 1153 {
777 rxvt_color xcol[2]; 1154 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
778 /* xcol[0] == white
779 * xcol[1] == top shadow
780 * xcol[2] == bot shadow */
781 1155
782 xcol[1] = pix_colors[Color_scroll]; 1156 rgba cscroll;
783 xcol[0].set (display, 65535, 65535, 65535); 1157 pix_colors [Color_scroll].get (cscroll);
784
785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
786
787 xcol[0].get (display, pr0, pg0, pb0);
788 xcol[1].get (display, pr1, pg1, pb1);
789
790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
791 1158
792 /* topShadowColor */ 1159 /* topShadowColor */
793 if (!xcol[1].set (display, 1160 if (!pix_colors[Color_topShadow].set (this,
794 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1161 rgba (
795 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1162 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
796 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1163 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
797 xcol[1] = pix_colors[Color_White]; 1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
798 1165 cscroll.a)
799 pix_colors[Color_topShadow] = xcol[1]; 1166 ))
1167 alias_color (Color_topShadow, Color_White);
800 } 1168 }
801#endif /* KEEP_SCROLLCOLOR */ 1169#endif
1170
1171#ifdef OFF_FOCUS_FADING
1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1173 update_fade_color (i);
1174#endif
802} 1175}
803 1176
804/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
805/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
806void 1179void
… …
809 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
810 { 1183 {
811 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
812 1185
813 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
814 { /* bright colors */ 1187 /* bright colors */
815 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1188 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
818 return; 1189 else if (i >= 0 && i <= 7)
819#endif 1190 /* normal colors */
820 }
821
822 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1191 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 1192 }
825} 1193}
826 1194
827/*----------------------------------------------------------------------*/ 1195/*----------------------------------------------------------------------*/
… …
847 1215
848 if (rsmod 1216 if (rsmod
849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1217 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
850 requestedmeta = rsmod[3] - '0'; 1218 requestedmeta = rsmod[3] - '0';
851 1219
852 map = XGetModifierMapping (display->display); 1220 map = XGetModifierMapping (dpy);
853 kc = map->modifiermap; 1221 kc = map->modifiermap;
854 1222
855 for (i = 1; i < 6; i++) 1223 for (i = 1; i < 6; i++)
856 { 1224 {
857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1225 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
859 for (j = map->max_keypermod; j--; k++) 1227 for (j = map->max_keypermod; j--; k++)
860 { 1228 {
861 if (kc[k] == 0) 1229 if (kc[k] == 0)
862 break; 1230 break;
863 1231
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1232 switch (XKeycodeToKeysym (dpy, kc[k], 0))
865 { 1233 {
866 case XK_Num_Lock: 1234 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 1235 ModNumLockMask = modmasks[i - 1];
868 continue; 1236 continue;
869 1237
… …
909 : realalt ? realalt 1277 : realalt ? realalt
910 : 0; 1278 : 0;
911 1279
912 if (i) 1280 if (i)
913 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
1282}
1283
1284void
1285rxvt_term::set_icon (const char *file)
1286{
1287#ifdef HAVE_AFTERIMAGE
1288 init_asv ();
1289
1290 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291 if (!im)
1292 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return;
1295 }
1296
1297 int w = im->width;
1298 int h = im->height;
1299
1300 if (!IN_RANGE_INC (w, 1, 32767) || !IN_RANGE_INC (h, 1, 32767))
1301 {
1302 rxvt_warn ("Icon image too big, continuing without.\n");
1303 destroy_asimage (&im);
1304 return;
1305 }
1306
1307 ASImage *result = scale_asimage (asv, im,
1308 w, h, ASA_ARGB32,
1309 100, ASIMAGE_QUALITY_DEFAULT);
1310 destroy_asimage (&im);
1311
1312 if (!result)
1313 {
1314 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1315 return;
1316 }
1317
1318 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1319 if (buffer)
1320 {
1321 ARGB32 *asbuf = result->alt.argb32;
1322 buffer [0] = w;
1323 buffer [1] = h;
1324
1325 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i];
1327
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer);
1331 }
1332 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334
1335 destroy_asimage (&result);
1336#endif
914} 1337}
915 1338
916/*----------------------------------------------------------------------*/ 1339/*----------------------------------------------------------------------*/
917/* rxvt_Create_Windows () - Open and map the window */ 1340/* rxvt_Create_Windows () - Open and map the window */
918void 1341void
919rxvt_term::create_windows (int argc, const char *const *argv) 1342rxvt_term::create_windows (int argc, const char *const *argv)
920{ 1343{
921 XClassHint classHint; 1344 XClassHint classHint;
922 XWMHints wmHint; 1345 XWMHints wmHint;
923#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
924 Atom prop = None;
925 MWMHints mwmhints; 1347 MWMHints mwmhints = { };
926#endif 1348#endif
927 XGCValues gcvalue; 1349 XGCValues gcvalue;
928 long vt_emask;
929 XSetWindowAttributes attributes; 1350 XSetWindowAttributes attributes;
930 XWindowAttributes gattr;
931 Window top, parent; 1351 Window top, parent;
932 dDisp;
933 1352
934#ifdef USING_W11LIB 1353 dLocal (Display *, dpy);
935 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif
938 1354
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1355 /* grab colors before netscape does */
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 1356 get_colours ();
941 1357
942 if (options & Opt_transparent) 1358 if (!set_fonts ())
943 { 1359 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 1360
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1361 parent = display->root;
946 } 1362
1363 attributes.override_redirect = !!option (Opt_override_redirect);
947 1364
948#if ENABLE_FRILLS 1365#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 1366 if (option (Opt_borderLess))
950 { 1367 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 1368 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
952
953 if (prop == None)
954 { 1369 {
955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1370 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
956#ifdef PREFER_24BIT
957 attributes.override_redirect = TRUE; 1371 attributes.override_redirect = true;
958#endif
959 mwmhints.flags = 0;
960 } 1372 }
961 else 1373 else
962 { 1374 {
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 1375 mwmhints.flags = MWM_HINTS_DECORATIONS;
964 mwmhints.decorations = 0;
965 } 1376 }
966 } 1377 }
967 else
968 mwmhints.flags = 0;
969#endif 1378#endif
970
971 /* grab colors before netscape does */
972 Get_Colours ();
973
974 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976
977 parent = DefaultRootWindow (disp);
978 1379
979#if ENABLE_XEMBED 1380#if ENABLE_XEMBED
980 if (rs[Rs_embed]) 1381 if (rs[Rs_embed])
981 { 1382 {
982 XWindowAttributes wattr; 1383 XWindowAttributes wattr;
983 1384
984 parent = strtol (rs[Rs_embed], 0, 0); 1385 parent = strtol (rs[Rs_embed], 0, 0);
985 1386
986 if (!XGetWindowAttributes (disp, parent, &wattr)) 1387 if (!XGetWindowAttributes (dpy, parent, &wattr))
987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1388 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
988 1389
989 window_calc (wattr.width, wattr.height); 1390 window_calc (wattr.width, wattr.height);
990 } 1391 }
991#endif 1392#endif
992 1393
993 window_calc (0, 0); 1394 window_calc (0, 0);
994 1395
995 /* sub-window placement & size in rxvt_resize_subwindows () */ 1396 /* sub-window placement & size in rxvt_resize_subwindows () */
996#ifdef PREFER_24BIT
997 attributes.background_pixel = pix_colors_focused[Color_border]; 1397 attributes.background_pixel = pix_colors_focused [Color_border];
998 attributes.border_pixel = pix_colors_focused[Color_border]; 1398 attributes.border_pixel = pix_colors_focused [Color_border];
999 attributes.colormap = display->cmap; 1399 attributes.colormap = cmap;
1400
1000 top = XCreateWindow (disp, parent, 1401 top = XCreateWindow (dpy, parent,
1001 szHint.x, szHint.y, 1402 szHint.x, szHint.y,
1002 szHint.width, szHint.height, 1403 szHint.width, szHint.height,
1003 ext_bwidth, 1404 ext_bwidth,
1004 display->depth, InputOutput, 1405 depth, InputOutput, visual,
1005 display->visual,
1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1406 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1007#else 1407 &attributes);
1008 top = XCreateSimpleWindow (disp, parent,
1009 szHint.x, szHint.y,
1010 szHint.width, szHint.height,
1011 ext_bwidth,
1012 pix_colors_focused[Color_border],
1013 pix_colors_focused[Color_border]);
1014#endif
1015 1408
1016 this->parent[0] = top; 1409 this->parent[0] = top;
1017 1410
1018 old_width = szHint.width; 1411 old_width = szHint.width;
1019 old_height = szHint.height; 1412 old_height = szHint.height;
1020 1413
1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1414 set_title (rs [Rs_title]);
1022 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1415 set_icon_name (rs [Rs_iconName]);
1023 1416
1024 classHint.res_name = (char *)rs[Rs_name]; 1417 classHint.res_name = (char *)rs[Rs_name];
1025 classHint.res_class = (char *)RESCLASS; 1418 classHint.res_class = (char *)RESCLASS;
1026 1419
1027 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1420 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1028 wmHint.input = True; 1421 wmHint.input = True;
1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1422 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1030 wmHint.window_group = top; 1423 wmHint.window_group = top;
1031 1424
1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1033 &szHint, &wmHint, &classHint); 1426 &szHint, &wmHint, &classHint);
1427#if ENABLE_EWMH
1428 /*
1429 * set up icon hint
1430 * rs [Rs_iconfile] is path to icon
1431 */
1432
1433 if (rs [Rs_iconfile])
1434 {
1435 set_icon (rs [Rs_iconfile]);
1436 }
1437#endif
1438
1439#if ENABLE_FRILLS
1440 if (mwmhints.flags)
1441 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1442 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1443#endif
1034 1444
1035 Atom protocols[] = { 1445 Atom protocols[] = {
1036 xa[XA_WM_DELETE_WINDOW], 1446 xa[XA_WM_DELETE_WINDOW],
1037#if ENABLE_EWMH 1447#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING], 1448 xa[XA_NET_WM_PING],
1039#endif 1449#endif
1040 }; 1450 };
1041 1451
1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1452 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1453
1454#if ENABLE_FRILLS
1455 if (rs[Rs_transient_for])
1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1457#endif
1043 1458
1044#if ENABLE_EWMH 1459#if ENABLE_EWMH
1045 long pid = getpid (); 1460 long pid = getpid ();
1046 1461
1047 XChangeProperty (disp, top, 1462 XChangeProperty (dpy, top,
1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1463 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1049 PropModeReplace, (unsigned char *)&pid, 1); 1464 PropModeReplace, (unsigned char *)&pid, 1);
1050 1465
1051 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1466 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1052#endif 1467#endif
1053 1468
1054 XSelectInput (disp, top, 1469 XSelectInput (dpy, top,
1055 KeyPressMask 1470 KeyPressMask
1056#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1471#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1057 | KeyReleaseMask 1472 | KeyReleaseMask
1058#endif 1473#endif
1059 | FocusChangeMask | VisibilityChangeMask 1474 | FocusChangeMask | VisibilityChangeMask
1060 | ExposureMask | StructureNotifyMask); 1475 | ExposureMask | StructureNotifyMask);
1061 1476
1062 termwin_ev.start (display, top); 1477 termwin_ev.start (display, top);
1063 1478
1064#if ENABLE_FRILLS
1065 if (mwmhints.flags)
1066 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1067 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1068#endif
1069
1070 /* vt cursor: Black-on-White is standard, but this is more popular */ 1479 /* vt cursor: Black-on-White is standard, but this is more popular */
1071 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1072
1073#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1074 /* cursor (menuBar/scrollBar): Black-on-White */
1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1076#endif
1077 1481
1078 /* the vt window */ 1482 /* the vt window */
1079 vt = XCreateSimpleWindow (disp, top, 1483 vt = XCreateSimpleWindow (dpy, top,
1080 window_vt_x,
1081 window_vt_y, 1484 window_vt_x, window_vt_y,
1082 TermWin_TotalWidth (), 1485 width, height,
1083 TermWin_TotalHeight (),
1084 0, 1486 0,
1085 pix_colors_focused[Color_fg], 1487 pix_colors_focused[Color_fg],
1086 pix_colors_focused[Color_bg]); 1488 pix_colors_focused[Color_bg]);
1087#ifdef DEBUG_X
1088 XStoreName (disp, vt, "vt window");
1089#endif
1090 1489
1091 attributes.bit_gravity = NorthWestGravity; 1490 attributes.bit_gravity = NorthWestGravity;
1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1491 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1093 1492
1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1493 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1095 1494
1096#ifdef POINTER_BLANK
1097 if (options & Opt_pointerBlank) 1495 if (option (Opt_pointerBlank))
1098 vt_emask |= PointerMotionMask; 1496 vt_emask |= PointerMotionMask;
1099 else 1497 else
1100#endif
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1498 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1499
1103 XSelectInput (disp, vt, vt_emask); 1500 vt_select_input ();
1501
1104 vt_ev.start (display, vt); 1502 vt_ev.start (display, vt);
1105 1503
1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107 if (menuBar_height ())
1108 {
1109 menuBar.win = XCreateSimpleWindow (disp, top,
1110 window_vt_x, 0,
1111 TermWin_TotalWidth (),
1112 menuBar_TotalHeight (),
1113 0,
1114 pix_colors_focused[Color_fg],
1115 pix_colors_focused[Color_scroll]);
1116
1117#ifdef DEBUG_X
1118 XStoreName (disp, menuBar.win, "menubar");
1119#endif
1120
1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1122
1123 XDefineCursor (disp, menuBar.win,
1124 XCreateFontCursor (disp, XC_left_ptr));
1125
1126 XSelectInput (disp, menuBar.win,
1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1128 menubar_ev.start (display, menuBar.win);
1129 }
1130#endif
1131
1132#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! (options & Opt_transparent))
1135 {
1136 const char *p = rs[Rs_backgroundPixmap];
1137
1138 if ((p = strchr (p, ';')) != NULL)
1139 {
1140 p++;
1141 scale_pixmap (p);
1142 }
1143
1144 set_bgPixmap (rs[Rs_backgroundPixmap]);
1145 scr_touch (true);
1146 }
1147#endif
1148
1149 /* graphics context for the vt window */ 1504 /* graphics context for the vt window */
1150 gcvalue.foreground = pix_colors[Color_fg]; 1505 gcvalue.foreground = pix_colors[Color_fg];
1151 gcvalue.background = pix_colors[Color_bg]; 1506 gcvalue.background = pix_colors[Color_bg];
1152 gcvalue.graphics_exposures = 1; 1507 gcvalue.graphics_exposures = 0;
1508
1153 gc = XCreateGC (disp, vt, 1509 gc = XCreateGC (dpy, vt,
1154 GCForeground | GCBackground | GCGraphicsExposures, 1510 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1511 &gcvalue);
1156 1512
1157 drawable = new rxvt_drawable (display, vt); 1513 drawable = new rxvt_drawable (this, vt);
1158
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1160 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1166#endif
1167 1514
1168#ifdef OFF_FOCUS_FADING 1515#ifdef OFF_FOCUS_FADING
1169 // initially we are in unfocused state 1516 // initially we are in unfocused state
1170 if (rs[Rs_fade]) 1517 if (rs[Rs_fade])
1171 pix_colors = pix_colors_unfocused; 1518 pix_colors = pix_colors_unfocused;
1172#endif 1519#endif
1173 1520
1174 pointer_unblank (); 1521 pointer_unblank ();
1175 scr_recolour (); 1522 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1186}
1187
1188/* ------------------------------------------------------------------------- *
1189 * GET TTY CURRENT STATE *
1190 * ------------------------------------------------------------------------- */
1191void
1192rxvt_get_ttymode (ttymode_t *tio, int erase)
1193{
1194#ifdef HAVE_TERMIOS_H
1195 /*
1196 * standard System V termios interface
1197 */
1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1199 {
1200 /* return error - use system defaults */
1201 tio->c_cc[VINTR] = CINTR;
1202 tio->c_cc[VQUIT] = CQUIT;
1203 tio->c_cc[VERASE] = CERASE;
1204 tio->c_cc[VKILL] = CKILL;
1205 tio->c_cc[VSTART] = CSTART;
1206 tio->c_cc[VSTOP] = CSTOP;
1207 tio->c_cc[VSUSP] = CSUSP;
1208# ifdef VDSUSP
1209 tio->c_cc[VDSUSP] = CDSUSP;
1210# endif
1211# ifdef VREPRINT
1212 tio->c_cc[VREPRINT] = CRPRNT;
1213# endif
1214# ifdef VDISCRD
1215 tio->c_cc[VDISCRD] = CFLUSH;
1216# endif
1217# ifdef VWERSE
1218 tio->c_cc[VWERSE] = CWERASE;
1219# endif
1220# ifdef VLNEXT
1221 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif
1223 }
1224
1225 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2
1228 tio->c_cc[VEOL2] = VDISABLE;
1229# endif
1230# ifdef VSWTC
1231 tio->c_cc[VSWTC] = VDISABLE;
1232# endif
1233# ifdef VSWTCH
1234 tio->c_cc[VSWTCH] = VDISABLE;
1235# endif
1236# if VMIN != VEOF
1237 tio->c_cc[VMIN] = 1;
1238# endif
1239# if VTIME != VEOL
1240 tio->c_cc[VTIME] = 0;
1241# endif
1242
1243 if (erase != -1)
1244 tio->c_cc[VERASE] = (char)erase;
1245
1246 /* input modes */
1247 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1248# ifdef IMAXBEL
1249 | IMAXBEL
1250# endif
1251 | IXON);
1252
1253 /* output modes */
1254 tio->c_oflag = (OPOST | ONLCR);
1255
1256 /* control modes */
1257 tio->c_cflag = (CS8 | CREAD);
1258
1259 /* line discipline modes */
1260 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1261# if defined (ECHOCTL) && defined (ECHOKE)
1262 | ECHOCTL | ECHOKE
1263# endif
1264 | ECHOE | ECHOK);
1265# else /* HAVE_TERMIOS_H */
1266
1267 /*
1268 * sgtty interface
1269 */
1270
1271 /* get parameters -- gtty */
1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1273 {
1274 tio->sg.sg_erase = CERASE; /* ^H */
1275 tio->sg.sg_kill = CKILL; /* ^U */
1276 }
1277
1278 if (erase != -1)
1279 tio->sg.sg_erase = (char)erase;
1280
1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1282
1283 /* get special characters */
1284 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1285 {
1286 tio->tc.t_intrc = CINTR; /* ^C */
1287 tio->tc.t_quitc = CQUIT; /* ^\ */
1288 tio->tc.t_startc = CSTART; /* ^Q */
1289 tio->tc.t_stopc = CSTOP; /* ^S */
1290 tio->tc.t_eofc = CEOF; /* ^D */
1291 tio->tc.t_brkc = -1;
1292 }
1293
1294 /* get local special chars */
1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1296 {
1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1299 tio->lc.t_rprntc = CRPRNT; /* ^R */
1300 tio->lc.t_flushc = CFLUSH; /* ^O */
1301 tio->lc.t_werasc = CWERASE; /* ^W */
1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1303 }
1304 /* get line discipline */
1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1306# ifdef NTTYDISC
1307 tio->line = NTTYDISC;
1308# endif /* NTTYDISC */
1309
1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1311#endif /* HAVE_TERMIOS_H */
1312
1313 /*
1314 * Debugging
1315 */
1316#ifdef DEBUG_TTYMODE
1317#ifdef HAVE_TERMIOS_H
1318 /* c_iflag bits */
1319 fprintf (stderr, "Input flags\n");
1320
1321 /* cpp token stringize doesn't work on all machines <sigh> */
1322# define FOO(flag,name) \
1323 if ((tio->c_iflag) & flag) \
1324 fprintf (stderr, "%s ", name)
1325
1326 /* c_iflag bits */
1327 FOO (IGNBRK, "IGNBRK");
1328 FOO (BRKINT, "BRKINT");
1329 FOO (IGNPAR, "IGNPAR");
1330 FOO (PARMRK, "PARMRK");
1331 FOO (INPCK, "INPCK");
1332 FOO (ISTRIP, "ISTRIP");
1333 FOO (INLCR, "INLCR");
1334 FOO (IGNCR, "IGNCR");
1335 FOO (ICRNL, "ICRNL");
1336 FOO (IXON, "IXON");
1337 FOO (IXOFF, "IXOFF");
1338# ifdef IUCLC
1339 FOO (IUCLC, "IUCLC");
1340# endif
1341# ifdef IXANY
1342 FOO (IXANY, "IXANY");
1343# endif
1344# ifdef IMAXBEL
1345 FOO (IMAXBEL, "IMAXBEL");
1346# endif
1347
1348 fprintf (stderr, "\n");
1349
1350# undef FOO
1351# define FOO(entry, name) \
1352 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1353
1354 FOO (VINTR, "VINTR");
1355 FOO (VQUIT, "VQUIT");
1356 FOO (VERASE, "VERASE");
1357 FOO (VKILL, "VKILL");
1358 FOO (VEOF, "VEOF");
1359 FOO (VEOL, "VEOL");
1360# ifdef VEOL2
1361 FOO (VEOL2, "VEOL2");
1362# endif
1363# ifdef VSWTC
1364 FOO (VSWTC, "VSWTC");
1365# endif
1366# ifdef VSWTCH
1367 FOO (VSWTCH, "VSWTCH");
1368# endif
1369 FOO (VSTART, "VSTART");
1370 FOO (VSTOP, "VSTOP");
1371 FOO (VSUSP, "VSUSP");
1372# ifdef VDSUSP
1373 FOO (VDSUSP, "VDSUSP");
1374# endif
1375# ifdef VREPRINT
1376 FOO (VREPRINT, "VREPRINT");
1377# endif
1378# ifdef VDISCRD
1379 FOO (VDISCRD, "VDISCRD");
1380# endif
1381# ifdef VWERSE
1382 FOO (VWERSE, "VWERSE");
1383# endif
1384# ifdef VLNEXT
1385 FOO (VLNEXT, "VLNEXT");
1386# endif
1387
1388 fprintf (stderr, "\n");
1389# undef FOO
1390# endif /* HAVE_TERMIOS_H */
1391#endif /* DEBUG_TTYMODE */
1392} 1523}
1393 1524
1394/*----------------------------------------------------------------------*/ 1525/*----------------------------------------------------------------------*/
1395/* 1526/*
1396 * Run the command in a subprocess and return a file descriptor for the 1527 * Run the command in a subprocess and return a file descriptor for the
… …
1401rxvt_term::run_command (const char *const *argv) 1532rxvt_term::run_command (const char *const *argv)
1402{ 1533{
1403#if ENABLE_FRILLS 1534#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd]) 1535 if (rs[Rs_pty_fd])
1405 { 1536 {
1406 pty.pty = atoi (rs[Rs_pty_fd]); 1537 pty->pty = atoi (rs[Rs_pty_fd]);
1407 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1538
1539 if (pty->pty >= 0)
1540 {
1541 if (getfd_hook)
1542 pty->pty = (*getfd_hook) (pty->pty);
1543
1544 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1545 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1546 }
1408 } 1547 }
1409 else 1548 else
1410#endif 1549#endif
1411 if (!pty.get ()) 1550 if (!pty->get ())
1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1413 1552
1553 struct termios tio = def_tio;
1554
1555#ifndef NO_BACKSPACE_KEY
1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1557 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1558 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1559 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1560#endif
1561
1562 /* init terminal attributes */
1563 cfsetospeed (&tio, BAUDRATE);
1564 cfsetispeed (&tio, BAUDRATE);
1565 tcsetattr (pty->tty, TCSANOW, &tio);
1414 pty.set_utf8_mode (enc_utf8); 1566 pty->set_utf8_mode (enc_utf8);
1415 1567
1416 /* set initial window size */ 1568 /* set initial window size */
1417 tt_winch (); 1569 tt_winch ();
1418
1419 int er;
1420
1421#ifndef NO_BACKSPACE_KEY
1422 if (key_backspace[0] && !key_backspace[1])
1423 er = key_backspace[0];
1424 else if (strcmp (key_backspace, "DEC") == 0)
1425 er = '\177'; /* the initial state anyway */
1426 else
1427#endif
1428 er = -1;
1429
1430 rxvt_get_ttymode (&tio, er);
1431 1570
1432#if ENABLE_FRILLS 1571#if ENABLE_FRILLS
1433 if (rs[Rs_pty_fd]) 1572 if (rs[Rs_pty_fd])
1434 return; 1573 return;
1435#endif 1574#endif
1436 1575
1437#ifndef __QNX__
1438 /* spin off the command interpreter */ 1576 /* spin off the command interpreter */
1439 switch (cmd_pid = fork ()) 1577 switch (cmd_pid = fork ())
1440 { 1578 {
1441 case -1: 1579 case -1:
1442 { 1580 {
… …
1444 rxvt_fatal ("can't fork, aborting.\n"); 1582 rxvt_fatal ("can't fork, aborting.\n");
1445 } 1583 }
1446 case 0: 1584 case 0:
1447 init_env (); 1585 init_env ();
1448 1586
1449 if (!pty.make_controlling_tty ()) 1587 if (!pty->make_controlling_tty ())
1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1588 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1451 else 1589 else
1452 { 1590 {
1453 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1591 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1454 dup2 (pty.tty, STDIN_FILENO); 1592 dup2 (pty->tty, STDIN_FILENO);
1455 dup2 (pty.tty, STDOUT_FILENO); 1593 dup2 (pty->tty, STDOUT_FILENO);
1456 dup2 (pty.tty, STDERR_FILENO); 1594 dup2 (pty->tty, STDERR_FILENO);
1457 1595
1458 // close all our file handles that we do no longer need 1596 // close all our file handles that we do no longer need
1459 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1597 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1460 { 1598 {
1461 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1599 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1462 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1600 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1463 } 1601 }
1464 1602
1465 run_child (argv); 1603 run_child (argv);
1466 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1604 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1467 } 1605 }
1468 1606
1469 _exit (EXIT_FAILURE); 1607 _exit (EXIT_FAILURE);
1470 1608
1471 default: 1609 default:
1472 { 1610 if (!option (Opt_utmpInhibit))
1473#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1611 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1474 int fdstdin;
1475 1612
1476 fdstdin = dup (STDIN_FILENO); 1613 pty->close_tty ();
1477 dup2 (pty.tty, STDIN_FILENO);
1478#endif
1479 1614
1480#ifdef UTMP_SUPPORT 1615 child_ev.start (cmd_pid);
1481 privileged_utmp (SAVE);
1482#endif
1483 1616
1484#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1617 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1485
1486 dup2 (fdstdin, STDIN_FILENO);
1487 close (fdstdin);
1488#endif
1489 }
1490
1491 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1492 break; 1618 break;
1493 } 1619 }
1494#else /* __QNX__ uses qnxspawn () */
1495 fchmod (pty.tty, 0622);
1496 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1497 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1498
1499 if (run_child (argv) == -1)
1500 exit (EXIT_FAILURE);
1501#endif
1502} 1620}
1503 1621
1504/* ------------------------------------------------------------------------- * 1622/* ------------------------------------------------------------------------- *
1505 * CHILD PROCESS OPERATIONS * 1623 * CHILD PROCESS OPERATIONS *
1506 * ------------------------------------------------------------------------- */ 1624 * ------------------------------------------------------------------------- */
… …
1511int 1629int
1512rxvt_term::run_child (const char *const *argv) 1630rxvt_term::run_child (const char *const *argv)
1513{ 1631{
1514 char *login; 1632 char *login;
1515 1633
1516 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1517
1518 if (options & Opt_console) 1634 if (option (Opt_console))
1635 {
1519 { /* be virtual console, fail silently */ 1636 /* be virtual console, fail silently */
1520#ifdef TIOCCONS 1637#ifdef TIOCCONS
1521 unsigned int on = 1; 1638 unsigned int on = 1;
1522 1639
1523 ioctl (STDIN_FILENO, TIOCCONS, &on); 1640 ioctl (STDIN_FILENO, TIOCCONS, &on);
1524#elif defined (SRIOCSREDIR) 1641#elif defined (SRIOCSREDIR)
… …
1526 1643
1527 fd = open (CONSOLE, O_WRONLY, 0); 1644 fd = open (CONSOLE, O_WRONLY, 0);
1528 if (fd >= 0) 1645 if (fd >= 0)
1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1646 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1530 close (fd); 1647 close (fd);
1531#endif /* SRIOCSREDIR */ 1648#endif /* SRIOCSREDIR */
1532 } 1649 }
1533 1650
1534 /* reset signals and spin off the command interpreter */ 1651 /* reset signals and spin off the command interpreter */
1535 signal (SIGINT, SIG_DFL); 1652 signal (SIGINT, SIG_DFL);
1536 signal (SIGQUIT, SIG_DFL); 1653 signal (SIGQUIT, SIG_DFL);
1537 signal (SIGCHLD, SIG_DFL); 1654 signal (SIGCHLD, SIG_DFL);
1538 signal (SIGHUP, SIG_DFL); 1655 signal (SIGHUP, SIG_DFL);
1539 signal (SIGPIPE, SIG_DFL); 1656 signal (SIGPIPE, SIG_DFL);
1540 /* 1657 /*
1541 * mimick login's behavior by disabling the job control signals 1658 * mimic login's behavior by disabling the job control signals
1542 * a shell that wants them can turn them back on 1659 * a shell that wants them can turn them back on
1543 */ 1660 */
1544#ifdef SIGTSTP 1661#ifdef SIGTSTP
1545 signal (SIGTSTP, SIG_IGN); 1662 signal (SIGTSTP, SIG_IGN);
1546 signal (SIGTTIN, SIG_IGN); 1663 signal (SIGTTIN, SIG_IGN);
1547 signal (SIGTTOU, SIG_IGN); 1664 signal (SIGTTOU, SIG_IGN);
1548#endif /* SIGTSTP */ 1665#endif /* SIGTSTP */
1549 1666
1550 // unblock signals (signals are blocked by iom.C
1551 sigset_t ss;
1552 sigemptyset (&ss);
1553 sigprocmask (SIG_SETMASK, &ss, 0);
1554
1555#ifndef __QNX__
1556 /* command interpreter path */ 1667 /* command interpreter path */
1557 if (argv != NULL) 1668 if (argv)
1558 { 1669 {
1559# ifdef DEBUG_CMD 1670# ifdef DEBUG_CMD
1560 int i; 1671 int i;
1561 1672
1562 for (i = 0; argv[i]; i++) 1673 for (i = 0; argv[i]; i++)
… …
1566 execvp (argv[0], (char *const *)argv); 1677 execvp (argv[0], (char *const *)argv);
1567 /* no error message: STDERR is closed! */ 1678 /* no error message: STDERR is closed! */
1568 } 1679 }
1569 else 1680 else
1570 { 1681 {
1571 const char *argv0, *shell; 1682 const char *argv0, *shell;
1572 1683
1573 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1684 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1574 shell = "/bin/sh"; 1685 shell = "/bin/sh";
1575 1686
1576 argv0 = (const char *)rxvt_r_basename (shell); 1687 argv0 = rxvt_basename (shell);
1577 1688
1578 if (options & Opt_loginShell) 1689 if (option (Opt_loginShell))
1579 { 1690 {
1580 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1691 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1581 1692
1582 login[0] = '-'; 1693 login[0] = '-';
1583 strcpy (&login[1], argv0); 1694 strcpy (&login[1], argv0);
1584 argv0 = login; 1695 argv0 = login;
1585 } 1696 }
1697
1586 execlp (shell, argv0, NULL); 1698 execlp (shell, argv0, (char *)0);
1587 /* no error message: STDERR is closed! */ 1699 /* no error message: STDERR is closed! */
1588 } 1700 }
1589
1590#else /* __QNX__ uses qnxspawn () */
1591
1592 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1593 char *command = NULL, fullcommand[_MAX_PATH];
1594 char **arg_v, *arg_a[2] = { NULL, NULL };
1595
1596 if (argv != NULL)
1597 {
1598 if (access (argv[0], X_OK) == -1)
1599 {
1600 if (strchr (argv[0], '/') == NULL)
1601 {
1602 searchenv (argv[0], "PATH", fullcommand);
1603
1604 if (fullcommand[0] != '\0')
1605 command = fullcommand;
1606 }
1607
1608 if (access (command, X_OK) == -1)
1609 return -1;
1610 }
1611 else
1612 command = argv[0];
1613
1614 arg_v = argv;
1615 }
1616 else
1617 {
1618 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1619 command = "/bin/sh";
1620
1621 arg_a[0] = my_basename (command);
1622
1623 if (options & Opt_loginShell)
1624 {
1625 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1626
1627 login[0] = '-';
1628 strcpy (&login[1], arg_a[0]);
1629 arg_a[0] = login;
1630 }
1631
1632 arg_v = arg_a;
1633 }
1634
1635 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1636 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1637 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1638 command, arg_v, environ, iov_a, 0);
1639 if (login)
1640 free (login);
1641
1642 pty.close_tty ();
1643 return pty.pty;
1644#endif
1645 1701
1646 return -1; 1702 return -1;
1647} 1703}
1648 1704
1649/*----------------------- end-of-file (C source) -----------------------*/ 1705/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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