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

Diff Legend

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