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.289 by root, Mon Jan 3 03:05:47 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 <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>
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 is probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69
70#include <netinet/in.h>
71#include <arpa/inet.h>
72#include <net/if.h>
73#include <net/if_arp.h>
74
75static char *
76rxvt_network_display (const char *display)
77{
78 char buffer[1024], *rval = NULL;
79 struct ifconf ifc;
80 struct ifreq *ifr;
81 int i, skfd;
82
83 if (display[0] != ':' && strncmp (display, "unix:", 5))
84 return (char *) display; /* nothing to do */
85
86 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
87 ifc.ifc_buf = buffer;
88
89 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
90 {
91 perror ("socket");
92 return NULL;
93 }
94
95 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
96 {
97 perror ("SIOCGIFCONF");
98 close (skfd);
99 return NULL;
100 }
101
102 for (i = 0, ifr = ifc.ifc_req;
103 i < (ifc.ifc_len / sizeof (struct ifreq));
104 i++, ifr++)
105 {
106 struct ifreq ifr2;
107
108 strcpy (ifr2.ifr_name, ifr->ifr_name);
109
110 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
111 {
112 unsigned long addr;
113 struct sockaddr_in *p_addr;
114
115 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
116 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
117
118 /*
119 * not "0.0.0.0" or "127.0.0.1" - so format the address
120 */
121 if (addr && addr != 0x7F000001)
122 {
123 char *colon = strchr (display, ':');
124
125 if (colon == NULL)
126 colon = ":0.0";
127
128 rval = rxvt_malloc (strlen (colon) + 16);
129 sprintf (rval, "%d.%d.%d.%d%s",
130 (int) ((addr >> 030) & 0xFF),
131 (int) ((addr >> 020) & 0xFF),
132 (int) ((addr >> 010) & 0xFF),
133 (int) (addr & 0xFF), colon);
134 break;
135 }
136 }
137 }
138
139 close (skfd);
140
141 return rval;
142}
143#endif
144
43const char *const def_colorName[] = 145static const char *const def_colorName[] =
44 { 146 {
45 COLOR_FOREGROUND, 147 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 148 COLOR_BACKGROUND,
47 /* low-intensity colors */ 149 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 150 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 151 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 152 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 153 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 154 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 155 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 156 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 157# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 158 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 159# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 160 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 161# endif
60 /* high-intensity colors */ 162 /* high-intensity colors */
61# ifdef XTERM_COLORS 163# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 164 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 171 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 172 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 173 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 174 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 175
176#if !USE_256_COLORS
74 // 88 xterm colours 177 // 88 xterm colours
75 "rgb:00/00/00", 178 "rgb:00/00/00",
76 "rgb:00/00/8b", 179 "rgb:00/00/8b",
77 "rgb:00/00/cd", 180 "rgb:00/00/cd",
78 "rgb:00/00/ff", 181 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 245 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 246 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 247 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 248 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 249 "rgb:e7/e7/e7",
250#else
251 // 256 xterm colours
252 "rgb:00/00/00",
253 "rgb:00/00/5f",
254 "rgb:00/00/87",
255 "rgb:00/00/af",
256 "rgb:00/00/d7",
257 "rgb:00/00/ff",
258 "rgb:00/5f/00",
259 "rgb:00/5f/5f",
260 "rgb:00/5f/87",
261 "rgb:00/5f/af",
262 "rgb:00/5f/d7",
263 "rgb:00/5f/ff",
264 "rgb:00/87/00",
265 "rgb:00/87/5f",
266 "rgb:00/87/87",
267 "rgb:00/87/af",
268 "rgb:00/87/d7",
269 "rgb:00/87/ff",
270 "rgb:00/af/00",
271 "rgb:00/af/5f",
272 "rgb:00/af/87",
273 "rgb:00/af/af",
274 "rgb:00/af/d7",
275 "rgb:00/af/ff",
276 "rgb:00/d7/00",
277 "rgb:00/d7/5f",
278 "rgb:00/d7/87",
279 "rgb:00/d7/af",
280 "rgb:00/d7/d7",
281 "rgb:00/d7/ff",
282 "rgb:00/ff/00",
283 "rgb:00/ff/5f",
284 "rgb:00/ff/87",
285 "rgb:00/ff/af",
286 "rgb:00/ff/d7",
287 "rgb:00/ff/ff",
288 "rgb:5f/00/00",
289 "rgb:5f/00/5f",
290 "rgb:5f/00/87",
291 "rgb:5f/00/af",
292 "rgb:5f/00/d7",
293 "rgb:5f/00/ff",
294 "rgb:5f/5f/00",
295 "rgb:5f/5f/5f",
296 "rgb:5f/5f/87",
297 "rgb:5f/5f/af",
298 "rgb:5f/5f/d7",
299 "rgb:5f/5f/ff",
300 "rgb:5f/87/00",
301 "rgb:5f/87/5f",
302 "rgb:5f/87/87",
303 "rgb:5f/87/af",
304 "rgb:5f/87/d7",
305 "rgb:5f/87/ff",
306 "rgb:5f/af/00",
307 "rgb:5f/af/5f",
308 "rgb:5f/af/87",
309 "rgb:5f/af/af",
310 "rgb:5f/af/d7",
311 "rgb:5f/af/ff",
312 "rgb:5f/d7/00",
313 "rgb:5f/d7/5f",
314 "rgb:5f/d7/87",
315 "rgb:5f/d7/af",
316 "rgb:5f/d7/d7",
317 "rgb:5f/d7/ff",
318 "rgb:5f/ff/00",
319 "rgb:5f/ff/5f",
320 "rgb:5f/ff/87",
321 "rgb:5f/ff/af",
322 "rgb:5f/ff/d7",
323 "rgb:5f/ff/ff",
324 "rgb:87/00/00",
325 "rgb:87/00/5f",
326 "rgb:87/00/87",
327 "rgb:87/00/af",
328 "rgb:87/00/d7",
329 "rgb:87/00/ff",
330 "rgb:87/5f/00",
331 "rgb:87/5f/5f",
332 "rgb:87/5f/87",
333 "rgb:87/5f/af",
334 "rgb:87/5f/d7",
335 "rgb:87/5f/ff",
336 "rgb:87/87/00",
337 "rgb:87/87/5f",
338 "rgb:87/87/87",
339 "rgb:87/87/af",
340 "rgb:87/87/d7",
341 "rgb:87/87/ff",
342 "rgb:87/af/00",
343 "rgb:87/af/5f",
344 "rgb:87/af/87",
345 "rgb:87/af/af",
346 "rgb:87/af/d7",
347 "rgb:87/af/ff",
348 "rgb:87/d7/00",
349 "rgb:87/d7/5f",
350 "rgb:87/d7/87",
351 "rgb:87/d7/af",
352 "rgb:87/d7/d7",
353 "rgb:87/d7/ff",
354 "rgb:87/ff/00",
355 "rgb:87/ff/5f",
356 "rgb:87/ff/87",
357 "rgb:87/ff/af",
358 "rgb:87/ff/d7",
359 "rgb:87/ff/ff",
360 "rgb:af/00/00",
361 "rgb:af/00/5f",
362 "rgb:af/00/87",
363 "rgb:af/00/af",
364 "rgb:af/00/d7",
365 "rgb:af/00/ff",
366 "rgb:af/5f/00",
367 "rgb:af/5f/5f",
368 "rgb:af/5f/87",
369 "rgb:af/5f/af",
370 "rgb:af/5f/d7",
371 "rgb:af/5f/ff",
372 "rgb:af/87/00",
373 "rgb:af/87/5f",
374 "rgb:af/87/87",
375 "rgb:af/87/af",
376 "rgb:af/87/d7",
377 "rgb:af/87/ff",
378 "rgb:af/af/00",
379 "rgb:af/af/5f",
380 "rgb:af/af/87",
381 "rgb:af/af/af",
382 "rgb:af/af/d7",
383 "rgb:af/af/ff",
384 "rgb:af/d7/00",
385 "rgb:af/d7/5f",
386 "rgb:af/d7/87",
387 "rgb:af/d7/af",
388 "rgb:af/d7/d7",
389 "rgb:af/d7/ff",
390 "rgb:af/ff/00",
391 "rgb:af/ff/5f",
392 "rgb:af/ff/87",
393 "rgb:af/ff/af",
394 "rgb:af/ff/d7",
395 "rgb:af/ff/ff",
396 "rgb:d7/00/00",
397 "rgb:d7/00/5f",
398 "rgb:d7/00/87",
399 "rgb:d7/00/af",
400 "rgb:d7/00/d7",
401 "rgb:d7/00/ff",
402 "rgb:d7/5f/00",
403 "rgb:d7/5f/5f",
404 "rgb:d7/5f/87",
405 "rgb:d7/5f/af",
406 "rgb:d7/5f/d7",
407 "rgb:d7/5f/ff",
408 "rgb:d7/87/00",
409 "rgb:d7/87/5f",
410 "rgb:d7/87/87",
411 "rgb:d7/87/af",
412 "rgb:d7/87/d7",
413 "rgb:d7/87/ff",
414 "rgb:d7/af/00",
415 "rgb:d7/af/5f",
416 "rgb:d7/af/87",
417 "rgb:d7/af/af",
418 "rgb:d7/af/d7",
419 "rgb:d7/af/ff",
420 "rgb:d7/d7/00",
421 "rgb:d7/d7/5f",
422 "rgb:d7/d7/87",
423 "rgb:d7/d7/af",
424 "rgb:d7/d7/d7",
425 "rgb:d7/d7/ff",
426 "rgb:d7/ff/00",
427 "rgb:d7/ff/5f",
428 "rgb:d7/ff/87",
429 "rgb:d7/ff/af",
430 "rgb:d7/ff/d7",
431 "rgb:d7/ff/ff",
432 "rgb:ff/00/00",
433 "rgb:ff/00/5f",
434 "rgb:ff/00/87",
435 "rgb:ff/00/af",
436 "rgb:ff/00/d7",
437 "rgb:ff/00/ff",
438 "rgb:ff/5f/00",
439 "rgb:ff/5f/5f",
440 "rgb:ff/5f/87",
441 "rgb:ff/5f/af",
442 "rgb:ff/5f/d7",
443 "rgb:ff/5f/ff",
444 "rgb:ff/87/00",
445 "rgb:ff/87/5f",
446 "rgb:ff/87/87",
447 "rgb:ff/87/af",
448 "rgb:ff/87/d7",
449 "rgb:ff/87/ff",
450 "rgb:ff/af/00",
451 "rgb:ff/af/5f",
452 "rgb:ff/af/87",
453 "rgb:ff/af/af",
454 "rgb:ff/af/d7",
455 "rgb:ff/af/ff",
456 "rgb:ff/d7/00",
457 "rgb:ff/d7/5f",
458 "rgb:ff/d7/87",
459 "rgb:ff/d7/af",
460 "rgb:ff/d7/d7",
461 "rgb:ff/d7/ff",
462 "rgb:ff/ff/00",
463 "rgb:ff/ff/5f",
464 "rgb:ff/ff/87",
465 "rgb:ff/ff/af",
466 "rgb:ff/ff/d7",
467 "rgb:ff/ff/ff",
468 "rgb:08/08/08",
469 "rgb:12/12/12",
470 "rgb:1c/1c/1c",
471 "rgb:26/26/26",
472 "rgb:30/30/30",
473 "rgb:3a/3a/3a",
474 "rgb:44/44/44",
475 "rgb:4e/4e/4e",
476 "rgb:58/58/58",
477 "rgb:62/62/62",
478 "rgb:6c/6c/6c",
479 "rgb:76/76/76",
480 "rgb:80/80/80",
481 "rgb:8a/8a/8a",
482 "rgb:94/94/94",
483 "rgb:9e/9e/9e",
484 "rgb:a8/a8/a8",
485 "rgb:b2/b2/b2",
486 "rgb:bc/bc/bc",
487 "rgb:c6/c6/c6",
488 "rgb:d0/d0/d0",
489 "rgb:da/da/da",
490 "rgb:e4/e4/e4",
491 "rgb:ee/ee/ee",
492#endif
147 493
148#ifndef NO_CURSORCOLOR 494#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 495 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 496 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 497#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 498 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 499 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 500 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 501#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 502 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 503 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 504 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 505 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 506#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 507#if ENABLE_FRILLS
162 NULL, // Color_underline 508 NULL, // Color_underline
163#endif 509#endif
164#ifdef OPTION_HC 510#ifdef OPTION_HC
165 NULL, 511 NULL,
512 NULL,
166#endif 513#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 514 COLOR_SCROLLBAR,
515#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 516 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 517#endif
171#if TINTING 518#if ENABLE_TRANSPARENCY
172 NULL, 519 NULL,
173#endif 520#endif
174#if OFF_FOCUS_FADING 521#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 522 "rgb:00/00/00",
176#endif 523#endif
177 }; 524 };
178 525
179bool 526void
180rxvt_term::init_vars () 527rxvt_term::init_vars ()
181{ 528{
182 pix_colors = // 529 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 530
192 MEvent.time = CurrentTime; 531 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 532 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 533 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 534 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 535 ncol = 80;
198 nrow = 24; 536 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 537 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 538 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 539 lineSpace = LINESPACE;
540 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 541 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 542
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 543 refresh_type = SLOW_REFRESH;
207 544
208 oldcursor.row = oldcursor.col = -1; 545 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 546
215 last_bot = last_state = -1; 547 set_option (Opt_scrollBar);
216 548 set_option (Opt_scrollTtyOutput);
217 return true; 549 set_option (Opt_jumpScroll);
218} 550 set_option (Opt_skipScroll);
219 551 set_option (Opt_secondaryScreen);
220void 552 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 553 set_option (Opt_pastableTabs);
222{ 554 set_option (Opt_intensityStyles);
223 int i; 555 set_option (Opt_iso14755);
224 556 set_option (Opt_iso14755_52);
225 /* 557 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} 558}
253 559
254/*----------------------------------------------------------------------*/ 560/*----------------------------------------------------------------------*/
255const char ** 561const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 562rxvt_term::init_resources (int argc, const char *const *argv)
257{ 563{
258 int i, r_argc; 564 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 565 const char **cmd_argv, **r_argv;
261 566
262 /* 567 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 568 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 569 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 570 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 571 if (!strcmp (argv[r_argc], "-e"))
267 break; 572 break;
268 573
574 if (r_argc == argc)
575 cmd_argv = NULL;
576 else if (!argv[r_argc + 1])
577 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
578 else
579 {
580 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
581
582 for (i = 0; i < argc - r_argc - 1; i++)
583 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
584
585 cmd_argv[i] = NULL;
586 }
587
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 588 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 589
271 for (i = 0; i < r_argc; i++) 590 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 591 r_argv[i] = (const char *)argv[i];
273 592
274 r_argv[i] = NULL; 593 r_argv[i] = NULL;
275 594
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]); 595 rs[Rs_name] = rxvt_basename (argv[0]);
289 596
290 /* 597 /*
291 * Open display, get options/resources and create the window 598 * Open display, get options/resources and create the window
292 */ 599 */
293 600
… …
295 rs[Rs_display_name] = ":0"; 602 rs[Rs_display_name] = ":0";
296 603
297 get_options (r_argc, r_argv); 604 get_options (r_argc, r_argv);
298 605
299 if (!(display = displays.get (rs[Rs_display_name]))) 606 if (!(display = displays.get (rs[Rs_display_name])))
607 {
608 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 609 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
610 }
301 611
302 // using a local pointer decreases code size a lot 612 // using a local pointer decreases code size a lot
303 xa = display->xa; 613 xa = display->xa;
304 614
615 set (display);
616 extract_resources ();
617
305#if XFT 618#if XFT
306 if (rs[Rs_depth]) 619 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 620 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 621#endif
310 set (display);
311
312 extract_resources ();
313 622
314 free (r_argv); 623 free (r_argv);
315 624
316 for (int i = NUM_RESOURCES; i--; ) 625 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 626 if (rs [i] == resval_undef)
318 rs [i] = 0; 627 rs [i] = 0;
628
629#ifdef HAVE_AFTERIMAGE
630 set_application_name ((char *)rs[Rs_name]);
631 set_output_threshold (OUTPUT_LEVEL_WARNING);
632#endif
633
634#ifdef HAVE_PIXBUF
635 g_type_init ();
636#endif
319 637
320#if ENABLE_PERL 638#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1]) 639 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default"; 640 rs[Rs_perl_ext_1] = "default";
323 641
… …
334 * set any defaults not already set 652 * set any defaults not already set
335 */ 653 */
336 if (cmd_argv && cmd_argv[0]) 654 if (cmd_argv && cmd_argv[0])
337 { 655 {
338 if (!rs[Rs_title]) 656 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 657 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
658
340 if (!rs[Rs_iconName]) 659 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 660 rs[Rs_iconName] = rs[Rs_title];
342 } 661 }
343 else 662 else
344 { 663 {
345 if (!rs[Rs_title]) 664 if (!rs[Rs_title])
346 rs[Rs_title] = rs[Rs_name]; 665 rs[Rs_title] = rs[Rs_name];
666
347 if (!rs[Rs_iconName]) 667 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_name]; 668 rs[Rs_iconName] = rs[Rs_name];
349 } 669 }
350 670
351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 671 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 678 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 679 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
360 680
361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 681 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
362 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 682 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
683
684 if (rs[Rs_letterSpace])
685 letterSpace = atoi (rs[Rs_letterSpace]);
363#endif 686#endif
364 687
365#ifdef POINTER_BLANK 688#ifdef POINTER_BLANK
366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 689 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
367 pointerBlankDelay = i; 690 pointerBlankDelay = i;
… …
371 694
372 /* no point having a scrollbar without having any scrollback! */ 695 /* no point having a scrollbar without having any scrollback! */
373 if (!saveLines) 696 if (!saveLines)
374 set_option (Opt_scrollBar, 0); 697 set_option (Opt_scrollBar, 0);
375 698
376#ifdef PRINTPIPE
377 if (!rs[Rs_print_pipe])
378 rs[Rs_print_pipe] = PRINTPIPE;
379#endif
380
381 if (!rs[Rs_cutchars]) 699 if (!rs[Rs_cutchars])
382 rs[Rs_cutchars] = CUTCHARS; 700 rs[Rs_cutchars] = CUTCHARS;
383 701
384#ifndef NO_BACKSPACE_KEY 702#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 703 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 704# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 705 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 706# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 707 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 708# 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 709#endif
399 710
400#ifndef NO_DELETE_KEY 711#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 712 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 713# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 714 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 715# else
405 key_delete = "\033[3~"; 716 rs[Rs_delete_key] = "\033[3~";
406# endif 717# 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 718#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 719
421#ifdef HAVE_SCROLLBARS 720 scrollBar.setup (this);
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif
424 721
425#ifdef XTERM_REVERSE_VIDEO 722#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 723 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 724 if (option (Opt_reverseVideo))
428 { 725 {
429 if (!rs[Rs_color + Color_fg]) 726 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 727 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 728
432 if (!rs[Rs_color + Color_bg]) 729 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 735 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 736 rs[Rs_color + i] = def_colorName[i];
440 737
441#ifndef XTERM_REVERSE_VIDEO 738#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 739 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 740 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 741 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 742#endif
446 743
447 /* convenient aliases for setting fg/bg to colors */ 744 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 745 color_aliases (Color_fg);
449 color_aliases (Color_bg); 746 color_aliases (Color_bg);
450#ifndef NO_CURSORCOLOR 747#ifndef NO_CURSORCOLOR
451 color_aliases (Color_cursor); 748 color_aliases (Color_cursor);
452 color_aliases (Color_cursor2); 749 color_aliases (Color_cursor2);
453#endif /* NO_CURSORCOLOR */ 750#endif /* NO_CURSORCOLOR */
454 color_aliases (Color_pointer_fg); 751 color_aliases (Color_pointer_fg);
455 color_aliases (Color_pointer_bg); 752 color_aliases (Color_pointer_bg);
456 color_aliases (Color_border); 753 color_aliases (Color_border);
457#ifndef NO_BOLD_UNDERLINE_REVERSE 754#ifndef NO_BOLD_UNDERLINE_REVERSE
458 color_aliases (Color_BD); 755 color_aliases (Color_BD);
459 color_aliases (Color_UL); 756 color_aliases (Color_UL);
460 color_aliases (Color_RV); 757 color_aliases (Color_RV);
461#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 758#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
462 759
463 if (!rs[Rs_color + Color_border]) 760 if (!rs[Rs_color + Color_border])
464 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 761 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
465 762
466 return cmd_argv; 763 return cmd_argv;
764}
765
766/*----------------------------------------------------------------------*/
767void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
769{
770 this->envv = envv;
771
772 SET_R (this);
773 set_locale ("");
774 set_environ (envv); // a few things in X do not call setlocale :(
775
776 init_vars ();
777
778 const char **cmd_argv = init_resources (argc, argv);
779
780#ifdef KEYSYM_RESOURCE
781 keyboard->register_done ();
782#endif
783
784 if (const char *path = rs[Rs_chdir])
785 if (*path) // ignored if empty
786 {
787 if (*path != '/')
788 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
789
790 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 }
793
794 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
796
797 pty = ptytty::create ();
798
799 create_windows (argc, argv);
800
801 init_xlocale ();
802
803 scr_poweron (); // initialize screen
804
805#if 0
806 XSynchronize (dpy, True);
807#endif
808
809 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP
812 {
813 bgPixmap.set_target (this);
814 bgPixmap.invalidate ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bgPixmap.set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823
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 ();
467} 886}
468 887
469/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
470void 889void
471rxvt_term::init_env () 890rxvt_term::init_env ()
472{ 891{
473 int i;
474 unsigned int u;
475 char *val; 892 char *val;
476 893
477#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 895 /* 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 896 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
487 */ 904 */
488 val = rxvt_network_display (rs[Rs_display_name]); 905 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 906 rs[Rs_display_name] = (const char *)val;
490 907
491 if (val == NULL) 908 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 909#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (dpy); 910 val = XDisplayString (dpy);
494 911
495 if (rs[Rs_display_name] == NULL) 912 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 913 rs[Rs_display_name] = val; /* use broken `:0' value */
497 914
498 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
500 916
501 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
502 918
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 920
… …
525 else 941 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 942 putenv ("COLORTERM=" COLORTERMENVFULL);
527 943
528 if (rs[Rs_term_name] != NULL) 944 if (rs[Rs_term_name] != NULL)
529 { 945 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 946 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 947 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 948 putenv (env_term);
533 } 949 }
534 else 950 else
535 putenv ("TERM=" TERMENV); 951 putenv ("TERM=" TERMENV);
… …
537#ifdef HAVE_UNSETENV 953#ifdef HAVE_UNSETENV
538 /* avoid passing old settings and confusing term size */ 954 /* avoid passing old settings and confusing term size */
539 unsetenv ("LINES"); 955 unsetenv ("LINES");
540 unsetenv ("COLUMNS"); 956 unsetenv ("COLUMNS");
541 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
542#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
543} 959}
544 960
545/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
546/* 962/*
547 * This is more or less stolen straight from XFree86 xterm. 963 * This is more or less stolen straight from XFree86 xterm.
… …
568 984
569 this->locale = "C"; 985 this->locale = "C";
570 } 986 }
571 987
572 988
573 this->locale = rxvt_strdup (this->locale); 989 this->locale = strdup (this->locale);
574 SET_LOCALE (this->locale); 990 SET_LOCALE (this->locale);
575 mbstate.reset (); 991 mbstate.reset ();
576#endif 992#endif
577 993
578#if HAVE_NL_LANGINFO 994#if HAVE_NL_LANGINFO
… …
622 * Initialize the command connection. 1038 * Initialize the command connection.
623 * This should be called after the X server connection is established. 1039 * This should be called after the X server connection is established.
624 */ 1040 */
625 1041
626#ifdef META8_OPTION 1042#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1043 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 1044#endif
629 1045
630 get_ourmods (); 1046 get_ourmods ();
631 1047
632 if (!OPTION (Opt_scrollTtyOutput)) 1048 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 1049 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 1050 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 1051 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 1052 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 1053 priv_modes |= PrivMode_smoothScroll;
638 1054
639#ifndef NO_BACKSPACE_KEY 1055#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 1056 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 1057 priv_modes |= PrivMode_HaveBackSpace;
642#endif 1058#endif
643 1059
644 /* add value for scrollBar */ 1060 /* add value for scrollBar */
645 if (scrollBar.state) 1061 if (scrollBar.state)
… …
651 run_command (argv); 1067 run_command (argv);
652} 1068}
653 1069
654/*----------------------------------------------------------------------*/ 1070/*----------------------------------------------------------------------*/
655void 1071void
656rxvt_term::Get_Colours () 1072rxvt_term::get_colours ()
657{ 1073{
658 int i; 1074 int i;
659 1075
660#ifdef OFF_FOCUS_FADING 1076#ifdef OFF_FOCUS_FADING
661 pix_colors = pix_colors_focused; 1077 pix_colors = pix_colors_focused;
662#endif 1078#endif
663 1079
664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1080 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
665 { 1081 {
666 const char *name = rs[Rs_color + i]; 1082 const char *name = rs[Rs_color + i];
667 1083
668 if (!name) 1084 if (!name)
… …
671 rxvt_color xcol; 1087 rxvt_color xcol;
672 1088
673 if (!set_color (xcol, name)) 1089 if (!set_color (xcol, name))
674 { 1090 {
675#ifndef XTERM_REVERSE_VIDEO 1091#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 1092 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 1093 name = def_colorName [1 - i];
678 else 1094 else
679#endif 1095#endif
680 name = def_colorName [i]; 1096 name = def_colorName [i];
681 1097
… …
721 * get scrollBar shadow colors 1137 * get scrollBar shadow colors
722 * 1138 *
723 * The calculations of topShadow/bottomShadow values are adapted 1139 * The calculations of topShadow/bottomShadow values are adapted
724 * from the fvwm window manager. 1140 * from the fvwm window manager.
725 */ 1141 */
726#ifdef KEEP_SCROLLCOLOR 1142#ifdef RXVT_SCROLLBAR
727 if (depth <= 2) 1143 if (depth <= 2)
728 { 1144 {
729 /* Monochrome */ 1145 /* Monochrome */
730 alias_color (Color_scroll, Color_fg); 1146 alias_color (Color_scroll, Color_fg);
731 alias_color (Color_topShadow, Color_bg); 1147 alias_color (Color_topShadow, Color_bg);
… …
746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1162 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
747 cscroll.a) 1163 cscroll.a)
748 )) 1164 ))
749 alias_color (Color_topShadow, Color_White); 1165 alias_color (Color_topShadow, Color_White);
750 } 1166 }
751#endif /* KEEP_SCROLLCOLOR */ 1167#endif
752 1168
753#ifdef OFF_FOCUS_FADING 1169#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1170 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 1171 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 1172#endif
762} 1173}
763 1174
764/*----------------------------------------------------------------------*/ 1175/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 1176/* color aliases, fg/bg bright-bold */
… …
769 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1180 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
770 { 1181 {
771 int i = atoi (rs[Rs_color + idx]); 1182 int i = atoi (rs[Rs_color + idx]);
772 1183
773 if (i >= 8 && i <= 15) 1184 if (i >= 8 && i <= 15)
774 { /* bright colors */ 1185 /* bright colors */
775 i -= 8;
776 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1186 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
777 return; 1187 else if (i >= 0 && i <= 7)
778 } 1188 /* normal colors */
779
780 if (i >= 0 && i <= 7) /* normal colors */
781 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1189 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
782 } 1190 }
783} 1191}
784 1192
785/*----------------------------------------------------------------------*/ 1193/*----------------------------------------------------------------------*/
… …
869 1277
870 if (i) 1278 if (i)
871 ModMetaMask = modmasks[i - 1]; 1279 ModMetaMask = modmasks[i - 1];
872} 1280}
873 1281
1282void
1283rxvt_term::set_icon (const char *file)
1284{
1285#ifdef HAVE_AFTERIMAGE
1286 init_asv ();
1287
1288 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1289 if (!im)
1290 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return;
1293 }
1294
1295 unsigned int w = im->width;
1296 unsigned int h = im->height;
1297
1298 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1299 {
1300 rxvt_warn ("Icon image too big, continuing without.\n");
1301 destroy_asimage (&im);
1302 return;
1303 }
1304
1305 ASImage *result = scale_asimage (asv, im,
1306 w, h, ASA_ARGB32,
1307 100, ASIMAGE_QUALITY_DEFAULT);
1308 destroy_asimage (&im);
1309
1310 if (!result)
1311 {
1312 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1313 return;
1314 }
1315
1316 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1317 if (buffer)
1318 {
1319 ARGB32 *asbuf = result->alt.argb32;
1320 buffer [0] = w;
1321 buffer [1] = h;
1322
1323 for (unsigned int i = 0; i < w * h; ++i)
1324 buffer [i + 2] = asbuf [i];
1325
1326 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1327 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1328 free (buffer);
1329 }
1330 else
1331 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1332
1333 destroy_asimage (&result);
1334#endif
1335
1336#ifdef HAVE_PIXBUF
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf)
1339 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n");
1341 return;
1342 }
1343
1344 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1345 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1346
1347 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1348 {
1349 rxvt_warn ("Icon image too big, continuing without.\n");
1350 g_object_unref (pixbuf);
1351 return;
1352 }
1353
1354 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1355 {
1356 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1357 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1358 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1359
1360 buffer [0] = w;
1361 buffer [1] = h;
1362 for (int i = 0; i < h; i++)
1363 {
1364 for (int j = 0; j < w; j++)
1365 {
1366 unsigned char *pixel = row + j * channels;
1367 long value;
1368
1369 if (channels == 4)
1370 value = pixel[3];
1371 else
1372 value = (unsigned char)0x00ff;
1373
1374 value = (value << 8) + pixel[0];
1375 value = (value << 8) + pixel[1];
1376 value = (value << 8) + pixel[2];
1377 buffer[(i * w + j) + 2] = value;
1378 }
1379
1380 row += rowstride;
1381 }
1382
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer);
1386 }
1387 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1389
1390 g_object_unref (pixbuf);
1391#endif
1392}
1393
874/*----------------------------------------------------------------------*/ 1394/*----------------------------------------------------------------------*/
875/* rxvt_Create_Windows () - Open and map the window */ 1395/* rxvt_Create_Windows () - Open and map the window */
876void 1396void
877rxvt_term::create_windows (int argc, const char *const *argv) 1397rxvt_term::create_windows (int argc, const char *const *argv)
878{ 1398{
879 XClassHint classHint; 1399 XClassHint classHint;
880 XWMHints wmHint; 1400 XWMHints wmHint;
881#if ENABLE_FRILLS 1401#if ENABLE_FRILLS
882 MWMHints mwmhints; 1402 MWMHints mwmhints = { };
883#endif 1403#endif
884 XGCValues gcvalue; 1404 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 1405 XSetWindowAttributes attributes;
886 Window top, parent; 1406 Window top, parent;
887 1407
888 dLocal (Display *, dpy); 1408 dLocal (Display *, dpy);
889 1409
890 /* grab colors before netscape does */ 1410 /* grab colors before netscape does */
891 Get_Colours (); 1411 get_colours ();
892 1412
893 if (!set_fonts ()) 1413 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1414 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 1415
896 parent = display->root; 1416 parent = display->root;
897 1417
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1418 attributes.override_redirect = !!option (Opt_override_redirect);
899 1419
900#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 1421 if (option (Opt_borderLess))
902 { 1422 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1423 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 1424 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1425 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 1426 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 1427 }
909 else 1428 else
910 { 1429 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 1430 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 1431 }
914 } 1432 }
915 else
916 mwmhints.flags = 0;
917#endif 1433#endif
918 1434
919#if ENABLE_XEMBED 1435#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 1436 if (rs[Rs_embed])
921 { 1437 {
… …
948 this->parent[0] = top; 1464 this->parent[0] = top;
949 1465
950 old_width = szHint.width; 1466 old_width = szHint.width;
951 old_height = szHint.height; 1467 old_height = szHint.height;
952 1468
953 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1469 set_title (rs [Rs_title]);
954 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1470 set_icon_name (rs [Rs_iconName]);
955 1471
956 classHint.res_name = (char *)rs[Rs_name]; 1472 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 1473 classHint.res_class = (char *)RESCLASS;
958 1474
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1475 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 1476 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1477 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 1478 wmHint.window_group = top;
963 1479
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1480 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 1481 &szHint, &wmHint, &classHint);
1482#if ENABLE_EWMH
1483 /*
1484 * set up icon hint
1485 * rs [Rs_iconfile] is path to icon
1486 */
1487
1488 if (rs [Rs_iconfile])
1489 {
1490 set_icon (rs [Rs_iconfile]);
1491 }
1492#endif
966 1493
967#if ENABLE_FRILLS 1494#if ENABLE_FRILLS
968 if (mwmhints.flags) 1495 if (mwmhints.flags)
969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1496 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1497 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
975#if ENABLE_EWMH 1502#if ENABLE_EWMH
976 xa[XA_NET_WM_PING], 1503 xa[XA_NET_WM_PING],
977#endif 1504#endif
978 }; 1505 };
979 1506
980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
981 1508
982#if ENABLE_FRILLS 1509#if ENABLE_FRILLS
983 if (rs[Rs_transient_for]) 1510 if (rs[Rs_transient_for])
984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
985#endif 1512#endif
… …
1004 1531
1005 termwin_ev.start (display, top); 1532 termwin_ev.start (display, top);
1006 1533
1007 /* vt cursor: Black-on-White is standard, but this is more popular */ 1534 /* vt cursor: Black-on-White is standard, but this is more popular */
1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1535 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 1536
1015 /* the vt window */ 1537 /* the vt window */
1016 vt = XCreateSimpleWindow (dpy, top, 1538 vt = XCreateSimpleWindow (dpy, top,
1017 window_vt_x, window_vt_y, 1539 window_vt_x, window_vt_y,
1018 width, height, 1540 width, height,
… …
1023 attributes.bit_gravity = NorthWestGravity; 1545 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1546 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1547
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1548 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1549
1028 if (OPTION (Opt_pointerBlank)) 1550 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1551 vt_emask |= PointerMotionMask;
1030 else 1552 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1553 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1554
1033 vt_select_input (); 1555 vt_select_input ();
1034 1556
1035 vt_ev.start (display, vt); 1557 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 1558
1054 /* graphics context for the vt window */ 1559 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1560 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1561 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1562 gcvalue.graphics_exposures = 0;
… …
1060 GCForeground | GCBackground | GCGraphicsExposures, 1565 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1566 &gcvalue);
1062 1567
1063 drawable = new rxvt_drawable (this, vt); 1568 drawable = new rxvt_drawable (this, vt);
1064 1569
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 1570#ifdef OFF_FOCUS_FADING
1075 // initially we are in unfocused state 1571 // initially we are in unfocused state
1076 if (rs[Rs_fade]) 1572 if (rs[Rs_fade])
1077 pix_colors = pix_colors_unfocused; 1573 pix_colors = pix_colors_unfocused;
1078#endif 1574#endif
1079 1575
1080 pointer_unblank (); 1576 pointer_unblank ();
1081 scr_recolour (); 1577 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} 1578}
1295 1579
1296/*----------------------------------------------------------------------*/ 1580/*----------------------------------------------------------------------*/
1297/* 1581/*
1298 * Run the command in a subprocess and return a file descriptor for the 1582 * Run the command in a subprocess and return a file descriptor for the
… …
1319 else 1603 else
1320#endif 1604#endif
1321 if (!pty->get ()) 1605 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1606 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1607
1608 struct termios tio = def_tio;
1609
1610#ifndef NO_BACKSPACE_KEY
1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1612 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1613 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1614 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1615#endif
1616
1617 /* init terminal attributes */
1618 cfsetospeed (&tio, BAUDRATE);
1619 cfsetispeed (&tio, BAUDRATE);
1620 tcsetattr (pty->tty, TCSANOW, &tio);
1324 pty->set_utf8_mode (enc_utf8); 1621 pty->set_utf8_mode (enc_utf8);
1325 1622
1326 /* set initial window size */ 1623 /* set initial window size */
1327 tt_winch (); 1624 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 1625
1342#if ENABLE_FRILLS 1626#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1627 if (rs[Rs_pty_fd])
1344 return; 1628 return;
1345#endif 1629#endif
… …
1376 } 1660 }
1377 1661
1378 _exit (EXIT_FAILURE); 1662 _exit (EXIT_FAILURE);
1379 1663
1380 default: 1664 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1665 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1666 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1667
1384 pty->close_tty (); 1668 pty->close_tty ();
1385 1669
1386 child_ev.start (cmd_pid); 1670 child_ev.start (cmd_pid);
1387 1671
… …
1400int 1684int
1401rxvt_term::run_child (const char *const *argv) 1685rxvt_term::run_child (const char *const *argv)
1402{ 1686{
1403 char *login; 1687 char *login;
1404 1688
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1689 if (option (Opt_console))
1690 {
1408 { /* be virtual console, fail silently */ 1691 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1692#ifdef TIOCCONS
1410 unsigned int on = 1; 1693 unsigned int on = 1;
1411 1694
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1695 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1696#elif defined (SRIOCSREDIR)
… …
1415 1698
1416 fd = open (CONSOLE, O_WRONLY, 0); 1699 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1700 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1701 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419 close (fd); 1702 close (fd);
1420#endif /* SRIOCSREDIR */ 1703#endif /* SRIOCSREDIR */
1421 } 1704 }
1422 1705
1423 /* reset signals and spin off the command interpreter */ 1706 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1707 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1708 signal (SIGQUIT, SIG_DFL);
1426 signal (SIGCHLD, SIG_DFL); 1709 signal (SIGCHLD, SIG_DFL);
1427 signal (SIGHUP, SIG_DFL); 1710 signal (SIGHUP, SIG_DFL);
1428 signal (SIGPIPE, SIG_DFL); 1711 signal (SIGPIPE, SIG_DFL);
1429 /* 1712 /*
1430 * mimick login's behavior by disabling the job control signals 1713 * mimic login's behavior by disabling the job control signals
1431 * a shell that wants them can turn them back on 1714 * a shell that wants them can turn them back on
1432 */ 1715 */
1433#ifdef SIGTSTP 1716#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1717 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1718 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1719 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1720#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 1721
1444 /* command interpreter path */ 1722 /* command interpreter path */
1445 if (argv != NULL) 1723 if (argv)
1446 { 1724 {
1447# ifdef DEBUG_CMD 1725# ifdef DEBUG_CMD
1448 int i; 1726 int i;
1449 1727
1450 for (i = 0; argv[i]; i++) 1728 for (i = 0; argv[i]; i++)
… …
1459 const char *argv0, *shell; 1737 const char *argv0, *shell;
1460 1738
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1739 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1740 shell = "/bin/sh";
1463 1741
1464 argv0 = (const char *)rxvt_r_basename (shell); 1742 argv0 = rxvt_basename (shell);
1465 1743
1466 if (OPTION (Opt_loginShell)) 1744 if (option (Opt_loginShell))
1467 { 1745 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1746 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1747
1470 login[0] = '-'; 1748 login[0] = '-';
1471 strcpy (&login[1], argv0); 1749 strcpy (&login[1], argv0);
1472 argv0 = login; 1750 argv0 = login;
1473 } 1751 }
1474 1752
1475 execlp (shell, argv0, NULL); 1753 execlp (shell, argv0, (char *)0);
1476 /* no error message: STDERR is closed! */ 1754 /* no error message: STDERR is closed! */
1477 } 1755 }
1478 1756
1479 return -1; 1757 return -1;
1480} 1758}

Diff Legend

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