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.168 by root, Wed Feb 1 21:15:33 2006 UTC vs.
Revision 1.268 by root, Mon Jun 14 15:50:08 2010 UTC

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

Diff Legend

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