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.172 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.297 by sf-exg, Mon Aug 15 11:01:54 2011 UTC

… …
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 <schmorp@schmorp.de>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
42 44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
147
43const char *const def_colorName[] = 148static const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "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 -e 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")) 574 if (!strcmp (argv[r_argc], "-e"))
267 break; 575 break;
268 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 }
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
302 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
303 xa = display->xa; 616 xa = display->xa;
304 617
618 set (display);
619 extract_resources ();
620
305#if XFT 621#if XFT
306 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 624#endif
310 set (display);
311
312 extract_resources ();
313 625
314 free (r_argv); 626 free (r_argv);
315 627
316 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
… …
334 * set any defaults not already set 646 * set any defaults not already set
335 */ 647 */
336 if (cmd_argv && cmd_argv[0]) 648 if (cmd_argv && cmd_argv[0])
337 { 649 {
338 if (!rs[Rs_title]) 650 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 651 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
652
340 if (!rs[Rs_iconName]) 653 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 654 rs[Rs_iconName] = rs[Rs_title];
342 } 655 }
343 else 656 else
344 { 657 {
345 if (!rs[Rs_title]) 658 if (!rs[Rs_title])
346 rs[Rs_title] = rs[Rs_name]; 659 rs[Rs_title] = rs[Rs_name];
660
347 if (!rs[Rs_iconName]) 661 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_name]; 662 rs[Rs_iconName] = rs[Rs_name];
349 } 663 }
350 664
351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 665 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 672 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 673 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
360 674
361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 675 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
362 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 676 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
677
678 if (rs[Rs_letterSpace])
679 letterSpace = atoi (rs[Rs_letterSpace]);
363#endif 680#endif
364 681
365#ifdef POINTER_BLANK 682#ifdef POINTER_BLANK
366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
367 pointerBlankDelay = i; 684 pointerBlankDelay = i;
… …
371 688
372 /* no point having a scrollbar without having any scrollback! */ 689 /* no point having a scrollbar without having any scrollback! */
373 if (!saveLines) 690 if (!saveLines)
374 set_option (Opt_scrollBar, 0); 691 set_option (Opt_scrollBar, 0);
375 692
376#ifdef PRINTPIPE
377 if (!rs[Rs_print_pipe])
378 rs[Rs_print_pipe] = PRINTPIPE;
379#endif
380
381 if (!rs[Rs_cutchars]) 693 if (!rs[Rs_cutchars])
382 rs[Rs_cutchars] = CUTCHARS; 694 rs[Rs_cutchars] = CUTCHARS;
383 695
384#ifndef NO_BACKSPACE_KEY 696#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 697 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 698# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 699 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 700# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 701 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 702# 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 703#endif
399 704
400#ifndef NO_DELETE_KEY 705#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 706 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 707# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 708 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 709# else
405 key_delete = "\033[3~"; 710 rs[Rs_delete_key] = "\033[3~";
406# endif 711# 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 712#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 713
421#ifdef HAVE_SCROLLBARS 714 scrollBar.setup (this);
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif
424 715
425#ifdef XTERM_REVERSE_VIDEO 716#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 717 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 718 if (option (Opt_reverseVideo))
428 { 719 {
429 if (!rs[Rs_color + Color_fg]) 720 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 721 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 722
432 if (!rs[Rs_color + Color_bg]) 723 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 729 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 730 rs[Rs_color + i] = def_colorName[i];
440 731
441#ifndef XTERM_REVERSE_VIDEO 732#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 733 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 734 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 735 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 736#endif
446 737
447 /* convenient aliases for setting fg/bg to colors */ 738 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 739 color_aliases (Color_fg);
449 color_aliases (Color_bg); 740 color_aliases (Color_bg);
450#ifndef NO_CURSORCOLOR 741#ifndef NO_CURSORCOLOR
451 color_aliases (Color_cursor); 742 color_aliases (Color_cursor);
452 color_aliases (Color_cursor2); 743 color_aliases (Color_cursor2);
453#endif /* NO_CURSORCOLOR */ 744#endif /* NO_CURSORCOLOR */
454 color_aliases (Color_pointer_fg); 745 color_aliases (Color_pointer_fg);
455 color_aliases (Color_pointer_bg); 746 color_aliases (Color_pointer_bg);
456 color_aliases (Color_border); 747 color_aliases (Color_border);
457#ifndef NO_BOLD_UNDERLINE_REVERSE 748#ifndef NO_BOLD_UNDERLINE_REVERSE
458 color_aliases (Color_BD); 749 color_aliases (Color_BD);
459 color_aliases (Color_UL); 750 color_aliases (Color_UL);
460 color_aliases (Color_RV); 751 color_aliases (Color_RV);
461#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 752#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
462 753
463 if (!rs[Rs_color + Color_border]) 754 if (!rs[Rs_color + Color_border])
464 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 755 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
465 756
466 return cmd_argv; 757 return cmd_argv;
758}
759
760/*----------------------------------------------------------------------*/
761void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
763{
764 this->envv = envv;
765
766 SET_R (this);
767 set_locale ("");
768 set_environ (envv); // a few things in X do not call setlocale :(
769
770 init_vars ();
771
772 const char **cmd_argv = init_resources (argc, argv);
773
774#ifdef KEYSYM_RESOURCE
775 keyboard->register_done ();
776#endif
777
778 if (const char *path = rs[Rs_chdir])
779 if (*path) // ignored if empty
780 {
781 if (*path != '/')
782 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
783
784 if (chdir (path))
785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
786 }
787
788 if (option (Opt_scrollBar))
789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
790
791 pty = ptytty::create ();
792
793 create_windows (argc, argv);
794
795 init_xlocale ();
796
797 scr_poweron (); // initialize screen
798
799#if 0
800 XSynchronize (dpy, True);
801#endif
802
803 if (option (Opt_scrollBar))
804 scrollBar.resize (); /* create and map scrollbar */
805#ifdef HAVE_BG_PIXMAP
806 {
807 bg_init ();
808
809#ifdef ENABLE_TRANSPARENCY
810 if (option (Opt_transparent))
811 {
812 bg_set_transparent ();
813
814 if (rs [Rs_blurradius])
815 bg_set_blur (rs [Rs_blurradius]);
816
817 if (ISSET_PIXCOLOR (Color_tint))
818 bg_set_tint (pix_colors_focused [Color_tint]);
819
820 if (rs [Rs_shade])
821 bg_set_shade (rs [Rs_shade]);
822
823 bg_set_root_pixmap ();
824 XSelectInput (dpy, display->root, PropertyChangeMask);
825 rootwin_ev.start (display, display->root);
826 }
827#endif
828
829#ifdef BG_IMAGE_FROM_FILE
830 if (rs[Rs_backgroundPixmap])
831 {
832 const char *p = rs[Rs_backgroundPixmap];
833
834 if ((p = strchr (p, ';')) != 0)
835 {
836 p++;
837 bg_set_geometry (p);
838 }
839 else
840 bg_set_default_geometry ();
841
842 if (bg_set_file (rs[Rs_backgroundPixmap]))
843 if (!bg_window_position_sensitive ())
844 update_background ();
845 }
846#endif
847 }
848#endif
849
850#if ENABLE_PERL
851 rootwin_ev.start (display, display->root);
852#endif
853
854 set_colorfgbg ();
855
856 init_command (cmd_argv);
857
858 free (cmd_argv);
859
860 if (pty->pty >= 0)
861 pty_ev.start (pty->pty, ev::READ);
862
863 HOOK_INVOKE ((this, HOOK_START, DT_END));
864
865#if ENABLE_XEMBED
866 if (rs[Rs_embed])
867 {
868 long info[2] = { 0, XEMBED_MAPPED };
869
870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
871 32, PropModeReplace, (unsigned char *)&info, 2);
872 }
873#endif
874
875 XMapWindow (dpy, vt);
876 XMapWindow (dpy, parent);
877
878 refresh_check ();
467} 879}
468 880
469/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
470void 882void
471rxvt_term::init_env () 883rxvt_term::init_env ()
472{ 884{
473 int i;
474 unsigned int u;
475 char *val; 885 char *val;
476 886
477#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 888 /* 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 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
487 */ 897 */
488 val = rxvt_network_display (rs[Rs_display_name]); 898 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 899 rs[Rs_display_name] = (const char *)val;
490 900
491 if (val == NULL) 901 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 902#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
494 904
495 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
497 907
498 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
500 909
501 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
502 911
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
504 913
505 /* add entries to the environment: 914 /* add entries to the environment:
506 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
507 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
508 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
… …
525 else 934 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 935 putenv ("COLORTERM=" COLORTERMENVFULL);
527 936
528 if (rs[Rs_term_name] != NULL) 937 if (rs[Rs_term_name] != NULL)
529 { 938 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 939 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 940 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 941 putenv (env_term);
533 } 942 }
534 else 943 else
535 putenv ("TERM=" TERMENV); 944 putenv ("TERM=" TERMENV);
… …
537#ifdef HAVE_UNSETENV 946#ifdef HAVE_UNSETENV
538 /* avoid passing old settings and confusing term size */ 947 /* avoid passing old settings and confusing term size */
539 unsetenv ("LINES"); 948 unsetenv ("LINES");
540 unsetenv ("COLUMNS"); 949 unsetenv ("COLUMNS");
541 unsetenv ("TERMCAP"); /* terminfo should be okay */ 950 unsetenv ("TERMCAP"); /* terminfo should be okay */
542#endif /* HAVE_UNSETENV */ 951#endif /* HAVE_UNSETENV */
543} 952}
544 953
545/*----------------------------------------------------------------------*/ 954/*----------------------------------------------------------------------*/
546/* 955/*
547 * This is more or less stolen straight from XFree86 xterm. 956 * This is more or less stolen straight from XFree86 xterm.
… …
568 977
569 this->locale = "C"; 978 this->locale = "C";
570 } 979 }
571 980
572 981
573 this->locale = rxvt_strdup (this->locale); 982 this->locale = strdup (this->locale);
574 SET_LOCALE (this->locale); 983 SET_LOCALE (this->locale);
575 mbstate.reset (); 984 mbstate.reset ();
576#endif 985#endif
577 986
578#if HAVE_NL_LANGINFO 987#if HAVE_NL_LANGINFO
… …
622 * Initialize the command connection. 1031 * Initialize the command connection.
623 * This should be called after the X server connection is established. 1032 * This should be called after the X server connection is established.
624 */ 1033 */
625 1034
626#ifdef META8_OPTION 1035#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1036 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 1037#endif
629 1038
630 get_ourmods (); 1039 get_ourmods ();
631 1040
632 if (!OPTION (Opt_scrollTtyOutput)) 1041 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 1042 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 1043 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 1044 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 1045 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 1046 priv_modes |= PrivMode_smoothScroll;
638 1047
639#ifndef NO_BACKSPACE_KEY 1048#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 1049 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 1050 priv_modes |= PrivMode_HaveBackSpace;
642#endif 1051#endif
643 1052
644 /* add value for scrollBar */ 1053 /* add value for scrollBar */
645 if (scrollBar.state) 1054 if (scrollBar.state)
… …
651 run_command (argv); 1060 run_command (argv);
652} 1061}
653 1062
654/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
655void 1064void
656rxvt_term::Get_Colours () 1065rxvt_term::get_colours ()
657{ 1066{
658 int i; 1067 int i;
659 1068
660#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
661 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
662#endif 1071#endif
663 1072
664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
665 { 1074 {
666 const char *name = rs[Rs_color + i]; 1075 const char *name = rs[Rs_color + i];
667 1076
668 if (!name) 1077 if (!name)
… …
671 rxvt_color xcol; 1080 rxvt_color xcol;
672 1081
673 if (!set_color (xcol, name)) 1082 if (!set_color (xcol, name))
674 { 1083 {
675#ifndef XTERM_REVERSE_VIDEO 1084#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 1085 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 1086 name = def_colorName [1 - i];
678 else 1087 else
679#endif 1088#endif
680 name = def_colorName [i]; 1089 name = def_colorName [i];
681 1090
… …
721 * get scrollBar shadow colors 1130 * get scrollBar shadow colors
722 * 1131 *
723 * The calculations of topShadow/bottomShadow values are adapted 1132 * The calculations of topShadow/bottomShadow values are adapted
724 * from the fvwm window manager. 1133 * from the fvwm window manager.
725 */ 1134 */
726#ifdef KEEP_SCROLLCOLOR 1135#ifdef RXVT_SCROLLBAR
727 if (depth <= 2) 1136 if (depth <= 2)
728 { 1137 {
729 /* Monochrome */ 1138 /* Monochrome */
730 alias_color (Color_scroll, Color_fg); 1139 alias_color (Color_scroll, Color_fg);
731 alias_color (Color_topShadow, Color_bg); 1140 alias_color (Color_topShadow, Color_bg);
… …
746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1155 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
747 cscroll.a) 1156 cscroll.a)
748 )) 1157 ))
749 alias_color (Color_topShadow, Color_White); 1158 alias_color (Color_topShadow, Color_White);
750 } 1159 }
751#endif /* KEEP_SCROLLCOLOR */ 1160#endif
752 1161
753#ifdef OFF_FOCUS_FADING 1162#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1163 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 1164 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 1165#endif
762} 1166}
763 1167
764/*----------------------------------------------------------------------*/ 1168/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 1169/* color aliases, fg/bg bright-bold */
… …
769 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1173 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
770 { 1174 {
771 int i = atoi (rs[Rs_color + idx]); 1175 int i = atoi (rs[Rs_color + idx]);
772 1176
773 if (i >= 8 && i <= 15) 1177 if (i >= 8 && i <= 15)
774 { /* bright colors */ 1178 /* bright colors */
775 i -= 8;
776 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1179 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
777 return; 1180 else if (i >= 0 && i <= 7)
778 } 1181 /* normal colors */
779
780 if (i >= 0 && i <= 7) /* normal colors */
781 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1182 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
782 } 1183 }
783} 1184}
784 1185
785/*----------------------------------------------------------------------*/ 1186/*----------------------------------------------------------------------*/
… …
869 1270
870 if (i) 1271 if (i)
871 ModMetaMask = modmasks[i - 1]; 1272 ModMetaMask = modmasks[i - 1];
872} 1273}
873 1274
1275void
1276rxvt_term::set_icon (const char *file)
1277{
1278#ifdef HAVE_AFTERIMAGE
1279 init_asv ();
1280
1281 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1282 if (!im)
1283 {
1284 rxvt_warn ("Loading image icon failed, continuing without.\n");
1285 return;
1286 }
1287
1288 unsigned int w = im->width;
1289 unsigned int h = im->height;
1290
1291 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1292 {
1293 rxvt_warn ("Icon image too big, continuing without.\n");
1294 destroy_asimage (&im);
1295 return;
1296 }
1297
1298 ASImage *result = scale_asimage (asv, im,
1299 w, h, ASA_ARGB32,
1300 100, ASIMAGE_QUALITY_DEFAULT);
1301 destroy_asimage (&im);
1302
1303 if (!result)
1304 {
1305 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1306 return;
1307 }
1308
1309 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1310 if (buffer)
1311 {
1312 ARGB32 *asbuf = result->alt.argb32;
1313 buffer [0] = w;
1314 buffer [1] = h;
1315
1316 for (unsigned int i = 0; i < w * h; ++i)
1317 buffer [i + 2] = asbuf [i];
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 destroy_asimage (&result);
1327#endif
1328
1329#ifdef HAVE_PIXBUF
1330 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf)
1332 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return;
1335 }
1336
1337 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1338 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1339
1340 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1341 {
1342 rxvt_warn ("Icon image too big, continuing without.\n");
1343 g_object_unref (pixbuf);
1344 return;
1345 }
1346
1347 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1348 {
1349 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1350 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1351 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1352
1353 buffer [0] = w;
1354 buffer [1] = h;
1355 for (int i = 0; i < h; i++)
1356 {
1357 for (int j = 0; j < w; j++)
1358 {
1359 unsigned char *pixel = row + j * channels;
1360 long value;
1361
1362 if (channels == 4)
1363 value = pixel[3];
1364 else
1365 value = (unsigned char)0x00ff;
1366
1367 value = (value << 8) + pixel[0];
1368 value = (value << 8) + pixel[1];
1369 value = (value << 8) + pixel[2];
1370 buffer[(i * w + j) + 2] = value;
1371 }
1372
1373 row += rowstride;
1374 }
1375
1376 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1377 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1378 free (buffer);
1379 }
1380 else
1381 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1382
1383 g_object_unref (pixbuf);
1384#endif
1385}
1386
874/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
875/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
876void 1389void
877rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
878{ 1391{
879 XClassHint classHint; 1392 XClassHint classHint;
880 XWMHints wmHint; 1393 XWMHints wmHint;
881#if ENABLE_FRILLS 1394#if ENABLE_FRILLS
882 MWMHints mwmhints; 1395 MWMHints mwmhints = { };
883#endif 1396#endif
884 XGCValues gcvalue; 1397 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 1398 XSetWindowAttributes attributes;
886 Window top, parent; 1399 Window top, parent;
887 1400
888 dLocal (Display *, dpy); 1401 dLocal (Display *, dpy);
889 1402
890 /* grab colors before netscape does */ 1403 /* grab colors before netscape does */
891 Get_Colours (); 1404 get_colours ();
892 1405
893 if (!set_fonts ()) 1406 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1407 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 1408
896 parent = display->root; 1409 parent = display->root;
897 1410
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1411 attributes.override_redirect = !!option (Opt_override_redirect);
899 1412
900#if ENABLE_FRILLS 1413#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 1414 if (option (Opt_borderLess))
902 { 1415 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1416 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 1417 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1418 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 1419 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 1420 }
909 else 1421 else
910 { 1422 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 1423 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 1424 }
914 } 1425 }
915 else
916 mwmhints.flags = 0;
917#endif 1426#endif
918 1427
919#if ENABLE_XEMBED 1428#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 1429 if (rs[Rs_embed])
921 { 1430 {
… …
930 } 1439 }
931#endif 1440#endif
932 1441
933 window_calc (0, 0); 1442 window_calc (0, 0);
934 1443
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
936 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
939 1448
940 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
943 ext_bwidth, 1452 ext_bwidth,
944 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
946 &attributes); 1455 &attributes);
947 1456
948 this->parent[0] = top; 1457 this->parent = top;
949 1458
950 old_width = szHint.width; 1459 old_width = szHint.width;
951 old_height = szHint.height; 1460 old_height = szHint.height;
952 1461
953 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1462 set_title (rs [Rs_title]);
954 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1463 set_icon_name (rs [Rs_iconName]);
955 1464
956 classHint.res_name = (char *)rs[Rs_name]; 1465 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 1466 classHint.res_class = (char *)RESCLASS;
958 1467
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1468 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 1469 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1470 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 1471 wmHint.window_group = top;
963 1472
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 1474 &szHint, &wmHint, &classHint);
1475#if ENABLE_EWMH
1476 /*
1477 * set up icon hint
1478 * rs [Rs_iconfile] is path to icon
1479 */
1480
1481 if (rs [Rs_iconfile])
1482 {
1483 set_icon (rs [Rs_iconfile]);
1484 }
1485#endif
966 1486
967#if ENABLE_FRILLS 1487#if ENABLE_FRILLS
968 if (mwmhints.flags) 1488 if (mwmhints.flags)
969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1489 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1490 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
975#if ENABLE_EWMH 1495#if ENABLE_EWMH
976 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
977#endif 1497#endif
978 }; 1498 };
979 1499
980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
981 1501
982#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
983 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
985#endif 1505#endif
… …
1004 1524
1005 termwin_ev.start (display, top); 1525 termwin_ev.start (display, top);
1006 1526
1007 /* vt cursor: Black-on-White is standard, but this is more popular */ 1527 /* vt cursor: Black-on-White is standard, but this is more popular */
1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1528 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1009
1010#ifdef HAVE_SCROLLBARS
1011 /* cursor scrollBar: Black-on-White */
1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1013#endif
1014 1529
1015 /* the vt window */ 1530 /* the vt window */
1016 vt = XCreateSimpleWindow (dpy, top, 1531 vt = XCreateSimpleWindow (dpy, top,
1017 window_vt_x, window_vt_y, 1532 window_vt_x, window_vt_y,
1018 width, height, 1533 width, height,
… …
1023 attributes.bit_gravity = NorthWestGravity; 1538 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1539 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1540
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1541 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1542
1028 if (OPTION (Opt_pointerBlank)) 1543 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1544 vt_emask |= PointerMotionMask;
1030 else 1545 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1546 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1547
1033 vt_select_input (); 1548 vt_select_input ();
1034 1549
1035 vt_ev.start (display, vt); 1550 vt_ev.start (display, vt);
1036
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 1551
1054 /* graphics context for the vt window */ 1552 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1553 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1554 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1555 gcvalue.graphics_exposures = 0;
… …
1060 GCForeground | GCBackground | GCGraphicsExposures, 1558 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1559 &gcvalue);
1062 1560
1063 drawable = new rxvt_drawable (this, vt); 1561 drawable = new rxvt_drawable (this, vt);
1064 1562
1065#ifdef RXVT_SCROLLBAR
1066 gcvalue.foreground = pix_colors[Color_topShadow];
1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072#endif
1073
1074#ifdef OFF_FOCUS_FADING 1563#ifdef OFF_FOCUS_FADING
1075 // initially we are in unfocused state 1564 // initially we are in unfocused state
1076 if (rs[Rs_fade]) 1565 if (rs[Rs_fade])
1077 pix_colors = pix_colors_unfocused; 1566 pix_colors = pix_colors_unfocused;
1078#endif 1567#endif
1079 1568
1080 pointer_unblank (); 1569 pointer_unblank ();
1081 scr_recolour (); 1570 scr_recolour ();
1082}
1083
1084/* ------------------------------------------------------------------------- *
1085 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */
1087void
1088rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{
1090#ifdef HAVE_TERMIOS_H
1091 /*
1092 * standard System V termios interface
1093 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 {
1096 // return error - use system defaults,
1097 // where possible, and zero elsewhere
1098 memset (tio, 0, sizeof (ttymode_t));
1099
1100 tio->c_cc[VINTR] = CINTR;
1101 tio->c_cc[VQUIT] = CQUIT;
1102 tio->c_cc[VERASE] = CERASE;
1103#ifdef VERASE2
1104 tio->c_cc[VERASE2] = CERASE2;
1105#endif
1106 tio->c_cc[VKILL] = CKILL;
1107 tio->c_cc[VSTART] = CSTART;
1108 tio->c_cc[VSTOP] = CSTOP;
1109 tio->c_cc[VSUSP] = CSUSP;
1110# ifdef VDSUSP
1111 tio->c_cc[VDSUSP] = CDSUSP;
1112# endif
1113# ifdef VREPRINT
1114 tio->c_cc[VREPRINT] = CRPRNT;
1115# endif
1116# ifdef VDISCRD
1117 tio->c_cc[VDISCRD] = CFLUSH;
1118# endif
1119# ifdef VWERSE
1120 tio->c_cc[VWERSE] = CWERASE;
1121# endif
1122# ifdef VLNEXT
1123 tio->c_cc[VLNEXT] = CLNEXT;
1124# endif
1125 }
1126
1127 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
1139 tio->c_cc[VMIN] = 1;
1140# endif
1141# if VTIME != VEOL
1142 tio->c_cc[VTIME] = 0;
1143# endif
1144
1145 if (erase != -1)
1146 tio->c_cc[VERASE] = (char)erase;
1147
1148 /* input modes */
1149 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1150# ifdef IMAXBEL
1151 | IMAXBEL
1152# endif
1153 | IXON);
1154
1155 /* output modes */
1156 tio->c_oflag = (OPOST | ONLCR);
1157
1158 /* control modes */
1159 tio->c_cflag = (CS8 | CREAD);
1160
1161 /* line discipline modes */
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE
1165# endif
1166 | 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
1215 /*
1216 * Debugging
1217 */
1218#ifdef DEBUG_TTYMODE
1219#ifdef HAVE_TERMIOS_H
1220 /* c_iflag bits */
1221 fprintf (stderr, "Input flags\n");
1222
1223 /* cpp token stringize doesn't work on all machines <sigh> */
1224# define FOO(flag,name) \
1225 if ((tio->c_iflag) & flag) \
1226 fprintf (stderr, "%s ", name)
1227
1228 /* c_iflag bits */
1229 FOO (IGNBRK, "IGNBRK");
1230 FOO (BRKINT, "BRKINT");
1231 FOO (IGNPAR, "IGNPAR");
1232 FOO (PARMRK, "PARMRK");
1233 FOO (INPCK, "INPCK");
1234 FOO (ISTRIP, "ISTRIP");
1235 FOO (INLCR, "INLCR");
1236 FOO (IGNCR, "IGNCR");
1237 FOO (ICRNL, "ICRNL");
1238 FOO (IXON, "IXON");
1239 FOO (IXOFF, "IXOFF");
1240# ifdef IUCLC
1241 FOO (IUCLC, "IUCLC");
1242# endif
1243# ifdef IXANY
1244 FOO (IXANY, "IXANY");
1245# endif
1246# ifdef IMAXBEL
1247 FOO (IMAXBEL, "IMAXBEL");
1248# endif
1249
1250 fprintf (stderr, "\n");
1251
1252# undef FOO
1253# define FOO(entry, name) \
1254 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1255
1256 FOO (VINTR, "VINTR");
1257 FOO (VQUIT, "VQUIT");
1258 FOO (VERASE, "VERASE");
1259 FOO (VKILL, "VKILL");
1260 FOO (VEOF, "VEOF");
1261 FOO (VEOL, "VEOL");
1262# ifdef VEOL2
1263 FOO (VEOL2, "VEOL2");
1264# endif
1265# ifdef VSWTC
1266 FOO (VSWTC, "VSWTC");
1267# endif
1268# ifdef VSWTCH
1269 FOO (VSWTCH, "VSWTCH");
1270# endif
1271 FOO (VSTART, "VSTART");
1272 FOO (VSTOP, "VSTOP");
1273 FOO (VSUSP, "VSUSP");
1274# ifdef VDSUSP
1275 FOO (VDSUSP, "VDSUSP");
1276# endif
1277# ifdef VREPRINT
1278 FOO (VREPRINT, "VREPRINT");
1279# endif
1280# ifdef VDISCRD
1281 FOO (VDISCRD, "VDISCRD");
1282# endif
1283# ifdef VWERSE
1284 FOO (VWERSE, "VWERSE");
1285# endif
1286# ifdef VLNEXT
1287 FOO (VLNEXT, "VLNEXT");
1288# endif
1289
1290 fprintf (stderr, "\n");
1291# undef FOO
1292# endif /* HAVE_TERMIOS_H */
1293#endif /* DEBUG_TTYMODE */
1294} 1571}
1295 1572
1296/*----------------------------------------------------------------------*/ 1573/*----------------------------------------------------------------------*/
1297/* 1574/*
1298 * Run the command in a subprocess and return a file descriptor for the 1575 * Run the command in a subprocess and return a file descriptor for the
… …
1319 else 1596 else
1320#endif 1597#endif
1321 if (!pty->get ()) 1598 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1600
1601 struct termios tio = def_tio;
1602
1603#ifndef NO_BACKSPACE_KEY
1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1605 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1606 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1607 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1608#endif
1609
1610 /* init terminal attributes */
1611 cfsetospeed (&tio, BAUDRATE);
1612 cfsetispeed (&tio, BAUDRATE);
1613 tcsetattr (pty->tty, TCSANOW, &tio);
1324 pty->set_utf8_mode (enc_utf8); 1614 pty->set_utf8_mode (enc_utf8);
1325 1615
1326 /* set initial window size */ 1616 /* set initial window size */
1327 tt_winch (); 1617 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 1618
1342#if ENABLE_FRILLS 1619#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1620 if (rs[Rs_pty_fd])
1344 return; 1621 return;
1345#endif 1622#endif
… …
1376 } 1653 }
1377 1654
1378 _exit (EXIT_FAILURE); 1655 _exit (EXIT_FAILURE);
1379 1656
1380 default: 1657 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1658 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1659 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1660
1384 pty->close_tty (); 1661 pty->close_tty ();
1385 1662
1386 child_ev.start (cmd_pid); 1663 child_ev.start (cmd_pid);
1387 1664
… …
1400int 1677int
1401rxvt_term::run_child (const char *const *argv) 1678rxvt_term::run_child (const char *const *argv)
1402{ 1679{
1403 char *login; 1680 char *login;
1404 1681
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1682 if (option (Opt_console))
1683 {
1408 { /* be virtual console, fail silently */ 1684 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1685#ifdef TIOCCONS
1410 unsigned int on = 1; 1686 unsigned int on = 1;
1411 1687
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1688 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1689#elif defined (SRIOCSREDIR)
… …
1415 1691
1416 fd = open (CONSOLE, O_WRONLY, 0); 1692 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1693 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1694 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419 close (fd); 1695 close (fd);
1420#endif /* SRIOCSREDIR */ 1696#endif /* SRIOCSREDIR */
1421 } 1697 }
1422 1698
1423 /* reset signals and spin off the command interpreter */ 1699 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1700 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1701 signal (SIGQUIT, SIG_DFL);
1426 signal (SIGCHLD, SIG_DFL); 1702 signal (SIGCHLD, SIG_DFL);
1427 signal (SIGHUP, SIG_DFL); 1703 signal (SIGHUP, SIG_DFL);
1428 signal (SIGPIPE, SIG_DFL); 1704 signal (SIGPIPE, SIG_DFL);
1429 /* 1705 /*
1430 * mimick login's behavior by disabling the job control signals 1706 * mimic login's behavior by disabling the job control signals
1431 * a shell that wants them can turn them back on 1707 * a shell that wants them can turn them back on
1432 */ 1708 */
1433#ifdef SIGTSTP 1709#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1710 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1711 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1712 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1713#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 1714
1444 /* command interpreter path */ 1715 /* command interpreter path */
1445 if (argv != NULL) 1716 if (argv)
1446 { 1717 {
1447# ifdef DEBUG_CMD 1718# ifdef DEBUG_CMD
1448 int i; 1719 int i;
1449 1720
1450 for (i = 0; argv[i]; i++) 1721 for (i = 0; argv[i]; i++)
… …
1459 const char *argv0, *shell; 1730 const char *argv0, *shell;
1460 1731
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1732 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1733 shell = "/bin/sh";
1463 1734
1464 argv0 = (const char *)rxvt_r_basename (shell); 1735 argv0 = rxvt_basename (shell);
1465 1736
1466 if (OPTION (Opt_loginShell)) 1737 if (option (Opt_loginShell))
1467 { 1738 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1739 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1740
1470 login[0] = '-'; 1741 login[0] = '-';
1471 strcpy (&login[1], argv0); 1742 strcpy (&login[1], argv0);
1472 argv0 = login; 1743 argv0 = login;
1473 } 1744 }
1474 1745
1475 execlp (shell, argv0, NULL); 1746 execlp (shell, argv0, (char *)0);
1476 /* no error message: STDERR is closed! */ 1747 /* no error message: STDERR is closed! */
1477 } 1748 }
1478 1749
1479 return -1; 1750 return -1;
1480} 1751}

Diff Legend

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