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.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.275 by sf-exg, Sat Aug 28 11:03:30 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);
218} 553 set_option (Opt_skipScroll);
219 554 set_option (Opt_secondaryScreen);
220void 555 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 556 set_option (Opt_pastableTabs);
222{ 557 set_option (Opt_intensityStyles);
223 int i; 558 set_option (Opt_iso14755);
224 559 set_option (Opt_iso14755_52);
225 /* 560 set_option (Opt_buffered);
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)
230 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO);
233 }
234 else if (i > STDIN_FILENO)
235 {
236 dup2 (i, STDIN_FILENO);
237 close (i);
238 }
239
240 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} 561}
253 562
254/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
255const char ** 564const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
257{ 566{
258 int i, r_argc; 567 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
261 569
262 /* 570 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 571 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 572 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 574 if (!strcmp (argv[r_argc], "-e"))
267 break; 575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
268 590
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 592
271 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
273 595
274 r_argv[i] = NULL; 596 r_argv[i] = NULL;
275 597
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]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
289 599
290 /* 600 /*
291 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
292 */ 602 */
293 603
… …
295 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
296 606
297 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
298 608
299 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
301 614
615 // using a local pointer decreases code size a lot
302 xa = display->xa; 616 xa = display->xa;
617
618 set (display);
619 extract_resources ();
303 620
304#if XFT 621#if XFT
305 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 624#endif
309 set (display);
310
311 extract_resources ();
312 625
313 free (r_argv); 626 free (r_argv);
627
628 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef)
630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
314 636
315#if ENABLE_PERL 637#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 638 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 639 rs[Rs_perl_ext_1] = "default";
318 640
… …
329 * set any defaults not already set 651 * set any defaults not already set
330 */ 652 */
331 if (cmd_argv && cmd_argv[0]) 653 if (cmd_argv && cmd_argv[0])
332 { 654 {
333 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 656 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
657
335 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 659 rs[Rs_iconName] = rs[Rs_title];
337 } 660 }
338 else 661 else
339 { 662 {
340 if (!rs[Rs_title]) 663 if (!rs[Rs_title])
341 rs[Rs_title] = rs[Rs_name]; 664 rs[Rs_title] = rs[Rs_name];
665
342 if (!rs[Rs_iconName]) 666 if (!rs[Rs_iconName])
343 rs[Rs_iconName] = rs[Rs_name]; 667 rs[Rs_iconName] = rs[Rs_name];
344 } 668 }
345 669
346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 670 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 677 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 678 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355 679
356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 680 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
357 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 681 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
682
683 if (rs[Rs_letterSpace])
684 letterSpace = atoi (rs[Rs_letterSpace]);
358#endif 685#endif
359 686
360#ifdef POINTER_BLANK 687#ifdef POINTER_BLANK
361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
362 pointerBlankDelay = i; 689 pointerBlankDelay = i;
… …
366 693
367 /* no point having a scrollbar without having any scrollback! */ 694 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 695 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 696 set_option (Opt_scrollBar, 0);
370 697
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 698 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 699 rs[Rs_cutchars] = CUTCHARS;
378 700
379#ifndef NO_BACKSPACE_KEY 701#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 702 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 703# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 704 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 705# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 706 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 707# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 708#endif
394 709
395#ifndef NO_DELETE_KEY 710#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 711 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 712# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 713 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 714# else
400 key_delete = "\033[3~"; 715 rs[Rs_delete_key] = "\033[3~";
401# endif 716# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 717#endif
410 if (rs[Rs_answerbackstring])
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415 718
416#ifdef HAVE_SCROLLBARS 719 scrollBar.setup (this);
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif
419 720
420#ifdef XTERM_REVERSE_VIDEO 721#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 722 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 723 if (option (Opt_reverseVideo))
423 { 724 {
424 if (!rs[Rs_color + Color_fg]) 725 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 726 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
727
426 if (!rs[Rs_color + Color_bg]) 728 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 729 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 730 }
429#endif 731#endif
430 732
… …
432 if (!rs[Rs_color + i]) 734 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 735 rs[Rs_color + i] = def_colorName[i];
434 736
435#ifndef XTERM_REVERSE_VIDEO 737#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 738 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 739 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 740 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 741#endif
440 742
441 /* convenient aliases for setting fg/bg to colors */ 743 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 744 color_aliases (Color_fg);
443 color_aliases (Color_bg); 745 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 746#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 747 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 748 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 749#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 750 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 751 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 752 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 753#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 754 color_aliases (Color_BD);
453 color_aliases (Color_UL); 755 color_aliases (Color_UL);
454 color_aliases (Color_RV); 756 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 757#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 758
457 if (!rs[Rs_color + Color_border]) 759 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 760 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 761
460 return cmd_argv; 762 return cmd_argv;
763}
764
765/*----------------------------------------------------------------------*/
766void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
768{
769 this->envv = envv;
770
771 SET_R (this);
772 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :(
774
775 init_vars ();
776
777 const char **cmd_argv = init_resources (argc, argv);
778
779#ifdef KEYSYM_RESOURCE
780 keyboard->register_done ();
781#endif
782
783 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty
785 {
786 if (*path != '/')
787 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
788
789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 }
792
793 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bgPixmap.set_target (this);
813 bgPixmap.invalidate ();
814
815#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent))
817 {
818 bgPixmap.set_transparent ();
819
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823#endif
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856
857#if ENABLE_PERL
858 rootwin_ev.start (display, display->root);
859#endif
860
861 set_colorfgbg ();
862
863 init_command (cmd_argv);
864
865 free (cmd_argv);
866
867 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ);
869
870 HOOK_INVOKE ((this, HOOK_START, DT_END));
871
872#if ENABLE_XEMBED
873 if (rs[Rs_embed])
874 {
875 long info[2] = { 0, XEMBED_MAPPED };
876
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2);
879 }
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]);
884
885 refresh_check ();
461} 886}
462 887
463/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
464void 889void
465rxvt_term::init_env () 890rxvt_term::init_env ()
466{ 891{
467 int i; 892 int i;
468 unsigned int u;
469 char *val; 893 char *val;
470 894
471#ifdef DISPLAY_IS_IP 895#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 896 /* Fixup display_name for export over pty to any interested terminal
473 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 897 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 905 */
482 val = rxvt_network_display (rs[Rs_display_name]); 906 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 907 rs[Rs_display_name] = (const char *)val;
484 908
485 if (val == NULL) 909 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 910#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 911 val = XDisplayString (dpy);
488 912
489 if (rs[Rs_display_name] == NULL) 913 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 914 rs[Rs_display_name] = val; /* use broken `:0' value */
491 915
492 i = strlen (val); 916 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 917 env_display = (char *)rxvt_malloc (i + 9);
494 918
495 sprintf (env_display, "DISPLAY=%s", val); 919 sprintf (env_display, "DISPLAY=%s", val);
496 920
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 922
… …
519 else 943 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 944 putenv ("COLORTERM=" COLORTERMENVFULL);
521 945
522 if (rs[Rs_term_name] != NULL) 946 if (rs[Rs_term_name] != NULL)
523 { 947 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 948 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 949 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 950 putenv (env_term);
527 } 951 }
528 else 952 else
529 putenv ("TERM=" TERMENV); 953 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 955#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 956 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 957 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 958 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 959 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 960#endif /* HAVE_UNSETENV */
537} 961}
538 962
539/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
540/* 964/*
541 * This is more or less stolen straight from XFree86 xterm. 965 * This is more or less stolen straight from XFree86 xterm.
… …
562 986
563 this->locale = "C"; 987 this->locale = "C";
564 } 988 }
565 989
566 990
567 this->locale = rxvt_strdup (this->locale); 991 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 992 SET_LOCALE (this->locale);
569 mbstate.reset (); 993 mbstate.reset ();
570#endif 994#endif
571 995
572#if HAVE_NL_LANGINFO 996#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 1040 * Initialize the command connection.
617 * This should be called after the X server connection is established. 1041 * This should be called after the X server connection is established.
618 */ 1042 */
619 1043
620#ifdef META8_OPTION 1044#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1045 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 1046#endif
623 1047
624 get_ourmods (); 1048 get_ourmods ();
625 1049
626 if (!OPTION (Opt_scrollTtyOutput)) 1050 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 1051 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 1052 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 1053 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 1054 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 1055 priv_modes |= PrivMode_smoothScroll;
632 1056
633#ifndef NO_BACKSPACE_KEY 1057#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 1058 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 1059 priv_modes |= PrivMode_HaveBackSpace;
636#endif 1060#endif
637 1061
638 /* add value for scrollBar */ 1062 /* add value for scrollBar */
639 if (scrollBar.state) 1063 if (scrollBar.state)
… …
645 run_command (argv); 1069 run_command (argv);
646} 1070}
647 1071
648/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
649void 1073void
650rxvt_term::Get_Colours () 1074rxvt_term::get_colours ()
651{ 1075{
652 int i; 1076 int i;
653 1077
654#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 1079 pix_colors = pix_colors_focused;
656#endif 1080#endif
657 1081
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 1083 {
660 const char *name = rs[Rs_color + i]; 1084 const char *name = rs[Rs_color + i];
661 1085
662 if (!name) 1086 if (!name)
… …
665 rxvt_color xcol; 1089 rxvt_color xcol;
666 1090
667 if (!set_color (xcol, name)) 1091 if (!set_color (xcol, name))
668 { 1092 {
669#ifndef XTERM_REVERSE_VIDEO 1093#ifndef XTERM_REVERSE_VIDEO
670 if (i < 2 && OPTION (Opt_reverseVideo)) 1094 if (i < 2 && option (Opt_reverseVideo))
671 name = def_colorName [1 - i]; 1095 name = def_colorName [1 - i];
672 else 1096 else
673#endif 1097#endif
674 name = def_colorName [i]; 1098 name = def_colorName [i];
675 1099
… …
688#ifndef NO_CURSORCOLOR 1112#ifndef NO_CURSORCOLOR
689 case Color_cursor2: 1113 case Color_cursor2:
690#endif 1114#endif
691 case Color_pointer_fg: 1115 case Color_pointer_fg:
692 name = rs[Rs_color + Color_fg]; 1116 name = rs[Rs_color + Color_fg];
693 xcol = pix_colors[Color_fg]; 1117 xcol.set (this, name);
694 break; 1118 break;
695 default: 1119 default:
696 name = rs[Rs_color + Color_bg]; 1120 name = rs[Rs_color + Color_bg];
697 xcol = pix_colors[Color_bg]; 1121 xcol.set (this, name);
698 break; 1122 break;
699 } 1123 }
700 } 1124 }
701 } 1125 }
702 1126
703 pix_colors[i] = xcol; 1127 pix_colors[i] = xcol;
704 rs[Rs_color + i] = name; 1128 rs[Rs_color + i] = name;
705 } 1129 }
706 1130
707#ifdef OFF_FOCUS_FADING
708 if (rs[Rs_fade])
709 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
710 {
711 rgba c;
712 pix_colors[Color_fade].get (this, c);
713 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
714 }
715#endif
716
717 if (depth <= 2) 1131 if (depth <= 2)
718 { 1132 {
719 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1133 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
720 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 1134 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
721 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 1135 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
722 } 1136 }
723 1137
724 /* 1138 /*
725 * get scrollBar shadow colors 1139 * get scrollBar shadow colors
726 * 1140 *
727 * The calculations of topShadow/bottomShadow values are adapted 1141 * The calculations of topShadow/bottomShadow values are adapted
728 * from the fvwm window manager. 1142 * from the fvwm window manager.
729 */ 1143 */
730#ifdef KEEP_SCROLLCOLOR 1144#ifdef RXVT_SCROLLBAR
731
732 if (depth <= 2) 1145 if (depth <= 2)
733 { 1146 {
734 /* Monochrome */ 1147 /* Monochrome */
735 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1148 alias_color (Color_scroll, Color_fg);
736 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1149 alias_color (Color_topShadow, Color_bg);
737 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1150 alias_color (Color_bottomShadow, Color_bg);
738 } 1151 }
739 else 1152 else
740 { 1153 {
741 rxvt_color xcol[2]; 1154 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
742 /* xcol[0] == white
743 * xcol[1] == top shadow
744 * xcol[2] == bot shadow */
745 1155
746 xcol[1] = pix_colors[Color_scroll];
747 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
748
749 rgba c0, c1; 1156 rgba cscroll;
750 1157 pix_colors [Color_scroll].get (cscroll);
751 xcol[0].get (this, c0);
752 xcol[1].get (this, c1);
753
754 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
755 1158
756 /* topShadowColor */ 1159 /* topShadowColor */
757 if (!xcol[1].set (this, 1160 if (!pix_colors[Color_topShadow].set (this,
758 rgba ( 1161 rgba (
759 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 1162 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
760 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 1163 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
761 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
762 c1.a) // pa1 vs. pa0: arbitrary 1165 cscroll.a)
763 )); 1166 ))
764 xcol[1] = pix_colors[Color_White]; 1167 alias_color (Color_topShadow, Color_White);
765
766 pix_colors[Color_topShadow] = xcol[1];
767 } 1168 }
768#endif /* KEEP_SCROLLCOLOR */ 1169#endif
1170
1171#ifdef OFF_FOCUS_FADING
1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1173 update_fade_color (i);
1174#endif
769} 1175}
770 1176
771/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
772/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
773void 1179void
… …
776 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
777 { 1183 {
778 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
779 1185
780 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
781 { /* bright colors */ 1187 /* bright colors */
782 i -= 8;
783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1188 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784 return; 1189 else if (i >= 0 && i <= 7)
785 } 1190 /* normal colors */
786
787 if (i >= 0 && i <= 7) /* normal colors */
788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1191 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789 } 1192 }
790} 1193}
791 1194
792/*----------------------------------------------------------------------*/ 1195/*----------------------------------------------------------------------*/
… …
812 1215
813 if (rsmod 1216 if (rsmod
814 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1217 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
815 requestedmeta = rsmod[3] - '0'; 1218 requestedmeta = rsmod[3] - '0';
816 1219
817 map = XGetModifierMapping (xdisp); 1220 map = XGetModifierMapping (dpy);
818 kc = map->modifiermap; 1221 kc = map->modifiermap;
819 1222
820 for (i = 1; i < 6; i++) 1223 for (i = 1; i < 6; i++)
821 { 1224 {
822 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1225 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
824 for (j = map->max_keypermod; j--; k++) 1227 for (j = map->max_keypermod; j--; k++)
825 { 1228 {
826 if (kc[k] == 0) 1229 if (kc[k] == 0)
827 break; 1230 break;
828 1231
829 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1232 switch (XKeycodeToKeysym (dpy, kc[k], 0))
830 { 1233 {
831 case XK_Num_Lock: 1234 case XK_Num_Lock:
832 ModNumLockMask = modmasks[i - 1]; 1235 ModNumLockMask = modmasks[i - 1];
833 continue; 1236 continue;
834 1237
… …
884rxvt_term::create_windows (int argc, const char *const *argv) 1287rxvt_term::create_windows (int argc, const char *const *argv)
885{ 1288{
886 XClassHint classHint; 1289 XClassHint classHint;
887 XWMHints wmHint; 1290 XWMHints wmHint;
888#if ENABLE_FRILLS 1291#if ENABLE_FRILLS
889 MWMHints mwmhints; 1292 MWMHints mwmhints = { };
890#endif 1293#endif
891 XGCValues gcvalue; 1294 XGCValues gcvalue;
892 XSetWindowAttributes attributes; 1295 XSetWindowAttributes attributes;
893 Window top, parent; 1296 Window top, parent;
894 1297
895 dLocal (Display *, xdisp); 1298 dLocal (Display *, dpy);
896 1299
897 /* grab colors before netscape does */ 1300 /* grab colors before netscape does */
898 Get_Colours (); 1301 get_colours ();
899 1302
900 if (!set_fonts ()) 1303 if (!set_fonts ())
901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1304 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
902 1305
903 parent = display->root; 1306 parent = display->root;
904 1307
905 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1308 attributes.override_redirect = !!option (Opt_override_redirect);
906 1309
907#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
908 if (OPTION (Opt_borderLess)) 1311 if (option (Opt_borderLess))
909 { 1312 {
910 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1313 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 1314 {
912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1315 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913 attributes.override_redirect = true; 1316 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 1317 }
916 else 1318 else
917 { 1319 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 1320 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 1321 }
921 } 1322 }
922 else
923 mwmhints.flags = 0;
924#endif 1323#endif
925 1324
926#if ENABLE_XEMBED 1325#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 1326 if (rs[Rs_embed])
928 { 1327 {
929 XWindowAttributes wattr; 1328 XWindowAttributes wattr;
930 1329
931 parent = strtol (rs[Rs_embed], 0, 0); 1330 parent = strtol (rs[Rs_embed], 0, 0);
932 1331
933 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1332 if (!XGetWindowAttributes (dpy, parent, &wattr))
934 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1333 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
935 1334
936 window_calc (wattr.width, wattr.height); 1335 window_calc (wattr.width, wattr.height);
937 } 1336 }
938#endif 1337#endif
… …
942 /* sub-window placement & size in rxvt_resize_subwindows () */ 1341 /* sub-window placement & size in rxvt_resize_subwindows () */
943 attributes.background_pixel = pix_colors_focused [Color_border]; 1342 attributes.background_pixel = pix_colors_focused [Color_border];
944 attributes.border_pixel = pix_colors_focused [Color_border]; 1343 attributes.border_pixel = pix_colors_focused [Color_border];
945 attributes.colormap = cmap; 1344 attributes.colormap = cmap;
946 1345
947 top = XCreateWindow (xdisp, parent, 1346 top = XCreateWindow (dpy, parent,
948 szHint.x, szHint.y, 1347 szHint.x, szHint.y,
949 szHint.width, szHint.height, 1348 szHint.width, szHint.height,
950 ext_bwidth, 1349 ext_bwidth,
951 depth, InputOutput, visual, 1350 depth, InputOutput, visual,
952 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1351 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
955 this->parent[0] = top; 1354 this->parent[0] = top;
956 1355
957 old_width = szHint.width; 1356 old_width = szHint.width;
958 old_height = szHint.height; 1357 old_height = szHint.height;
959 1358
960 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1359 set_title (rs [Rs_title]);
961 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1360 set_icon_name (rs [Rs_iconName]);
962 1361
963 classHint.res_name = (char *)rs[Rs_name]; 1362 classHint.res_name = (char *)rs[Rs_name];
964 classHint.res_class = (char *)RESCLASS; 1363 classHint.res_class = (char *)RESCLASS;
965 1364
966 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1365 wmHint.flags = InputHint | StateHint | WindowGroupHint;
967 wmHint.input = True; 1366 wmHint.input = True;
968 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1367 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
969 wmHint.window_group = top; 1368 wmHint.window_group = top;
970 1369
971 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1370 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972 &szHint, &wmHint, &classHint); 1371 &szHint, &wmHint, &classHint);
1372#if ENABLE_EWMH
1373# ifdef HAVE_AFTERIMAGE
1374 /*
1375 * set up icon hint
1376 * rs [Rs_iconfile] is path to icon
1377 */
1378
1379 if (rs [Rs_iconfile])
1380 {
1381 init_asv ();
1382
1383 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1384 if (asv && im)
1385 {
1386 int w = im->width;
1387 int h = im->height;
1388 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1389 ASImage *result = scale_asimage (asv, im,
1390 w, h, ASA_ARGB32,
1391 100, ASIMAGE_QUALITY_DEFAULT);
1392 destroy_asimage (&im);
1393
1394 if (buffer && result)
1395 {
1396 ARGB32 *asbuf = result->alt.argb32;
1397 buffer [0] = w;
1398 buffer [1] = h;
1399
1400 for (unsigned int i = 0; i < w * h; ++i)
1401 buffer [i + 2] = asbuf [i];
1402
1403 destroy_asimage (&result);
1404 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1405 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1406 free (buffer);
1407 }
1408 else
1409 {
1410 if (!buffer)
1411 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1412
1413 if (!result)
1414 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1415 }
1416 }
1417 else
1418 rxvt_warn ("Loading image icon failed, continuing without.\n");
1419 }
1420# endif
1421#endif
973 1422
974#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
975 if (mwmhints.flags) 1424 if (mwmhints.flags)
976 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
977 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1426 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
978#endif 1427#endif
979 1428
980 Atom protocols[] = { 1429 Atom protocols[] = {
981 xa[XA_WM_DELETE_WINDOW], 1430 xa[XA_WM_DELETE_WINDOW],
982#if ENABLE_EWMH 1431#if ENABLE_EWMH
983 xa[XA_NET_WM_PING], 1432 xa[XA_NET_WM_PING],
984#endif 1433#endif
985 }; 1434 };
986 1435
987 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1436 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
988 1437
989#if ENABLE_FRILLS 1438#if ENABLE_FRILLS
990 if (rs[Rs_transient_for]) 1439 if (rs[Rs_transient_for])
991 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1440 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
992#endif 1441#endif
993 1442
994#if ENABLE_EWMH 1443#if ENABLE_EWMH
995 long pid = getpid (); 1444 long pid = getpid ();
996 1445
997 XChangeProperty (xdisp, top, 1446 XChangeProperty (dpy, top,
998 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1447 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
999 PropModeReplace, (unsigned char *)&pid, 1); 1448 PropModeReplace, (unsigned char *)&pid, 1);
1000 1449
1001 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1450 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1002#endif 1451#endif
1003 1452
1004 XSelectInput (xdisp, top, 1453 XSelectInput (dpy, top,
1005 KeyPressMask 1454 KeyPressMask
1006#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1455#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1007 | KeyReleaseMask 1456 | KeyReleaseMask
1008#endif 1457#endif
1009 | FocusChangeMask | VisibilityChangeMask 1458 | FocusChangeMask | VisibilityChangeMask
1010 | ExposureMask | StructureNotifyMask); 1459 | ExposureMask | StructureNotifyMask);
1011 1460
1012 termwin_ev.start (display, top); 1461 termwin_ev.start (display, top);
1013 1462
1014 /* vt cursor: Black-on-White is standard, but this is more popular */ 1463 /* vt cursor: Black-on-White is standard, but this is more popular */
1015 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016
1017#ifdef HAVE_SCROLLBARS
1018 /* cursor scrollBar: Black-on-White */
1019 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1020#endif
1021 1465
1022 /* the vt window */ 1466 /* the vt window */
1023 vt = XCreateSimpleWindow (xdisp, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1024 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1025 width, height, 1469 width, height,
1026 0, 1470 0,
1027 pix_colors_focused[Color_fg], 1471 pix_colors_focused[Color_fg],
1028 pix_colors_focused[Color_bg]); 1472 pix_colors_focused[Color_bg]);
1029 1473
1030 attributes.bit_gravity = NorthWestGravity; 1474 attributes.bit_gravity = NorthWestGravity;
1031 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1475 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1032 1476
1033 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1477 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1034 1478
1035 if (OPTION (Opt_pointerBlank)) 1479 if (option (Opt_pointerBlank))
1036 vt_emask |= PointerMotionMask; 1480 vt_emask |= PointerMotionMask;
1037 else 1481 else
1038 vt_emask |= Button1MotionMask | Button3MotionMask; 1482 vt_emask |= Button1MotionMask | Button3MotionMask;
1039 1483
1040 vt_select_input (); 1484 vt_select_input ();
1041 1485
1042 vt_ev.start (display, vt); 1486 vt_ev.start (display, vt);
1043 1487
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL
1046 && !OPTION (Opt_transparent))
1047 {
1048 const char *p = rs[Rs_backgroundPixmap];
1049
1050 if ((p = strchr (p, ';')) != NULL)
1051 {
1052 p++;
1053 scale_pixmap (p);
1054 }
1055
1056 set_bgPixmap (rs[Rs_backgroundPixmap]);
1057 scr_touch (true);
1058 }
1059#endif
1060
1061 /* graphics context for the vt window */ 1488 /* graphics context for the vt window */
1062 gcvalue.foreground = pix_colors[Color_fg]; 1489 gcvalue.foreground = pix_colors[Color_fg];
1063 gcvalue.background = pix_colors[Color_bg]; 1490 gcvalue.background = pix_colors[Color_bg];
1064 gcvalue.graphics_exposures = 1; 1491 gcvalue.graphics_exposures = 0;
1065 1492
1066 gc = XCreateGC (xdisp, vt, 1493 gc = XCreateGC (dpy, vt,
1067 GCForeground | GCBackground | GCGraphicsExposures, 1494 GCForeground | GCBackground | GCGraphicsExposures,
1068 &gcvalue); 1495 &gcvalue);
1069 1496
1070 drawable = new rxvt_drawable (this, vt); 1497 drawable = new rxvt_drawable (this, vt);
1071
1072#ifdef RXVT_SCROLLBAR
1073 gcvalue.foreground = pix_colors[Color_topShadow];
1074 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[Color_bottomShadow];
1076 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1077 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1078 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1079#endif
1080 1498
1081#ifdef OFF_FOCUS_FADING 1499#ifdef OFF_FOCUS_FADING
1082 // initially we are in unfocused state 1500 // initially we are in unfocused state
1083 if (rs[Rs_fade]) 1501 if (rs[Rs_fade])
1084 pix_colors = pix_colors_unfocused; 1502 pix_colors = pix_colors_unfocused;
1085#endif 1503#endif
1086 1504
1087 pointer_unblank (); 1505 pointer_unblank ();
1088 scr_recolour (); 1506 scr_recolour ();
1089}
1090
1091/* ------------------------------------------------------------------------- *
1092 * GET TTY CURRENT STATE *
1093 * ------------------------------------------------------------------------- */
1094void
1095rxvt_get_ttymode (ttymode_t *tio, int erase)
1096{
1097#ifdef HAVE_TERMIOS_H
1098 /*
1099 * standard System V termios interface
1100 */
1101 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1102 {
1103 // return error - use system defaults,
1104 // where possible, and zero elsewhere
1105 memset (tio, 0, sizeof (ttymode_t));
1106
1107 tio->c_cc[VINTR] = CINTR;
1108 tio->c_cc[VQUIT] = CQUIT;
1109 tio->c_cc[VERASE] = CERASE;
1110#ifdef VERASE2
1111 tio->c_cc[VERASE2] = CERASE2;
1112#endif
1113 tio->c_cc[VKILL] = CKILL;
1114 tio->c_cc[VSTART] = CSTART;
1115 tio->c_cc[VSTOP] = CSTOP;
1116 tio->c_cc[VSUSP] = CSUSP;
1117# ifdef VDSUSP
1118 tio->c_cc[VDSUSP] = CDSUSP;
1119# endif
1120# ifdef VREPRINT
1121 tio->c_cc[VREPRINT] = CRPRNT;
1122# endif
1123# ifdef VDISCRD
1124 tio->c_cc[VDISCRD] = CFLUSH;
1125# endif
1126# ifdef VWERSE
1127 tio->c_cc[VWERSE] = CWERASE;
1128# endif
1129# ifdef VLNEXT
1130 tio->c_cc[VLNEXT] = CLNEXT;
1131# endif
1132 }
1133
1134 tio->c_cc[VEOF] = CEOF;
1135 tio->c_cc[VEOL] = VDISABLE;
1136# ifdef VEOL2
1137 tio->c_cc[VEOL2] = VDISABLE;
1138# endif
1139# ifdef VSWTC
1140 tio->c_cc[VSWTC] = VDISABLE;
1141# endif
1142# ifdef VSWTCH
1143 tio->c_cc[VSWTCH] = VDISABLE;
1144# endif
1145# if VMIN != VEOF
1146 tio->c_cc[VMIN] = 1;
1147# endif
1148# if VTIME != VEOL
1149 tio->c_cc[VTIME] = 0;
1150# endif
1151
1152 if (erase != -1)
1153 tio->c_cc[VERASE] = (char)erase;
1154
1155 /* input modes */
1156 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1157# ifdef IMAXBEL
1158 | IMAXBEL
1159# endif
1160 | IXON);
1161
1162 /* output modes */
1163 tio->c_oflag = (OPOST | ONLCR);
1164
1165 /* control modes */
1166 tio->c_cflag = (CS8 | CREAD);
1167
1168 /* line discipline modes */
1169 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1170# if defined (ECHOCTL) && defined (ECHOKE)
1171 | ECHOCTL | ECHOKE
1172# endif
1173 | ECHOE | ECHOK);
1174# else /* HAVE_TERMIOS_H */
1175
1176 /*
1177 * sgtty interface
1178 */
1179
1180 /* get parameters -- gtty */
1181 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1182 {
1183 tio->sg.sg_erase = CERASE; /* ^H */
1184 tio->sg.sg_kill = CKILL; /* ^U */
1185 }
1186
1187 if (erase != -1)
1188 tio->sg.sg_erase = (char)erase;
1189
1190 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1191
1192 /* get special characters */
1193 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1194 {
1195 tio->tc.t_intrc = CINTR; /* ^C */
1196 tio->tc.t_quitc = CQUIT; /* ^\ */
1197 tio->tc.t_startc = CSTART; /* ^Q */
1198 tio->tc.t_stopc = CSTOP; /* ^S */
1199 tio->tc.t_eofc = CEOF; /* ^D */
1200 tio->tc.t_brkc = -1;
1201 }
1202
1203 /* get local special chars */
1204 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1205 {
1206 tio->lc.t_suspc = CSUSP; /* ^Z */
1207 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1208 tio->lc.t_rprntc = CRPRNT; /* ^R */
1209 tio->lc.t_flushc = CFLUSH; /* ^O */
1210 tio->lc.t_werasc = CWERASE; /* ^W */
1211 tio->lc.t_lnextc = CLNEXT; /* ^V */
1212 }
1213 /* get line discipline */
1214 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1215# ifdef NTTYDISC
1216 tio->line = NTTYDISC;
1217# endif /* NTTYDISC */
1218
1219 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1220#endif /* HAVE_TERMIOS_H */
1221
1222 /*
1223 * Debugging
1224 */
1225#ifdef DEBUG_TTYMODE
1226#ifdef HAVE_TERMIOS_H
1227 /* c_iflag bits */
1228 fprintf (stderr, "Input flags\n");
1229
1230 /* cpp token stringize doesn't work on all machines <sigh> */
1231# define FOO(flag,name) \
1232 if ((tio->c_iflag) & flag) \
1233 fprintf (stderr, "%s ", name)
1234
1235 /* c_iflag bits */
1236 FOO (IGNBRK, "IGNBRK");
1237 FOO (BRKINT, "BRKINT");
1238 FOO (IGNPAR, "IGNPAR");
1239 FOO (PARMRK, "PARMRK");
1240 FOO (INPCK, "INPCK");
1241 FOO (ISTRIP, "ISTRIP");
1242 FOO (INLCR, "INLCR");
1243 FOO (IGNCR, "IGNCR");
1244 FOO (ICRNL, "ICRNL");
1245 FOO (IXON, "IXON");
1246 FOO (IXOFF, "IXOFF");
1247# ifdef IUCLC
1248 FOO (IUCLC, "IUCLC");
1249# endif
1250# ifdef IXANY
1251 FOO (IXANY, "IXANY");
1252# endif
1253# ifdef IMAXBEL
1254 FOO (IMAXBEL, "IMAXBEL");
1255# endif
1256
1257 fprintf (stderr, "\n");
1258
1259# undef FOO
1260# define FOO(entry, name) \
1261 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1262
1263 FOO (VINTR, "VINTR");
1264 FOO (VQUIT, "VQUIT");
1265 FOO (VERASE, "VERASE");
1266 FOO (VKILL, "VKILL");
1267 FOO (VEOF, "VEOF");
1268 FOO (VEOL, "VEOL");
1269# ifdef VEOL2
1270 FOO (VEOL2, "VEOL2");
1271# endif
1272# ifdef VSWTC
1273 FOO (VSWTC, "VSWTC");
1274# endif
1275# ifdef VSWTCH
1276 FOO (VSWTCH, "VSWTCH");
1277# endif
1278 FOO (VSTART, "VSTART");
1279 FOO (VSTOP, "VSTOP");
1280 FOO (VSUSP, "VSUSP");
1281# ifdef VDSUSP
1282 FOO (VDSUSP, "VDSUSP");
1283# endif
1284# ifdef VREPRINT
1285 FOO (VREPRINT, "VREPRINT");
1286# endif
1287# ifdef VDISCRD
1288 FOO (VDISCRD, "VDISCRD");
1289# endif
1290# ifdef VWERSE
1291 FOO (VWERSE, "VWERSE");
1292# endif
1293# ifdef VLNEXT
1294 FOO (VLNEXT, "VLNEXT");
1295# endif
1296
1297 fprintf (stderr, "\n");
1298# undef FOO
1299# endif /* HAVE_TERMIOS_H */
1300#endif /* DEBUG_TTYMODE */
1301} 1507}
1302 1508
1303/*----------------------------------------------------------------------*/ 1509/*----------------------------------------------------------------------*/
1304/* 1510/*
1305 * Run the command in a subprocess and return a file descriptor for the 1511 * Run the command in a subprocess and return a file descriptor for the
… …
1326 else 1532 else
1327#endif 1533#endif
1328 if (!pty->get ()) 1534 if (!pty->get ())
1329 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1330 1536
1537 struct termios tio = def_tio;
1538
1539#ifndef NO_BACKSPACE_KEY
1540 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1541 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1542 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1543 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1544#endif
1545
1546 /* init terminal attributes */
1547 cfsetospeed (&tio, BAUDRATE);
1548 cfsetispeed (&tio, BAUDRATE);
1549 tcsetattr (pty->tty, TCSANOW, &tio);
1331 pty->set_utf8_mode (enc_utf8); 1550 pty->set_utf8_mode (enc_utf8);
1332 1551
1333 /* set initial window size */ 1552 /* set initial window size */
1334 tt_winch (); 1553 tt_winch ();
1335
1336 int er;
1337
1338#ifndef NO_BACKSPACE_KEY
1339 if (key_backspace[0] && !key_backspace[1])
1340 er = key_backspace[0];
1341 else if (strcmp (key_backspace, "DEC") == 0)
1342 er = '\177'; /* the initial state anyway */
1343 else
1344#endif
1345 er = -1;
1346
1347 rxvt_get_ttymode (&tio, er);
1348 1554
1349#if ENABLE_FRILLS 1555#if ENABLE_FRILLS
1350 if (rs[Rs_pty_fd]) 1556 if (rs[Rs_pty_fd])
1351 return; 1557 return;
1352#endif 1558#endif
… …
1383 } 1589 }
1384 1590
1385 _exit (EXIT_FAILURE); 1591 _exit (EXIT_FAILURE);
1386 1592
1387 default: 1593 default:
1388 if (!OPTION (Opt_utmpInhibit)) 1594 if (!option (Opt_utmpInhibit))
1389 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1595 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1390 1596
1391 pty->close_tty (); 1597 pty->close_tty ();
1392 1598
1393 child_ev.start (cmd_pid); 1599 child_ev.start (cmd_pid);
1394 1600
… …
1407int 1613int
1408rxvt_term::run_child (const char *const *argv) 1614rxvt_term::run_child (const char *const *argv)
1409{ 1615{
1410 char *login; 1616 char *login;
1411 1617
1412 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1413
1414 if (OPTION (Opt_console)) 1618 if (option (Opt_console))
1619 {
1415 { /* be virtual console, fail silently */ 1620 /* be virtual console, fail silently */
1416#ifdef TIOCCONS 1621#ifdef TIOCCONS
1417 unsigned int on = 1; 1622 unsigned int on = 1;
1418 1623
1419 ioctl (STDIN_FILENO, TIOCCONS, &on); 1624 ioctl (STDIN_FILENO, TIOCCONS, &on);
1420#elif defined (SRIOCSREDIR) 1625#elif defined (SRIOCSREDIR)
… …
1422 1627
1423 fd = open (CONSOLE, O_WRONLY, 0); 1628 fd = open (CONSOLE, O_WRONLY, 0);
1424 if (fd >= 0) 1629 if (fd >= 0)
1425 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1630 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1426 close (fd); 1631 close (fd);
1427#endif /* SRIOCSREDIR */ 1632#endif /* SRIOCSREDIR */
1428 } 1633 }
1429 1634
1430 /* reset signals and spin off the command interpreter */ 1635 /* reset signals and spin off the command interpreter */
1431 signal (SIGINT, SIG_DFL); 1636 signal (SIGINT, SIG_DFL);
1432 signal (SIGQUIT, SIG_DFL); 1637 signal (SIGQUIT, SIG_DFL);
1433 signal (SIGCHLD, SIG_DFL); 1638 signal (SIGCHLD, SIG_DFL);
1434 signal (SIGHUP, SIG_DFL); 1639 signal (SIGHUP, SIG_DFL);
1435 signal (SIGPIPE, SIG_DFL); 1640 signal (SIGPIPE, SIG_DFL);
1436 /* 1641 /*
1437 * mimick login's behavior by disabling the job control signals 1642 * mimic login's behavior by disabling the job control signals
1438 * a shell that wants them can turn them back on 1643 * a shell that wants them can turn them back on
1439 */ 1644 */
1440#ifdef SIGTSTP 1645#ifdef SIGTSTP
1441 signal (SIGTSTP, SIG_IGN); 1646 signal (SIGTSTP, SIG_IGN);
1442 signal (SIGTTIN, SIG_IGN); 1647 signal (SIGTTIN, SIG_IGN);
1443 signal (SIGTTOU, SIG_IGN); 1648 signal (SIGTTOU, SIG_IGN);
1444#endif /* SIGTSTP */ 1649#endif /* SIGTSTP */
1445
1446 // unblock signals (signals are blocked by iom.C
1447 sigset_t ss;
1448 sigemptyset (&ss);
1449 sigprocmask (SIG_SETMASK, &ss, 0);
1450 1650
1451 /* command interpreter path */ 1651 /* command interpreter path */
1452 if (argv != NULL) 1652 if (argv)
1453 { 1653 {
1454# ifdef DEBUG_CMD 1654# ifdef DEBUG_CMD
1455 int i; 1655 int i;
1456 1656
1457 for (i = 0; argv[i]; i++) 1657 for (i = 0; argv[i]; i++)
… …
1466 const char *argv0, *shell; 1666 const char *argv0, *shell;
1467 1667
1468 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1668 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1469 shell = "/bin/sh"; 1669 shell = "/bin/sh";
1470 1670
1471 argv0 = (const char *)rxvt_r_basename (shell); 1671 argv0 = rxvt_basename (shell);
1472 1672
1473 if (OPTION (Opt_loginShell)) 1673 if (option (Opt_loginShell))
1474 { 1674 {
1475 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1675 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1476 1676
1477 login[0] = '-'; 1677 login[0] = '-';
1478 strcpy (&login[1], argv0); 1678 strcpy (&login[1], argv0);
1479 argv0 = login; 1679 argv0 = login;
1480 } 1680 }
1481 1681
1482 execlp (shell, argv0, NULL); 1682 execlp (shell, argv0, (char *)0);
1483 /* no error message: STDERR is closed! */ 1683 /* no error message: STDERR is closed! */
1484 } 1684 }
1485 1685
1486 return -1; 1686 return -1;
1487} 1687}

Diff Legend

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