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.105 by root, Mon Jan 17 00:59:23 2005 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"
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
524#if OFF_FOCUS_FADING
525 "rgb:00/00/00",
526#endif
174 }; 527 };
175 528
176const char *const xa_names[] = 529void
177 {
178 "TEXT",
179 "COMPOUND_TEXT",
180 "UTF8_STRING",
181 "MULTIPLE",
182 "TARGETS",
183 "TIMESTAMP",
184 "VT_SELECTION",
185 "INCR",
186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
197#ifdef TRANSPARENT
198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
200#endif
201#ifdef OFFIX_DND
202 "DndProtocol",
203 "DndSelection",
204#endif
205 };
206
207bool
208rxvt_term::init_vars () 530rxvt_term::init_vars ()
209{ 531{
210 sw_term.start (SIGTERM);
211
212 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
213#ifdef OFF_FOCUS_FADING
214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
215#endif
216 pix_colors = pix_colors_focused; 532 pix_colors = pix_colors_focused;
217
218 if (pix_colors == NULL)
219 return false;
220
221#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
222 TermWin.pixmap = None;
223#endif
224 533
225 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
226 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
227 options = DEFAULT_OPTIONS;
228 want_refresh = 1; 536 want_refresh = 1;
229 cmd_pid = -1;
230 pty.pty = pty.tty = -1;
231 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
232 TermWin.focus = 0;
233 TermWin.ncol = 80; 538 ncol = 80;
234 TermWin.nrow = 24; 539 nrow = 24;
235 TermWin.int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
236 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
237 TermWin.lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
238 TermWin.saveLines = SAVELINES; 544 saveLines = SAVELINES;
239 numpix_colors = TOTAL_COLORS;
240 545
241 refresh_limit = 1;
242 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
243 prev_nrow = prev_ncol = 0;
244 547
245 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
246#ifdef XPM_BACKGROUND
247 /* bgPixmap.w = bgPixmap.h = 0; */
248 bgPixmap.x = bgPixmap.y = 50;
249 bgPixmap.pixmap = None;
250#endif
251 549
252 last_bot = last_state = -1; 550 set_option (Opt_scrollBar);
253 551 set_option (Opt_scrollTtyOutput);
254#ifdef MENUBAR 552 set_option (Opt_jumpScroll);
255 menu_readonly = 1; 553 set_option (Opt_skipScroll);
256# if ! (MENUBAR_MAX > 1) 554 set_option (Opt_secondaryScreen);
257 CurrentBar = & (BarList); 555 set_option (Opt_secondaryScroll);
258# endif /* (MENUBAR_MAX > 1) */ 556 set_option (Opt_pastableTabs);
259#endif 557 set_option (Opt_intensityStyles);
260 558 set_option (Opt_iso14755);
261 return true; 559 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered);
262} 561}
263 562
264void 563static void
265rxvt_term::init_secondary () 564init_secondary ()
266{ 565{
267 int i; 566 int i;
268 567
269 /*
270 * Close all unused file descriptors
271 * We don't want them, we don't need them.
272 */
273 if ((i = open ("/dev/null", O_RDONLY)) < 0) 568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
274 { 569 {
275 /* TODO: BOO HISS */
276 dup2 (STDERR_FILENO, STDIN_FILENO); 570 dup2 (STDERR_FILENO, STDIN_FILENO);
277 } 571 }
278 else if (i > STDIN_FILENO) 572 else if (i != STDIN_FILENO)
279 { 573 {
280 dup2 (i, STDIN_FILENO); 574 dup2 (i, STDIN_FILENO);
281 close (i); 575 close (i);
282 } 576 }
283 577
284 dup2 (STDERR_FILENO, STDOUT_FILENO); 578 dup2 (STDERR_FILENO, STDOUT_FILENO);
285
286#if 0 // schmorp sayz closing filies is murder
287 for (i = STDERR_FILENO + 1; i < num_fds; i++)
288 {
289#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
290 if (i == 4 || i == 7)
291 continue;
292#endif
293 close (i);
294 }
295#endif
296} 579}
297 580
298/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
299const char ** 582const char **
300rxvt_term::init_resources (int argc, const char *const *argv) 583rxvt_term::init_resources (int argc, const char *const *argv)
301{ 584{
302 int i, r_argc; 585 int i, r_argc;
303 char *val;
304 const char **cmd_argv, **r_argv; 586 const char **cmd_argv, **r_argv;
305 587
306 /* 588 /*
307 * 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
308 */ 590 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 591 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 592 if (!strcmp (argv[r_argc], "-e"))
311 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 }
312 608
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 610
315 for (i = 0; i < r_argc; i++) 611 for (i = 0; i < r_argc; i++)
316 r_argv[i] = (const char *)argv[i]; 612 r_argv[i] = (const char *)argv[i];
317 613
318 r_argv[i] = NULL; 614 r_argv[i] = NULL;
319 615
320 if (r_argc == argc)
321 cmd_argv = NULL;
322 else
323 {
324 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
325
326 for (i = 0; i < argc - r_argc - 1; i++)
327 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
328
329 cmd_argv[i] = NULL;
330 }
331
332 rs[Rs_name] = rxvt_r_basename (argv[0]); 616 rs[Rs_name] = rxvt_basename (argv[0]);
333 617
334 /* 618 /*
335 * Open display, get options/resources and create the window 619 * Open display, get options/resources and create the window
336 */ 620 */
621
337 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338 rs[Rs_display_name] = ":0"; 623 rs[Rs_display_name] = ":0";
339 624
340 get_options (r_argc, r_argv); 625 get_options (r_argc, r_argv);
626
627 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
632
633 // using a local pointer decreases code size a lot
634 xa = display->xa;
635
636 set (display);
637 extract_resources ();
638
639#if XFT
640 if (rs[Rs_depth])
641 select_visual (strtol (rs[Rs_depth], 0, 0));
642#endif
643
341 free (r_argv); 644 free (r_argv);
342 645
343#ifdef LOCAL_X_IS_UNIX 646 for (int i = NUM_RESOURCES; i--; )
344 if (rs[Rs_display_name][0] == ':') 647 if (rs [i] == resval_undef)
345 { 648 rs [i] = 0;
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 649
347 strcpy (val, "unix"); 650#ifdef HAVE_AFTERIMAGE
348 strcat (val, rs[Rs_display_name]); 651 set_application_name ((char *)rs[Rs_name]);
349 display = displays.get (val); 652 set_output_threshold (OUTPUT_LEVEL_WARNING);
350 free (val); 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]))
351 } 662 {
663 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 }
352#endif 666#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357
358 extract_resources (display->display, rs[Rs_name]);
359 667
360 /* 668 /*
361 * set any defaults not already set 669 * set any defaults not already set
362 */ 670 */
363 if (cmd_argv && cmd_argv[0]) 671 if (cmd_argv && cmd_argv[0])
364 { 672 {
365 if (!rs[Rs_title]) 673 if (!rs[Rs_title])
366 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 674 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
675
367 if (!rs[Rs_iconName]) 676 if (!rs[Rs_iconName])
368 rs[Rs_iconName] = rs[Rs_title]; 677 rs[Rs_iconName] = rs[Rs_title];
369 } 678 }
370 else 679 else
371 { 680 {
372 if (!rs[Rs_title]) 681 if (!rs[Rs_title])
373 rs[Rs_title] = rs[Rs_name]; 682 rs[Rs_title] = rs[Rs_name];
683
374 if (!rs[Rs_iconName]) 684 if (!rs[Rs_iconName])
375 rs[Rs_iconName] = rs[Rs_name]; 685 rs[Rs_iconName] = rs[Rs_name];
376 } 686 }
377 687
378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 688 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
379 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 689 saveLines = min (i, MAX_SAVELINES);
380 690
381#if ENABLE_FRILLS 691#if ENABLE_FRILLS
382 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 692 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 693 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
694
384 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)
385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 696 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
697
386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 698 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 699 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
700
701 if (rs[Rs_letterSpace])
702 letterSpace = atoi (rs[Rs_letterSpace]);
388#endif 703#endif
389 704
390#ifdef POINTER_BLANK 705#ifdef POINTER_BLANK
391 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
392 pointerBlankDelay = i; 707 pointerBlankDelay = i;
393 else 708 else
394 pointerBlankDelay = 2; 709 pointerBlankDelay = 2;
395#endif 710#endif
396 711
397 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
398 if (!TermWin.saveLines) 713 if (!saveLines)
399 options &= ~Opt_scrollBar; 714 set_option (Opt_scrollBar, 0);
400
401#ifdef PRINTPIPE
402 if (!rs[Rs_print_pipe])
403 rs[Rs_print_pipe] = PRINTPIPE;
404#endif
405 715
406 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
407 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
408 718
409#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
410 if (!rs[Rs_backspace_key]) 720 if (!rs[Rs_backspace_key])
411# ifdef DEFAULT_BACKSPACE 721# ifdef DEFAULT_BACKSPACE
412 key_backspace = DEFAULT_BACKSPACE; 722 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
413# else 723# else
414 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 724 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
415# endif 725# endif
416 else
417 {
418 val = strdup (rs[Rs_backspace_key]);
419 rxvt_Str_trim (val);
420 rxvt_Str_escaped (val);
421 key_backspace = val;
422 }
423#endif 726#endif
424 727
425#ifndef NO_DELETE_KEY 728#ifndef NO_DELETE_KEY
426 if (!rs[Rs_delete_key]) 729 if (!rs[Rs_delete_key])
427# ifdef DEFAULT_DELETE 730# ifdef DEFAULT_DELETE
428 key_delete = DEFAULT_DELETE; 731 rs[Rs_delete_key] = DEFAULT_DELETE;
429# else 732# else
430 key_delete = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
431# endif
432 else
433 {
434 val = strdup (rs[Rs_delete_key]);
435 rxvt_Str_trim (val);
436 rxvt_Str_escaped (val);
437 key_delete = val;
438 }
439#endif 734# endif
440 if (rs[Rs_answerbackstring])
441 {
442 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
443 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
444 }
445
446#ifdef HAVE_SCROLLBARS
447 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
448#endif 735#endif
736
737 scrollBar.setup (this);
449 738
450#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
451 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
452 if (options & Opt_reverseVideo) 741 if (option (Opt_reverseVideo))
453 { 742 {
454 if (!rs[Rs_color + Color_fg]) 743 if (!rs[Rs_color + Color_fg])
455 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 744 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
745
456 if (!rs[Rs_color + Color_bg]) 746 if (!rs[Rs_color + Color_bg])
457 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 747 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
458 } 748 }
459#endif 749#endif
460 750
… …
462 if (!rs[Rs_color + i]) 752 if (!rs[Rs_color + i])
463 rs[Rs_color + i] = def_colorName[i]; 753 rs[Rs_color + i] = def_colorName[i];
464 754
465#ifndef XTERM_REVERSE_VIDEO 755#ifndef XTERM_REVERSE_VIDEO
466 /* this is how we implement reverseVideo */ 756 /* this is how we implement reverseVideo */
467 if (options & Opt_reverseVideo) 757 if (option (Opt_reverseVideo))
468 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 758 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
469#endif 759#endif
470 760
471 /* convenient aliases for setting fg/bg to colors */ 761 /* convenient aliases for setting fg/bg to colors */
472 color_aliases (Color_fg); 762 color_aliases (Color_fg);
473 color_aliases (Color_bg); 763 color_aliases (Color_bg);
474#ifndef NO_CURSORCOLOR 764#ifndef NO_CURSORCOLOR
475 color_aliases (Color_cursor); 765 color_aliases (Color_cursor);
476 color_aliases (Color_cursor2); 766 color_aliases (Color_cursor2);
477#endif /* NO_CURSORCOLOR */ 767#endif /* NO_CURSORCOLOR */
478 color_aliases (Color_pointer_fg); 768 color_aliases (Color_pointer_fg);
479 color_aliases (Color_pointer_bg); 769 color_aliases (Color_pointer_bg);
480 color_aliases (Color_border); 770 color_aliases (Color_border);
481#ifndef NO_BOLD_UNDERLINE_REVERSE 771#ifndef NO_BOLD_UNDERLINE_REVERSE
482 color_aliases (Color_BD); 772 color_aliases (Color_BD);
483 color_aliases (Color_UL); 773 color_aliases (Color_UL);
484 color_aliases (Color_RV); 774 color_aliases (Color_RV);
485#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 775#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
486 776
487 if (!rs[Rs_color + Color_border]) 777 if (!rs[Rs_color + Color_border])
488 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 778 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
489 779
490 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 ();
491} 906}
492 907
493/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
494void 909void
495rxvt_term::init_env () 910rxvt_term::init_env ()
496{ 911{
497 int i; 912 int i;
498 unsigned int u;
499 char *val; 913 char *val;
500 914
501#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
502 /* Fixup display_name for export over pty to any interested terminal 916 /* Fixup display_name for export over pty to any interested terminal
503 * 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
… …
511 */ 925 */
512 val = rxvt_network_display (rs[Rs_display_name]); 926 val = rxvt_network_display (rs[Rs_display_name]);
513 rs[Rs_display_name] = (const char *)val; 927 rs[Rs_display_name] = (const char *)val;
514 928
515 if (val == NULL) 929 if (val == NULL)
516#endif /* DISPLAY_IS_IP */ 930#endif /* DISPLAY_IS_IP */
517 val = XDisplayString (display->display); 931 val = XDisplayString (dpy);
518 932
519 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
520 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
521 935
522 i = strlen (val); 936 i = strlen (val);
523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 937 env_display = (char *)rxvt_malloc (i + 9);
524 938
525 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
526 940
527 /* avoiding the math library: 941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
528 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
529 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
530 ;
531 MAX_IT (i, 1);
532 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
533
534 sprintf (env_windowid, "WINDOWID=%u",
535 (unsigned int)TermWin.parent[0]);
536 942
537 /* add entries to the environment: 943 /* add entries to the environment:
538 * @ DISPLAY: in case we started with -display 944 * @ DISPLAY: in case we started with -display
539 * @ WINDOWID: X window id number of the window 945 * @ WINDOWID: X window id number of the window
540 * @ COLORTERM: terminal sub-name and also indicates its color 946 * @ COLORTERM: terminal sub-name and also indicates its color
… …
542 * @ TERMINFO: path to terminfo directory 948 * @ TERMINFO: path to terminfo directory
543 * @ COLORFGBG: fg;bg color codes 949 * @ COLORFGBG: fg;bg color codes
544 */ 950 */
545 putenv (env_display); 951 putenv (env_display);
546 putenv (env_windowid); 952 putenv (env_windowid);
953
547 if (env_colorfgbg) 954 if (env_colorfgbg)
548 putenv (env_colorfgbg); 955 putenv (env_colorfgbg);
549 956
550#ifdef RXVT_TERMINFO 957#ifdef RXVT_TERMINFO
551 putenv ("TERMINFO=" RXVT_TERMINFO); 958 putenv ("TERMINFO=" RXVT_TERMINFO);
552#endif 959#endif
553 960
554 if (display->depth <= 2) 961 if (depth <= 2)
555 putenv ("COLORTERM=" COLORTERMENV "-mono"); 962 putenv ("COLORTERM=" COLORTERMENV "-mono");
556 else 963 else
557 putenv ("COLORTERM=" COLORTERMENVFULL); 964 putenv ("COLORTERM=" COLORTERMENVFULL);
558 965
559 if (rs[Rs_term_name] != NULL) 966 if (rs[Rs_term_name] != NULL)
560 { 967 {
561 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);
562 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 969 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
563 putenv (env_term); 970 putenv (env_term);
564 } 971 }
565 else 972 else
566 putenv ("TERM=" TERMENV); 973 putenv ("TERM=" TERMENV);
… …
568#ifdef HAVE_UNSETENV 975#ifdef HAVE_UNSETENV
569 /* avoid passing old settings and confusing term size */ 976 /* avoid passing old settings and confusing term size */
570 unsetenv ("LINES"); 977 unsetenv ("LINES");
571 unsetenv ("COLUMNS"); 978 unsetenv ("COLUMNS");
572 unsetenv ("TERMCAP"); /* terminfo should be okay */ 979 unsetenv ("TERMCAP"); /* terminfo should be okay */
573#endif /* HAVE_UNSETENV */ 980#endif /* HAVE_UNSETENV */
574} 981}
575 982
576/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
577/* 984/*
578 * This is more or less stolen straight from XFree86 xterm. 985 * This is more or less stolen straight from XFree86 xterm.
579 * This should support all European type languages. 986 * This should support all European type languages.
580 */ 987 */
581void 988void
582rxvt_term::set_locale (const char *locale) 989rxvt_term::set_locale (const char *locale)
583{ 990{
991 set_environ (envv);
992
584#if HAVE_XSETLOCALE || HAVE_SETLOCALE 993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
585 free (this->locale); 994 free (this->locale);
586 this->locale = setlocale (LC_CTYPE, locale); 995 this->locale = setlocale (LC_CTYPE, locale);
587 996
588 if (!this->locale) 997 if (!this->locale)
589 { 998 {
590 if (*locale) 999 if (*locale)
591 { 1000 {
592 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);
593 setlocale (LC_CTYPE, ""); 1002 setlocale (LC_CTYPE, "C");
594 } 1003 }
595 else 1004 else
596 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");
597 1006
598 this->locale = ""; 1007 this->locale = "C";
599 } 1008 }
600 1009
601 1010
602 this->locale = rxvt_strdup (this->locale); 1011 this->locale = strdup (this->locale);
603 SET_LOCALE (this->locale); 1012 SET_LOCALE (this->locale);
604 mbstate.reset (); 1013 mbstate.reset ();
605#endif 1014#endif
606 1015
607#if HAVE_NL_LANGINFO 1016#if HAVE_NL_LANGINFO
… …
618} 1027}
619 1028
620void 1029void
621rxvt_term::init_xlocale () 1030rxvt_term::init_xlocale ()
622{ 1031{
1032 set_environ (envv);
1033
623#ifdef USE_XIM 1034#ifdef USE_XIM
624 if (!locale) 1035 if (!locale)
625 rxvt_warn ("setting locale failed, working without locale support.\n"); 1036 rxvt_warn ("setting locale failed, working without locale support.\n");
626 else 1037 else
627 { 1038 {
… …
649 * Initialize the command connection. 1060 * Initialize the command connection.
650 * This should be called after the X server connection is established. 1061 * This should be called after the X server connection is established.
651 */ 1062 */
652 1063
653#ifdef META8_OPTION 1064#ifdef META8_OPTION
654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 1065 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
655#endif 1066#endif
656 1067
657 get_ourmods (); 1068 get_ourmods ();
658 1069
659 if (!(options & Opt_scrollTtyOutput)) 1070 if (!option (Opt_scrollTtyOutput))
660 priv_modes |= PrivMode_TtyOutputInh; 1071 priv_modes |= PrivMode_TtyOutputInh;
661 if (options & Opt_scrollTtyKeypress) 1072 if (option (Opt_scrollTtyKeypress))
662 priv_modes |= PrivMode_Keypress; 1073 priv_modes |= PrivMode_Keypress;
663 if (!(options & Opt_jumpScroll)) 1074 if (!option (Opt_jumpScroll))
664 priv_modes |= PrivMode_smoothScroll; 1075 priv_modes |= PrivMode_smoothScroll;
665 1076
666#ifndef NO_BACKSPACE_KEY 1077#ifndef NO_BACKSPACE_KEY
667 if (strcmp (key_backspace, "DEC") == 0) 1078 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
668 priv_modes |= PrivMode_HaveBackSpace; 1079 priv_modes |= PrivMode_HaveBackSpace;
669#endif 1080#endif
670 1081
671 /* add value for scrollBar */ 1082 /* add value for scrollBar */
672 if (scrollbar_visible ()) 1083 if (scrollBar.state)
673 { 1084 {
674 priv_modes |= PrivMode_scrollBar; 1085 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 1086 SavedModes |= PrivMode_scrollBar;
676 } 1087 }
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 1088
688 run_command (argv); 1089 run_command (argv);
689} 1090}
690 1091
691/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
692void 1093void
693rxvt_term::Get_Colours () 1094rxvt_term::get_colours ()
694{ 1095{
695 int i; 1096 int i;
696 1097
697#ifdef OFF_FOCUS_FADING 1098#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 1099 pix_colors = pix_colors_focused;
699#endif 1100#endif
700 1101
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 1103 {
1104 const char *name = rs[Rs_color + i];
1105
1106 if (!name)
1107 continue;
1108
703 rxvt_color xcol; 1109 rxvt_color xcol;
704 1110
705 if (!rs[Rs_color + i]) 1111 if (!set_color (xcol, name))
706 continue;
707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 1112 {
710#ifndef XTERM_REVERSE_VIDEO 1113#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 1114 if (i < 2 && option (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 1115 name = def_colorName [1 - i];
713 else 1116 else
714#endif 1117#endif
715 rs[Rs_color + i] = def_colorName[i]; 1118 name = def_colorName [i];
716 1119
717 if (!rs[Rs_color + i]) 1120 if (!name)
718 continue; 1121 continue;
719 1122
720 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1123 if (!set_color (xcol, name))
721 { 1124 {
722 switch (i) 1125 switch (i)
723 { 1126 {
724 case Color_fg: 1127 case Color_fg:
725 case Color_bg: 1128 case Color_bg:
726 /* fatal: need bg/fg color */
727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 1129 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
728 /* NOTREACHED */ 1130 name = "";
729 break; 1131 break;
730#ifndef NO_CURSORCOLOR 1132#ifndef NO_CURSORCOLOR
731 case Color_cursor2: 1133 case Color_cursor2:
732 xcol = pix_colors[Color_fg]; 1134#endif
733 break;
734#endif /* ! NO_CURSORCOLOR */
735 case Color_pointer_fg: 1135 case Color_pointer_fg:
736 xcol = pix_colors[Color_fg]; 1136 name = rs[Rs_color + Color_fg];
1137 xcol.set (this, name);
737 break; 1138 break;
738 default: 1139 default:
739 xcol = pix_colors[Color_bg]; /* None */ 1140 name = rs[Rs_color + Color_bg];
1141 xcol.set (this, name);
740 break; 1142 break;
741 } 1143 }
742 } 1144 }
743 } 1145 }
744 1146
745 pix_colors[i] = xcol; 1147 pix_colors[i] = xcol;
746#ifdef OFF_FOCUS_FADING 1148 rs[Rs_color + i] = name;
747 if (rs[Rs_fade])
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
749#endif
750 SET_PIXCOLOR (i);
751 }
752
753 if (display->depth <= 2)
754 { 1149 }
1150
1151 if (depth <= 2)
1152 {
755 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);
756 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);
757 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);
758 } 1156 }
759 1157
760 /* 1158 /*
761 * get scrollBar/menuBar shadow colors 1159 * get scrollBar shadow colors
762 * 1160 *
763 * The calculations of topShadow/bottomShadow values are adapted 1161 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 1162 * from the fvwm window manager.
765 */ 1163 */
766#ifdef KEEP_SCROLLCOLOR 1164#ifdef RXVT_SCROLLBAR
767
768 if (display->depth <= 2) 1165 if (depth <= 2)
1166 {
769 { /* Monochrome */ 1167 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1168 alias_color (Color_scroll, Color_fg);
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1169 alias_color (Color_topShadow, Color_bg);
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1170 alias_color (Color_bottomShadow, Color_bg);
773 } 1171 }
774 else 1172 else
775 { 1173 {
776 rxvt_color xcol[2]; 1174 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
777 /* xcol[0] == white
778 * xcol[1] == top shadow
779 * xcol[2] == bot shadow */
780 1175
781 xcol[1] = pix_colors[Color_scroll]; 1176 rgba cscroll;
782 xcol[0].set (display, 65535, 65535, 65535); 1177 pix_colors [Color_scroll].get (cscroll);
783
784 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
785
786 xcol[0].get (display, pr0, pg0, pb0);
787 xcol[1].get (display, pr1, pg1, pb1);
788
789 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
790 1178
791 /* topShadowColor */ 1179 /* topShadowColor */
792 if (!xcol[1].set (display, 1180 if (!pix_colors[Color_topShadow].set (this,
793 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1181 rgba (
794 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1182 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
795 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1183 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
796 xcol[1] = pix_colors[Color_White]; 1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
797 1185 cscroll.a)
798 pix_colors[Color_topShadow] = xcol[1]; 1186 ))
1187 alias_color (Color_topShadow, Color_White);
799 } 1188 }
800#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
801} 1195}
802 1196
803/*----------------------------------------------------------------------*/ 1197/*----------------------------------------------------------------------*/
804/* color aliases, fg/bg bright-bold */ 1198/* color aliases, fg/bg bright-bold */
805void 1199void
… …
808 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
809 { 1203 {
810 int i = atoi (rs[Rs_color + idx]); 1204 int i = atoi (rs[Rs_color + idx]);
811 1205
812 if (i >= 8 && i <= 15) 1206 if (i >= 8 && i <= 15)
813 { /* bright colors */ 1207 /* bright colors */
814 i -= 8;
815#ifndef NO_BRIGHTCOLOR
816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1208 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
817 return; 1209 else if (i >= 0 && i <= 7)
818#endif 1210 /* normal colors */
819 }
820
821 if (i >= 0 && i <= 7) /* normal colors */
822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1211 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823 } 1212 }
824} 1213}
825 1214
826/*----------------------------------------------------------------------*/ 1215/*----------------------------------------------------------------------*/
… …
829 * Use resource ``modifier'' to override the Meta modifier 1218 * Use resource ``modifier'' to override the Meta modifier
830 */ 1219 */
831void 1220void
832rxvt_term::get_ourmods () 1221rxvt_term::get_ourmods ()
833{ 1222{
834 int i, j, k; 1223 int i, j, k;
835 int requestedmeta, realmeta, realalt; 1224 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 1225 const char *cm, *rsmod;
837 XModifierKeymap *map; 1226 XModifierKeymap *map;
838 KeyCode *kc; 1227 KeyCode *kc;
839 const unsigned int modmasks[] = 1228 const unsigned int modmasks[] =
840 { 1229 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1230 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 1231 };
843 1232
… …
846 1235
847 if (rsmod 1236 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1237 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 1238 requestedmeta = rsmod[3] - '0';
850 1239
851 map = XGetModifierMapping (display->display); 1240 map = XGetModifierMapping (dpy);
852 kc = map->modifiermap; 1241 kc = map->modifiermap;
853 1242
854 for (i = 1; i < 6; i++) 1243 for (i = 1; i < 6; i++)
855 { 1244 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1245 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 1247 for (j = map->max_keypermod; j--; k++)
859 { 1248 {
860 if (kc[k] == 0) 1249 if (kc[k] == 0)
861 break; 1250 break;
862 1251
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1252 switch (XKeycodeToKeysym (dpy, kc[k], 0))
864 { 1253 {
865 case XK_Num_Lock: 1254 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 1255 ModNumLockMask = modmasks[i - 1];
867 continue; 1256 continue;
868 1257
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 1307rxvt_term::create_windows (int argc, const char *const *argv)
919{ 1308{
920 XClassHint classHint; 1309 XClassHint classHint;
921 XWMHints wmHint; 1310 XWMHints wmHint;
922#if ENABLE_FRILLS 1311#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 1312 MWMHints mwmhints = { };
925#endif 1313#endif
926 XGCValues gcvalue; 1314 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 1315 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 1316 Window top, parent;
930 1317
931#ifdef USING_W11LIB 1318 dLocal (Display *, dpy);
932 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934#endif
935 1319
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1320 /* grab colors before netscape does */
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 1321 get_colours ();
938 1322
939 if (options & Opt_transparent) 1323 if (!set_fonts ())
940 { 1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1325
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1326 parent = display->root;
943 } 1327
1328 attributes.override_redirect = !!option (Opt_override_redirect);
944 1329
945#if ENABLE_FRILLS 1330#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 1331 if (option (Opt_borderLess))
947 { 1332 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 1333 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
949
950 if (prop == None)
951 { 1334 {
952 /* 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");
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE; 1336 attributes.override_redirect = true;
955#endif
956 mwmhints.flags = 0;
957 } 1337 }
958 else 1338 else
959 { 1339 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 1340 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0;
962 } 1341 }
963 } 1342 }
964 else 1343#endif
965 { 1344
966 mwmhints.flags = 0; 1345#if ENABLE_XEMBED
1346 if (rs[Rs_embed])
967 } 1347 {
968#endif 1348 XWindowAttributes wattr;
969 1349
970 /* grab colors before netscape does */ 1350 parent = strtol (rs[Rs_embed], 0, 0);
971 Get_Colours ();
972 1351
973 if (!set_fonts ()) 1352 if (!XGetWindowAttributes (dpy, parent, &wattr))
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1353 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
1354
1355 window_calc (wattr.width, wattr.height);
1356 }
1357#endif
975 1358
976 window_calc (0, 0); 1359 window_calc (0, 0);
1360
1361 /* sub-window placement & size in rxvt_resize_subwindows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap;
1365
1366 top = XCreateWindow (dpy, parent,
1367 szHint.x, szHint.y,
1368 szHint.width, szHint.height,
1369 ext_bwidth,
1370 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes);
1373
1374 this->parent[0] = top;
1375
977 old_width = szHint.width; 1376 old_width = szHint.width;
978 old_height = szHint.height; 1377 old_height = szHint.height;
979 1378
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 1379 set_title (rs [Rs_title]);
1380 set_icon_name (rs [Rs_iconName]);
981 1381
982#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
987 szHint.x, szHint.y,
988 szHint.width, szHint.height,
989 TermWin.ext_bwidth,
990 display->depth, InputOutput,
991 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
993#else
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
995 szHint.x, szHint.y,
996 szHint.width, szHint.height,
997 TermWin.ext_bwidth,
998 pix_colors_focused[Color_border],
999 pix_colors_focused[Color_border]);
1000#endif
1001
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004
1005 classHint.res_name = (char *)rs[Rs_name]; 1382 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 1383 classHint.res_class = (char *)RESCLASS;
1007 1384
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1385 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 1386 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 1388 wmHint.window_group = top;
1012 1389
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &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 */
1015 1398
1016 /* Enable delete window protocol */ 1399 if (rs [Rs_iconfile])
1017 XSetWMProtocols (display->display, TermWin.parent[0], 1400 {
1018 &xa[XA_WMDELETEWINDOW], 1); 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
1019 1442
1020#if ENABLE_FRILLS 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
1448
1449 Atom protocols[] = {
1450 xa[XA_WM_DELETE_WINDOW],
1451#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING],
1453#endif
1454 };
1455
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
1462
1463#if ENABLE_EWMH
1021 long pid = getpid (); 1464 long pid = getpid ();
1022 1465
1023 XChangeProperty (display->display, TermWin.parent[0], 1466 XChangeProperty (dpy, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1467 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 1468 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 1469
1028 XSelectInput (display->display, TermWin.parent[0], 1470 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1471#endif
1472
1473 XSelectInput (dpy, top,
1029 KeyPressMask 1474 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1475#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1476 | KeyReleaseMask
1032#endif 1477#endif
1033 | FocusChangeMask | VisibilityChangeMask 1478 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1479 | ExposureMask | StructureNotifyMask);
1480
1036 termwin_ev.start (display, TermWin.parent[0]); 1481 termwin_ev.start (display, top);
1037
1038#if ENABLE_FRILLS
1039 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif
1043 1482
1044 /* 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 */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1046
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1048 /* cursor (menuBar/scrollBar): Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1050#endif
1051 1485
1052 /* the vt window */ 1486 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1487 vt = XCreateSimpleWindow (dpy, top,
1054 window_vt_x,
1055 window_vt_y, 1488 window_vt_x, window_vt_y,
1056 TermWin_TotalWidth (), 1489 width, height,
1057 TermWin_TotalHeight (),
1058 0, 1490 0,
1059 pix_colors_focused[Color_fg], 1491 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1492 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window");
1063#endif
1064 1493
1065 attributes.bit_gravity = NorthWestGravity; 1494 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1495 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1067 1496
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1497 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069 1498
1070 pointer_unblank ();
1071
1072#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank) 1499 if (option (Opt_pointerBlank))
1074 vt_emask |= PointerMotionMask; 1500 vt_emask |= PointerMotionMask;
1075 else 1501 else
1076#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1502 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1503
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1504 vt_select_input ();
1505
1080 vt_ev.start (display, TermWin.vt); 1506 vt_ev.start (display, vt);
1081
1082#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083 if (menuBar_height ())
1084 {
1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1086 window_vt_x, 0,
1087 TermWin_TotalWidth (),
1088 menuBar_TotalHeight (),
1089 0,
1090 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_scroll]);
1092
1093#ifdef DEBUG_X
1094 XStoreName (display->display, menuBar.win, "menubar");
1095#endif
1096
1097 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098
1099 XDefineCursor (display->display, menuBar.win,
1100 XCreateFontCursor (display->display, XC_left_ptr));
1101
1102 XSelectInput (display->display, menuBar.win,
1103 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1104 | Button1MotionMask));
1105 menubar_ev.start (display, menuBar.win);
1106 }
1107#endif
1108
1109#ifdef XPM_BACKGROUND
1110 if (rs[Rs_backgroundPixmap] != NULL
1111 && ! (options & Opt_transparent))
1112 {
1113 const char *p = rs[Rs_backgroundPixmap];
1114
1115 if ((p = strchr (p, ';')) != NULL)
1116 {
1117 p++;
1118 scale_pixmap (p);
1119 }
1120
1121 set_bgPixmap (rs[Rs_backgroundPixmap]);
1122 scr_touch (true);
1123 }
1124#endif
1125 1507
1126 /* graphics context for the vt window */ 1508 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1509 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1510 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1511 gcvalue.graphics_exposures = 0;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1512
1513 gc = XCreateGC (dpy, vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1514 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1515 &gcvalue);
1133 1516
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1517 drawable = new rxvt_drawable (this, vt);
1135
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1137 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1143#endif
1144 1518
1145#ifdef OFF_FOCUS_FADING 1519#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1520 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1521 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1522 pix_colors = pix_colors_unfocused;
1149#endif 1523#endif
1150 1524
1525 pointer_unblank ();
1151 scr_recolour (); 1526 scr_recolour ();
1152} 1527}
1153 1528
1154/* ------------------------------------------------------------------------- * 1529/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1530 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1531 * ------------------------------------------------------------------------- */
1157void 1532void
1158rxvt_get_ttymode (ttymode_t *tio, int erase) 1533rxvt_get_ttymode (struct termios *tio, int erase)
1159{ 1534{
1160#ifdef HAVE_TERMIOS_H
1161 /* 1535 /*
1162 * standard System V termios interface 1536 * standard System V termios interface
1163 */ 1537 */
1164 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)
1165 { 1541 {
1166 /* return error - use system defaults */ 1542 // return error - use system defaults,
1543 // where possible, and zero elsewhere
1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1548
1167 tio->c_cc[VINTR] = CINTR; 1549 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT; 1550 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE; 1551 tio->c_cc[VERASE] = CERASE;
1552#ifdef VERASE2
1553 tio->c_cc[VERASE2] = CERASE2;
1554#endif
1170 tio->c_cc[VKILL] = CKILL; 1555 tio->c_cc[VKILL] = CKILL;
1171 tio->c_cc[VSTART] = CSTART; 1556 tio->c_cc[VSTART] = CSTART;
1172 tio->c_cc[VSTOP] = CSTOP; 1557 tio->c_cc[VSTOP] = CSTOP;
1173 tio->c_cc[VSUSP] = CSUSP; 1558 tio->c_cc[VSUSP] = CSUSP;
1174# ifdef VDSUSP 1559# ifdef VDSUSP
1175
1176 tio->c_cc[VDSUSP] = CDSUSP; 1560 tio->c_cc[VDSUSP] = CDSUSP;
1177# endif 1561# endif
1178# ifdef VREPRINT 1562# ifdef VREPRINT
1179
1180 tio->c_cc[VREPRINT] = CRPRNT; 1563 tio->c_cc[VREPRINT] = CRPRNT;
1181# endif 1564# endif
1182# ifdef VDISCRD 1565# ifdef VDISCRD
1183
1184 tio->c_cc[VDISCRD] = CFLUSH; 1566 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif 1567# endif
1186# ifdef VWERSE 1568# ifdef VWERSE
1187
1188 tio->c_cc[VWERSE] = CWERASE; 1569 tio->c_cc[VWERSE] = CWERASE;
1189# endif 1570# endif
1190# ifdef VLNEXT 1571# ifdef VLNEXT
1191
1192 tio->c_cc[VLNEXT] = CLNEXT; 1572 tio->c_cc[VLNEXT] = CLNEXT;
1193# endif 1573# endif
1194
1195 } 1574 }
1575
1196 tio->c_cc[VEOF] = CEOF; 1576 tio->c_cc[VEOF] = CEOF;
1197 tio->c_cc[VEOL] = VDISABLE;
1198# ifdef VEOL2
1199
1200 tio->c_cc[VEOL2] = VDISABLE;
1201# endif
1202# ifdef VSWTC
1203
1204 tio->c_cc[VSWTC] = VDISABLE;
1205# endif
1206# ifdef VSWTCH
1207
1208 tio->c_cc[VSWTCH] = VDISABLE;
1209# endif
1210# if VMIN != VEOF 1577# if VMIN != VEOF
1211
1212 tio->c_cc[VMIN] = 1; 1578 tio->c_cc[VMIN] = 1;
1213# endif 1579# endif
1214# if VTIME != VEOL 1580# if VTIME != VEOL
1215
1216 tio->c_cc[VTIME] = 0; 1581 tio->c_cc[VTIME] = 0;
1217# endif 1582# endif
1218 1583
1219 if (erase != -1) 1584 if (erase != -1)
1220 tio->c_cc[VERASE] = (char)erase; 1585 tio->c_cc[VERASE] = (char)erase;
… …
1236 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1601 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1237# if defined (ECHOCTL) && defined (ECHOKE) 1602# if defined (ECHOCTL) && defined (ECHOKE)
1238 | ECHOCTL | ECHOKE 1603 | ECHOCTL | ECHOKE
1239# endif 1604# endif
1240 | ECHOE | ECHOK); 1605 | ECHOE | ECHOK);
1241# else /* HAVE_TERMIOS_H */
1242
1243 /*
1244 * sgtty interface
1245 */
1246
1247 /* get parameters -- gtty */
1248 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1249 {
1250 tio->sg.sg_erase = CERASE; /* ^H */
1251 tio->sg.sg_kill = CKILL; /* ^U */
1252 }
1253 if (erase != -1)
1254 tio->sg.sg_erase = (char)erase;
1255
1256 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1257
1258 /* get special characters */
1259 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1260 {
1261 tio->tc.t_intrc = CINTR; /* ^C */
1262 tio->tc.t_quitc = CQUIT; /* ^\ */
1263 tio->tc.t_startc = CSTART; /* ^Q */
1264 tio->tc.t_stopc = CSTOP; /* ^S */
1265 tio->tc.t_eofc = CEOF; /* ^D */
1266 tio->tc.t_brkc = -1;
1267 }
1268 /* get local special chars */
1269 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1270 {
1271 tio->lc.t_suspc = CSUSP; /* ^Z */
1272 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1273 tio->lc.t_rprntc = CRPRNT; /* ^R */
1274 tio->lc.t_flushc = CFLUSH; /* ^O */
1275 tio->lc.t_werasc = CWERASE; /* ^W */
1276 tio->lc.t_lnextc = CLNEXT; /* ^V */
1277 }
1278 /* get line discipline */
1279 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1280# ifdef NTTYDISC
1281
1282 tio->line = NTTYDISC;
1283# endif /* NTTYDISC */
1284
1285 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1286#endif /* HAVE_TERMIOS_H */
1287 1606
1288 /* 1607 /*
1289 * Debugging 1608 * Debugging
1290 */ 1609 */
1291#ifdef DEBUG_TTYMODE 1610#ifdef DEBUG_TTYMODE
1292#ifdef HAVE_TERMIOS_H
1293 /* c_iflag bits */ 1611 /* c_iflag bits */
1294 fprintf (stderr, "Input flags\n"); 1612 fprintf (stderr, "Input flags\n");
1295 1613
1296 /* cpp token stringize doesn't work on all machines <sigh> */ 1614 /* cpp token stringize doesn't work on all machines <sigh> */
1297# define FOO(flag,name) \ 1615# define FOO(flag,name) \
… …
1309 FOO (IGNCR, "IGNCR"); 1627 FOO (IGNCR, "IGNCR");
1310 FOO (ICRNL, "ICRNL"); 1628 FOO (ICRNL, "ICRNL");
1311 FOO (IXON, "IXON"); 1629 FOO (IXON, "IXON");
1312 FOO (IXOFF, "IXOFF"); 1630 FOO (IXOFF, "IXOFF");
1313# ifdef IUCLC 1631# ifdef IUCLC
1314
1315 FOO (IUCLC, "IUCLC"); 1632 FOO (IUCLC, "IUCLC");
1316# endif 1633# endif
1317# ifdef IXANY 1634# ifdef IXANY
1318
1319 FOO (IXANY, "IXANY"); 1635 FOO (IXANY, "IXANY");
1320# endif 1636# endif
1321# ifdef IMAXBEL 1637# ifdef IMAXBEL
1322
1323 FOO (IMAXBEL, "IMAXBEL"); 1638 FOO (IMAXBEL, "IMAXBEL");
1324# endif 1639# endif
1325 1640
1326 fprintf (stderr, "\n"); 1641 fprintf (stderr, "\n");
1327 1642
… …
1334 FOO (VERASE, "VERASE"); 1649 FOO (VERASE, "VERASE");
1335 FOO (VKILL, "VKILL"); 1650 FOO (VKILL, "VKILL");
1336 FOO (VEOF, "VEOF"); 1651 FOO (VEOF, "VEOF");
1337 FOO (VEOL, "VEOL"); 1652 FOO (VEOL, "VEOL");
1338# ifdef VEOL2 1653# ifdef VEOL2
1339
1340 FOO (VEOL2, "VEOL2"); 1654 FOO (VEOL2, "VEOL2");
1341# endif 1655# endif
1342# ifdef VSWTC 1656# ifdef VSWTC
1343
1344 FOO (VSWTC, "VSWTC"); 1657 FOO (VSWTC, "VSWTC");
1345# endif 1658# endif
1346# ifdef VSWTCH 1659# ifdef VSWTCH
1347
1348 FOO (VSWTCH, "VSWTCH"); 1660 FOO (VSWTCH, "VSWTCH");
1349# endif 1661# endif
1350
1351 FOO (VSTART, "VSTART"); 1662 FOO (VSTART, "VSTART");
1352 FOO (VSTOP, "VSTOP"); 1663 FOO (VSTOP, "VSTOP");
1353 FOO (VSUSP, "VSUSP"); 1664 FOO (VSUSP, "VSUSP");
1354# ifdef VDSUSP 1665# ifdef VDSUSP
1355
1356 FOO (VDSUSP, "VDSUSP"); 1666 FOO (VDSUSP, "VDSUSP");
1357# endif 1667# endif
1358# ifdef VREPRINT 1668# ifdef VREPRINT
1359
1360 FOO (VREPRINT, "VREPRINT"); 1669 FOO (VREPRINT, "VREPRINT");
1361# endif 1670# endif
1362# ifdef VDISCRD 1671# ifdef VDISCRD
1363
1364 FOO (VDISCRD, "VDISCRD"); 1672 FOO (VDISCRD, "VDISCRD");
1365# endif 1673# endif
1366# ifdef VWERSE 1674# ifdef VWERSE
1367
1368 FOO (VWERSE, "VWERSE"); 1675 FOO (VWERSE, "VWERSE");
1369# endif 1676# endif
1370# ifdef VLNEXT 1677# ifdef VLNEXT
1371
1372 FOO (VLNEXT, "VLNEXT"); 1678 FOO (VLNEXT, "VLNEXT");
1373# endif 1679# endif
1374 1680
1375 fprintf (stderr, "\n"); 1681 fprintf (stderr, "\n");
1376# undef FOO 1682# undef FOO
1377# endif /* HAVE_TERMIOS_H */ 1683#endif /* DEBUG_TTYMODE */
1378#endif /* DEBUG_TTYMODE */
1379} 1684}
1380 1685
1381/*----------------------------------------------------------------------*/ 1686/*----------------------------------------------------------------------*/
1382/* 1687/*
1383 * 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
… …
1385 * the slave. 1690 * the slave.
1386 */ 1691 */
1387void 1692void
1388rxvt_term::run_command (const char *const *argv) 1693rxvt_term::run_command (const char *const *argv)
1389{ 1694{
1695#if ENABLE_FRILLS
1696 if (rs[Rs_pty_fd])
1697 {
1698 pty->pty = atoi (rs[Rs_pty_fd]);
1699
1700 if (pty->pty >= 0)
1701 {
1702 if (getfd_hook)
1703 pty->pty = (*getfd_hook) (pty->pty);
1704
1705 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1706 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1707 }
1708 }
1709 else
1710#endif
1390 if (!pty.get ()) 1711 if (!pty->get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1712 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392 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);
1393 pty.set_utf8_mode (enc_utf8); 1730 pty->set_utf8_mode (enc_utf8);
1394 1731
1395 /* set initial window size */ 1732 /* set initial window size */
1396 tt_winch (); 1733 tt_winch ();
1397 1734
1398 int er; 1735#if ENABLE_FRILLS
1399 1736 if (rs[Rs_pty_fd])
1400#ifndef NO_BACKSPACE_KEY 1737 return;
1401 if (key_backspace[0] && !key_backspace[1])
1402 er = key_backspace[0];
1403 else if (strcmp (key_backspace, "DEC") == 0)
1404 er = '\177'; /* the initial state anyway */
1405 else
1406#endif 1738#endif
1407 er = -1;
1408 1739
1409 rxvt_get_ttymode (&tio, er);
1410
1411 sw_chld.start (SIGCHLD);
1412
1413#ifndef __QNX__
1414 /* spin off the command interpreter */ 1740 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1741 switch (cmd_pid = fork ())
1416 { 1742 {
1417 case -1: 1743 case -1:
1744 {
1745 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1746 rxvt_fatal ("can't fork, aborting.\n");
1747 }
1419 case 0: 1748 case 0:
1420 init_env (); 1749 init_env ();
1421 1750
1422 if (!pty.make_controlling_tty ()) 1751 if (!pty->make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1752 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424 else 1753 else
1425 { 1754 {
1426 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1755 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1427 dup2 (pty.tty, STDIN_FILENO); 1756 dup2 (pty->tty, STDIN_FILENO);
1428 dup2 (pty.tty, STDOUT_FILENO); 1757 dup2 (pty->tty, STDOUT_FILENO);
1429 dup2 (pty.tty, STDERR_FILENO); 1758 dup2 (pty->tty, STDERR_FILENO);
1430 1759
1431 // close all our file handles that we do no longer need 1760 // close all our file handles that we do no longer need
1432 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1761 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433 { 1762 {
1434 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1763 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1435 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1764 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1436 } 1765 }
1437 1766
1438 run_child (argv); 1767 run_child (argv);
1439 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1768 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440 } 1769 }
1441 1770
1442 _exit (EXIT_FAILURE); 1771 _exit (EXIT_FAILURE);
1443 1772
1444 default: 1773 default:
1445 { 1774 if (!option (Opt_utmpInhibit))
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1775 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1447 int fdstdin;
1448 1776
1449 fdstdin = dup (STDIN_FILENO); 1777 pty->close_tty ();
1450 dup2 (pty.tty, STDIN_FILENO);
1451#endif
1452 1778
1453#ifdef UTMP_SUPPORT 1779 child_ev.start (cmd_pid);
1454 privileged_utmp (SAVE);
1455#endif
1456 1780
1457#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1781 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1458
1459 dup2 (fdstdin, STDIN_FILENO);
1460 close (fdstdin);
1461#endif
1462 }
1463
1464 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1465 break; 1782 break;
1466 } 1783 }
1467#else /* __QNX__ uses qnxspawn () */
1468 fchmod (pty.tty, 0622);
1469 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1470 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1471
1472 if (run_child (argv) == -1)
1473 exit (EXIT_FAILURE);
1474#endif
1475} 1784}
1476 1785
1477/* ------------------------------------------------------------------------- * 1786/* ------------------------------------------------------------------------- *
1478 * CHILD PROCESS OPERATIONS * 1787 * CHILD PROCESS OPERATIONS *
1479 * ------------------------------------------------------------------------- */ 1788 * ------------------------------------------------------------------------- */
… …
1484int 1793int
1485rxvt_term::run_child (const char *const *argv) 1794rxvt_term::run_child (const char *const *argv)
1486{ 1795{
1487 char *login; 1796 char *login;
1488 1797
1489 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490
1491 if (options & Opt_console) 1798 if (option (Opt_console))
1799 {
1492 { /* be virtual console, fail silently */ 1800 /* be virtual console, fail silently */
1493#ifdef TIOCCONS 1801#ifdef TIOCCONS
1494 unsigned int on = 1; 1802 unsigned int on = 1;
1495 1803
1496 ioctl (STDIN_FILENO, TIOCCONS, &on); 1804 ioctl (STDIN_FILENO, TIOCCONS, &on);
1497#elif defined (SRIOCSREDIR) 1805#elif defined (SRIOCSREDIR)
… …
1499 1807
1500 fd = open (CONSOLE, O_WRONLY, 0); 1808 fd = open (CONSOLE, O_WRONLY, 0);
1501 if (fd >= 0) 1809 if (fd >= 0)
1502 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1810 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1503 close (fd); 1811 close (fd);
1504#endif /* SRIOCSREDIR */ 1812#endif /* SRIOCSREDIR */
1505 } 1813 }
1506 1814
1507 /* reset signals and spin off the command interpreter */ 1815 /* reset signals and spin off the command interpreter */
1508 signal (SIGINT, SIG_DFL); 1816 signal (SIGINT, SIG_DFL);
1509 signal (SIGQUIT, SIG_DFL); 1817 signal (SIGQUIT, SIG_DFL);
… …
1516 */ 1824 */
1517#ifdef SIGTSTP 1825#ifdef SIGTSTP
1518 signal (SIGTSTP, SIG_IGN); 1826 signal (SIGTSTP, SIG_IGN);
1519 signal (SIGTTIN, SIG_IGN); 1827 signal (SIGTTIN, SIG_IGN);
1520 signal (SIGTTOU, SIG_IGN); 1828 signal (SIGTTOU, SIG_IGN);
1521#endif /* SIGTSTP */ 1829#endif /* SIGTSTP */
1522 1830
1523 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss;
1525 sigemptyset (&ss);
1526 sigprocmask (SIG_SETMASK, &ss, 0);
1527
1528#ifndef __QNX__
1529 /* command interpreter path */ 1831 /* command interpreter path */
1530 if (argv != NULL) 1832 if (argv)
1531 { 1833 {
1532# ifdef DEBUG_CMD 1834# ifdef DEBUG_CMD
1533 int i; 1835 int i;
1534 1836
1535 for (i = 0; argv[i]; i++) 1837 for (i = 0; argv[i]; i++)
… …
1539 execvp (argv[0], (char *const *)argv); 1841 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */ 1842 /* no error message: STDERR is closed! */
1541 } 1843 }
1542 else 1844 else
1543 { 1845 {
1544 const char *argv0, *shell; 1846 const char *argv0, *shell;
1545 1847
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1848 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1849 shell = "/bin/sh";
1548 1850
1549 argv0 = (const char *)rxvt_r_basename (shell); 1851 argv0 = rxvt_basename (shell);
1550 1852
1551 if (options & Opt_loginShell) 1853 if (option (Opt_loginShell))
1552 { 1854 {
1553 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1855 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1554 1856
1555 login[0] = '-'; 1857 login[0] = '-';
1556 strcpy (&login[1], argv0); 1858 strcpy (&login[1], argv0);
1557 argv0 = login; 1859 argv0 = login;
1558 } 1860 }
1861
1559 execlp (shell, argv0, NULL); 1862 execlp (shell, argv0, (char *)0);
1560 /* no error message: STDERR is closed! */ 1863 /* no error message: STDERR is closed! */
1561 } 1864 }
1562
1563#else /* __QNX__ uses qnxspawn () */
1564
1565 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1566 char *command = NULL, fullcommand[_MAX_PATH];
1567 char **arg_v, *arg_a[2] = { NULL, NULL };
1568
1569 if (argv != NULL)
1570 {
1571 if (access (argv[0], X_OK) == -1)
1572 {
1573 if (strchr (argv[0], '/') == NULL)
1574 {
1575 searchenv (argv[0], "PATH", fullcommand);
1576
1577 if (fullcommand[0] != '\0')
1578 command = fullcommand;
1579 }
1580
1581 if (access (command, X_OK) == -1)
1582 return -1;
1583 }
1584 else
1585 command = argv[0];
1586
1587 arg_v = argv;
1588 }
1589 else
1590 {
1591 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1592 command = "/bin/sh";
1593
1594 arg_a[0] = my_basename (command);
1595
1596 if (options & Opt_loginShell)
1597 {
1598 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1599
1600 login[0] = '-';
1601 strcpy (&login[1], arg_a[0]);
1602 arg_a[0] = login;
1603 }
1604
1605 arg_v = arg_a;
1606 }
1607
1608 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1609 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1610 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1611 command, arg_v, environ, iov_a, 0);
1612 if (login)
1613 free (login);
1614
1615 pty.close_tty ();
1616 return pty.pty;
1617#endif
1618 1865
1619 return -1; 1866 return -1;
1620} 1867}
1621 1868
1622/*----------------------- end-of-file (C source) -----------------------*/ 1869/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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