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

Diff Legend

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