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.212 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.280 by sf-exg, Sun Aug 29 17:58:54 2010 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>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
… …
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (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 ENABLE_TRANSPARENCY 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 533
189 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
191 want_refresh = 1; 536 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 538 ncol = 80;
194 nrow = 24; 539 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 544 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 545
201 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
202 547
203 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
204 last_bot = last_state = -1;
205 549
206 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
214 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
215 560 set_option (Opt_buffered);
216 return true;
217}
218
219void
220rxvt_term::init_secondary ()
221{
222 int i;
223
224 /*
225 * Close all unused file descriptors
226 * We don't want them, we don't need them.
227 */
228 if ((i = open ("/dev/null", O_RDONLY)) < 0)
229 {
230 /* TODO: BOO HISS */
231 dup2 (STDERR_FILENO, STDIN_FILENO);
232 }
233 else if (i > STDIN_FILENO)
234 {
235 dup2 (i, STDIN_FILENO);
236 close (i);
237 }
238
239 dup2 (STDERR_FILENO, STDOUT_FILENO);
240
241#if 0 // schmorp sayz closing filies is murder
242 for (i = STDERR_FILENO + 1; i < num_fds; i++)
243 {
244#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
245 if (i == 4 || i == 7)
246 continue;
247#endif
248 close (i);
249 }
250#endif
251} 561}
252 562
253/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
254const char ** 564const char **
255rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
262 */ 572 */
263 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
264 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
265 break; 575 break;
266 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
267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
268 592
269 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
270 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
271 595
272 r_argv[i] = NULL; 596 r_argv[i] = NULL;
273
274 if (r_argc == argc)
275 cmd_argv = NULL;
276 else
277 {
278 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
279
280 for (i = 0; i < argc - r_argc - 1; i++)
281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
282
283 cmd_argv[i] = NULL;
284 }
285 597
286 rs[Rs_name] = rxvt_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
287 599
288 /* 600 /*
289 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
… …
293 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
294 606
295 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
296 608
297 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
298 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 }
299 614
300 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
301 xa = display->xa; 616 xa = display->xa;
302 617
303 set (display); 618 set (display);
… …
306#if XFT 621#if XFT
307 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
308 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
309#endif 624#endif
310 625
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
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)
318 rs [i] = 0; 630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
319 636
320#if ENABLE_PERL 637#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1]) 638 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default"; 639 rs[Rs_perl_ext_1] = "default";
323 640
… …
335 */ 652 */
336 if (cmd_argv && cmd_argv[0]) 653 if (cmd_argv && cmd_argv[0])
337 { 654 {
338 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 656 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
657
340 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 659 rs[Rs_iconName] = rs[Rs_title];
342 } 660 }
343 else 661 else
344 { 662 {
345 if (!rs[Rs_title]) 663 if (!rs[Rs_title])
346 rs[Rs_title] = rs[Rs_name]; 664 rs[Rs_title] = rs[Rs_name];
665
347 if (!rs[Rs_iconName]) 666 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_name]; 667 rs[Rs_iconName] = rs[Rs_name];
349 } 668 }
350 669
351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 670 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 677 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 678 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
360 679
361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 680 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
362 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 681 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
682
683 if (rs[Rs_letterSpace])
684 letterSpace = atoi (rs[Rs_letterSpace]);
363#endif 685#endif
364 686
365#ifdef POINTER_BLANK 687#ifdef POINTER_BLANK
366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
367 pointerBlankDelay = i; 689 pointerBlankDelay = i;
… …
370#endif 692#endif
371 693
372 /* no point having a scrollbar without having any scrollback! */ 694 /* no point having a scrollbar without having any scrollback! */
373 if (!saveLines) 695 if (!saveLines)
374 set_option (Opt_scrollBar, 0); 696 set_option (Opt_scrollBar, 0);
375
376#ifdef PRINTPIPE
377 if (!rs[Rs_print_pipe])
378 rs[Rs_print_pipe] = PRINTPIPE;
379#endif
380 697
381 if (!rs[Rs_cutchars]) 698 if (!rs[Rs_cutchars])
382 rs[Rs_cutchars] = CUTCHARS; 699 rs[Rs_cutchars] = CUTCHARS;
383 700
384#ifndef NO_BACKSPACE_KEY 701#ifndef NO_BACKSPACE_KEY
… …
397# else 714# else
398 rs[Rs_delete_key] = "\033[3~"; 715 rs[Rs_delete_key] = "\033[3~";
399# endif 716# endif
400#endif 717#endif
401 718
402#ifdef HAVE_SCROLLBARS 719 scrollBar.setup (this);
403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
404#endif
405 720
406#ifdef XTERM_REVERSE_VIDEO 721#ifdef XTERM_REVERSE_VIDEO
407 /* this is how xterm implements reverseVideo */ 722 /* this is how xterm implements reverseVideo */
408 if (option (Opt_reverseVideo)) 723 if (option (Opt_reverseVideo))
409 { 724 {
… …
429 color_aliases (Color_fg); 744 color_aliases (Color_fg);
430 color_aliases (Color_bg); 745 color_aliases (Color_bg);
431#ifndef NO_CURSORCOLOR 746#ifndef NO_CURSORCOLOR
432 color_aliases (Color_cursor); 747 color_aliases (Color_cursor);
433 color_aliases (Color_cursor2); 748 color_aliases (Color_cursor2);
434#endif /* NO_CURSORCOLOR */ 749#endif /* NO_CURSORCOLOR */
435 color_aliases (Color_pointer_fg); 750 color_aliases (Color_pointer_fg);
436 color_aliases (Color_pointer_bg); 751 color_aliases (Color_pointer_bg);
437 color_aliases (Color_border); 752 color_aliases (Color_border);
438#ifndef NO_BOLD_UNDERLINE_REVERSE 753#ifndef NO_BOLD_UNDERLINE_REVERSE
439 color_aliases (Color_BD); 754 color_aliases (Color_BD);
440 color_aliases (Color_UL); 755 color_aliases (Color_UL);
441 color_aliases (Color_RV); 756 color_aliases (Color_RV);
442#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 757#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
443 758
444 if (!rs[Rs_color + Color_border]) 759 if (!rs[Rs_color + Color_border])
445 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 760 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
446 761
447 return cmd_argv; 762 return cmd_argv;
763}
764
765/*----------------------------------------------------------------------*/
766void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
768{
769 this->envv = envv;
770
771 SET_R (this);
772 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :(
774
775 init_vars ();
776
777 const char **cmd_argv = init_resources (argc, argv);
778
779#ifdef KEYSYM_RESOURCE
780 keyboard->register_done ();
781#endif
782
783 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty
785 {
786 if (*path != '/')
787 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
788
789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 }
792
793 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bgPixmap.set_target (this);
813 bgPixmap.invalidate ();
814
815#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent))
817 {
818 bgPixmap.set_transparent ();
819
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823#endif
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856
857#if ENABLE_PERL
858 rootwin_ev.start (display, display->root);
859#endif
860
861 set_colorfgbg ();
862
863 init_command (cmd_argv);
864
865 free (cmd_argv);
866
867 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ);
869
870 HOOK_INVOKE ((this, HOOK_START, DT_END));
871
872#if ENABLE_XEMBED
873 if (rs[Rs_embed])
874 {
875 long info[2] = { 0, XEMBED_MAPPED };
876
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2);
879 }
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]);
884
885 refresh_check ();
448} 886}
449 887
450/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
451void 889void
452rxvt_term::init_env () 890rxvt_term::init_env ()
… …
467 */ 905 */
468 val = rxvt_network_display (rs[Rs_display_name]); 906 val = rxvt_network_display (rs[Rs_display_name]);
469 rs[Rs_display_name] = (const char *)val; 907 rs[Rs_display_name] = (const char *)val;
470 908
471 if (val == NULL) 909 if (val == NULL)
472#endif /* DISPLAY_IS_IP */ 910#endif /* DISPLAY_IS_IP */
473 val = XDisplayString (dpy); 911 val = XDisplayString (dpy);
474 912
475 if (rs[Rs_display_name] == NULL) 913 if (rs[Rs_display_name] == NULL)
476 rs[Rs_display_name] = val; /* use broken `:0' value */ 914 rs[Rs_display_name] = val; /* use broken `:0' value */
477 915
… …
517#ifdef HAVE_UNSETENV 955#ifdef HAVE_UNSETENV
518 /* avoid passing old settings and confusing term size */ 956 /* avoid passing old settings and confusing term size */
519 unsetenv ("LINES"); 957 unsetenv ("LINES");
520 unsetenv ("COLUMNS"); 958 unsetenv ("COLUMNS");
521 unsetenv ("TERMCAP"); /* terminfo should be okay */ 959 unsetenv ("TERMCAP"); /* terminfo should be okay */
522#endif /* HAVE_UNSETENV */ 960#endif /* HAVE_UNSETENV */
523} 961}
524 962
525/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
526/* 964/*
527 * This is more or less stolen straight from XFree86 xterm. 965 * This is more or less stolen straight from XFree86 xterm.
… …
548 986
549 this->locale = "C"; 987 this->locale = "C";
550 } 988 }
551 989
552 990
553 this->locale = rxvt_strdup (this->locale); 991 this->locale = strdup (this->locale);
554 SET_LOCALE (this->locale); 992 SET_LOCALE (this->locale);
555 mbstate.reset (); 993 mbstate.reset ();
556#endif 994#endif
557 995
558#if HAVE_NL_LANGINFO 996#if HAVE_NL_LANGINFO
… …
631 run_command (argv); 1069 run_command (argv);
632} 1070}
633 1071
634/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
635void 1073void
636rxvt_term::Get_Colours () 1074rxvt_term::get_colours ()
637{ 1075{
638 int i; 1076 int i;
639 1077
640#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
641 pix_colors = pix_colors_focused; 1079 pix_colors = pix_colors_focused;
642#endif 1080#endif
643 1081
644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
645 { 1083 {
646 const char *name = rs[Rs_color + i]; 1084 const char *name = rs[Rs_color + i];
647 1085
648 if (!name) 1086 if (!name)
… …
701 * get scrollBar shadow colors 1139 * get scrollBar shadow colors
702 * 1140 *
703 * The calculations of topShadow/bottomShadow values are adapted 1141 * The calculations of topShadow/bottomShadow values are adapted
704 * from the fvwm window manager. 1142 * from the fvwm window manager.
705 */ 1143 */
706#ifdef KEEP_SCROLLCOLOR 1144#ifdef RXVT_SCROLLBAR
707 if (depth <= 2) 1145 if (depth <= 2)
708 { 1146 {
709 /* Monochrome */ 1147 /* Monochrome */
710 alias_color (Color_scroll, Color_fg); 1148 alias_color (Color_scroll, Color_fg);
711 alias_color (Color_topShadow, Color_bg); 1149 alias_color (Color_topShadow, Color_bg);
… …
726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
727 cscroll.a) 1165 cscroll.a)
728 )) 1166 ))
729 alias_color (Color_topShadow, Color_White); 1167 alias_color (Color_topShadow, Color_White);
730 } 1168 }
731#endif /* KEEP_SCROLLCOLOR */ 1169#endif
732 1170
733#ifdef OFF_FOCUS_FADING 1171#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
735 update_fade_color (i); 1173 update_fade_color (i);
736#endif 1174#endif
… …
744 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
745 { 1183 {
746 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
747 1185
748 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
749 { /* bright colors */ 1187 /* bright colors */
750 i -= 8;
751 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1188 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
752 return; 1189 else if (i >= 0 && i <= 7)
753 } 1190 /* normal colors */
754
755 if (i >= 0 && i <= 7) /* normal colors */
756 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1191 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
757 } 1192 }
758} 1193}
759 1194
760/*----------------------------------------------------------------------*/ 1195/*----------------------------------------------------------------------*/
… …
844 1279
845 if (i) 1280 if (i)
846 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
847} 1282}
848 1283
1284void
1285rxvt_term::set_icon (const char *file)
1286{
1287#ifdef HAVE_AFTERIMAGE
1288 init_asv ();
1289
1290 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291 if (!im)
1292 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return;
1295 }
1296
1297 int w = im->width;
1298 int h = im->height;
1299
1300 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1301 {
1302 rxvt_warn ("Icon image too big, continuing without.\n");
1303 destroy_asimage (&im);
1304 return;
1305 }
1306
1307 ASImage *result = scale_asimage (asv, im,
1308 w, h, ASA_ARGB32,
1309 100, ASIMAGE_QUALITY_DEFAULT);
1310 destroy_asimage (&im);
1311
1312 if (!result)
1313 {
1314 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1315 return;
1316 }
1317
1318 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1319 if (buffer)
1320 {
1321 ARGB32 *asbuf = result->alt.argb32;
1322 buffer [0] = w;
1323 buffer [1] = h;
1324
1325 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i];
1327
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer);
1331 }
1332 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334
1335 destroy_asimage (&result);
1336#endif
1337}
1338
849/*----------------------------------------------------------------------*/ 1339/*----------------------------------------------------------------------*/
850/* rxvt_Create_Windows () - Open and map the window */ 1340/* rxvt_Create_Windows () - Open and map the window */
851void 1341void
852rxvt_term::create_windows (int argc, const char *const *argv) 1342rxvt_term::create_windows (int argc, const char *const *argv)
853{ 1343{
… …
861 Window top, parent; 1351 Window top, parent;
862 1352
863 dLocal (Display *, dpy); 1353 dLocal (Display *, dpy);
864 1354
865 /* grab colors before netscape does */ 1355 /* grab colors before netscape does */
866 Get_Colours (); 1356 get_colours ();
867 1357
868 if (!set_fonts ()) 1358 if (!set_fonts ())
869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1359 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
870 1360
871 parent = display->root; 1361 parent = display->root;
… …
919 this->parent[0] = top; 1409 this->parent[0] = top;
920 1410
921 old_width = szHint.width; 1411 old_width = szHint.width;
922 old_height = szHint.height; 1412 old_height = szHint.height;
923 1413
924 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1414 set_title (rs [Rs_title]);
925 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1415 set_icon_name (rs [Rs_iconName]);
926 1416
927 classHint.res_name = (char *)rs[Rs_name]; 1417 classHint.res_name = (char *)rs[Rs_name];
928 classHint.res_class = (char *)RESCLASS; 1418 classHint.res_class = (char *)RESCLASS;
929 1419
930 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1420 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1422 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
933 wmHint.window_group = top; 1423 wmHint.window_group = top;
934 1424
935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
936 &szHint, &wmHint, &classHint); 1426 &szHint, &wmHint, &classHint);
1427#if ENABLE_EWMH
1428 /*
1429 * set up icon hint
1430 * rs [Rs_iconfile] is path to icon
1431 */
1432
1433 if (rs [Rs_iconfile])
1434 {
1435 set_icon (rs [Rs_iconfile]);
1436 }
1437#endif
937 1438
938#if ENABLE_FRILLS 1439#if ENABLE_FRILLS
939 if (mwmhints.flags) 1440 if (mwmhints.flags)
940 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1441 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1442 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
975 1476
976 termwin_ev.start (display, top); 1477 termwin_ev.start (display, top);
977 1478
978 /* vt cursor: Black-on-White is standard, but this is more popular */ 1479 /* vt cursor: Black-on-White is standard, but this is more popular */
979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
980
981#ifdef HAVE_SCROLLBARS
982 /* cursor scrollBar: Black-on-White */
983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
984#endif
985 1481
986 /* the vt window */ 1482 /* the vt window */
987 vt = XCreateSimpleWindow (dpy, top, 1483 vt = XCreateSimpleWindow (dpy, top,
988 window_vt_x, window_vt_y, 1484 window_vt_x, window_vt_y,
989 width, height, 1485 width, height,
… …
1014 GCForeground | GCBackground | GCGraphicsExposures, 1510 GCForeground | GCBackground | GCGraphicsExposures,
1015 &gcvalue); 1511 &gcvalue);
1016 1512
1017 drawable = new rxvt_drawable (this, vt); 1513 drawable = new rxvt_drawable (this, vt);
1018 1514
1019#ifdef RXVT_SCROLLBAR
1020 gcvalue.foreground = pix_colors[Color_topShadow];
1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1026#endif
1027
1028#ifdef OFF_FOCUS_FADING 1515#ifdef OFF_FOCUS_FADING
1029 // initially we are in unfocused state 1516 // initially we are in unfocused state
1030 if (rs[Rs_fade]) 1517 if (rs[Rs_fade])
1031 pix_colors = pix_colors_unfocused; 1518 pix_colors = pix_colors_unfocused;
1032#endif 1519#endif
1033 1520
1034 pointer_unblank (); 1521 pointer_unblank ();
1035 scr_recolour (); 1522 scr_recolour ();
1036}
1037
1038/* ------------------------------------------------------------------------- *
1039 * GET TTY CURRENT STATE *
1040 * ------------------------------------------------------------------------- */
1041void
1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1043{
1044 /*
1045 * standard System V termios interface
1046 */
1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1048 {
1049 // return error - use system defaults,
1050 // where possible, and zero elsewhere
1051 memset (tio, 0, sizeof (ttymode_t));
1052
1053 tio->c_cc[VINTR] = CINTR;
1054 tio->c_cc[VQUIT] = CQUIT;
1055 tio->c_cc[VERASE] = CERASE;
1056#ifdef VERASE2
1057 tio->c_cc[VERASE2] = CERASE2;
1058#endif
1059 tio->c_cc[VKILL] = CKILL;
1060 tio->c_cc[VSTART] = CSTART;
1061 tio->c_cc[VSTOP] = CSTOP;
1062 tio->c_cc[VSUSP] = CSUSP;
1063# ifdef VDSUSP
1064 tio->c_cc[VDSUSP] = CDSUSP;
1065# endif
1066# ifdef VREPRINT
1067 tio->c_cc[VREPRINT] = CRPRNT;
1068# endif
1069# ifdef VDISCRD
1070 tio->c_cc[VDISCRD] = CFLUSH;
1071# endif
1072# ifdef VWERSE
1073 tio->c_cc[VWERSE] = CWERASE;
1074# endif
1075# ifdef VLNEXT
1076 tio->c_cc[VLNEXT] = CLNEXT;
1077# endif
1078 }
1079
1080 tio->c_cc[VEOF] = CEOF;
1081 tio->c_cc[VEOL] = VDISABLE;
1082# ifdef VEOL2
1083 tio->c_cc[VEOL2] = VDISABLE;
1084# endif
1085# ifdef VSWTC
1086 tio->c_cc[VSWTC] = VDISABLE;
1087# endif
1088# ifdef VSWTCH
1089 tio->c_cc[VSWTCH] = VDISABLE;
1090# endif
1091# if VMIN != VEOF
1092 tio->c_cc[VMIN] = 1;
1093# endif
1094# if VTIME != VEOL
1095 tio->c_cc[VTIME] = 0;
1096# endif
1097
1098 if (erase != -1)
1099 tio->c_cc[VERASE] = (char)erase;
1100
1101 /* input modes */
1102 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1103# ifdef IMAXBEL
1104 | IMAXBEL
1105# endif
1106 | IXON);
1107
1108 /* output modes */
1109 tio->c_oflag = (OPOST | ONLCR);
1110
1111 /* control modes */
1112 tio->c_cflag = (CS8 | CREAD);
1113
1114 /* line discipline modes */
1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1116# if defined (ECHOCTL) && defined (ECHOKE)
1117 | ECHOCTL | ECHOKE
1118# endif
1119 | ECHOE | ECHOK);
1120
1121 /*
1122 * Debugging
1123 */
1124#ifdef DEBUG_TTYMODE
1125#ifdef HAVE_TERMIOS_H
1126 /* c_iflag bits */
1127 fprintf (stderr, "Input flags\n");
1128
1129 /* cpp token stringize doesn't work on all machines <sigh> */
1130# define FOO(flag,name) \
1131 if ((tio->c_iflag) & flag) \
1132 fprintf (stderr, "%s ", name)
1133
1134 /* c_iflag bits */
1135 FOO (IGNBRK, "IGNBRK");
1136 FOO (BRKINT, "BRKINT");
1137 FOO (IGNPAR, "IGNPAR");
1138 FOO (PARMRK, "PARMRK");
1139 FOO (INPCK, "INPCK");
1140 FOO (ISTRIP, "ISTRIP");
1141 FOO (INLCR, "INLCR");
1142 FOO (IGNCR, "IGNCR");
1143 FOO (ICRNL, "ICRNL");
1144 FOO (IXON, "IXON");
1145 FOO (IXOFF, "IXOFF");
1146# ifdef IUCLC
1147 FOO (IUCLC, "IUCLC");
1148# endif
1149# ifdef IXANY
1150 FOO (IXANY, "IXANY");
1151# endif
1152# ifdef IMAXBEL
1153 FOO (IMAXBEL, "IMAXBEL");
1154# endif
1155
1156 fprintf (stderr, "\n");
1157
1158# undef FOO
1159# define FOO(entry, name) \
1160 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1161
1162 FOO (VINTR, "VINTR");
1163 FOO (VQUIT, "VQUIT");
1164 FOO (VERASE, "VERASE");
1165 FOO (VKILL, "VKILL");
1166 FOO (VEOF, "VEOF");
1167 FOO (VEOL, "VEOL");
1168# ifdef VEOL2
1169 FOO (VEOL2, "VEOL2");
1170# endif
1171# ifdef VSWTC
1172 FOO (VSWTC, "VSWTC");
1173# endif
1174# ifdef VSWTCH
1175 FOO (VSWTCH, "VSWTCH");
1176# endif
1177 FOO (VSTART, "VSTART");
1178 FOO (VSTOP, "VSTOP");
1179 FOO (VSUSP, "VSUSP");
1180# ifdef VDSUSP
1181 FOO (VDSUSP, "VDSUSP");
1182# endif
1183# ifdef VREPRINT
1184 FOO (VREPRINT, "VREPRINT");
1185# endif
1186# ifdef VDISCRD
1187 FOO (VDISCRD, "VDISCRD");
1188# endif
1189# ifdef VWERSE
1190 FOO (VWERSE, "VWERSE");
1191# endif
1192# ifdef VLNEXT
1193 FOO (VLNEXT, "VLNEXT");
1194# endif
1195
1196 fprintf (stderr, "\n");
1197# undef FOO
1198# endif /* HAVE_TERMIOS_H */
1199#endif /* DEBUG_TTYMODE */
1200} 1523}
1201 1524
1202/*----------------------------------------------------------------------*/ 1525/*----------------------------------------------------------------------*/
1203/* 1526/*
1204 * Run the command in a subprocess and return a file descriptor for the 1527 * Run the command in a subprocess and return a file descriptor for the
… …
1225 else 1548 else
1226#endif 1549#endif
1227 if (!pty->get ()) 1550 if (!pty->get ())
1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1229 1552
1230 int er; 1553 struct termios tio = def_tio;
1231 1554
1232#ifndef NO_BACKSPACE_KEY 1555#ifndef NO_BACKSPACE_KEY
1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1234 er = rs[Rs_backspace_key][0]; 1557 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1558 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1236 er = '\177'; /* the initial state anyway */ 1559 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1237 else
1238#endif 1560#endif
1239 er = -1;
1240 1561
1241 rxvt_get_ttymode (&tio, er); 1562 /* init terminal attributes */
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1563 cfsetospeed (&tio, BAUDRATE);
1564 cfsetispeed (&tio, BAUDRATE);
1565 tcsetattr (pty->tty, TCSANOW, &tio);
1243 pty->set_utf8_mode (enc_utf8); 1566 pty->set_utf8_mode (enc_utf8);
1244 1567
1245 /* set initial window size */ 1568 /* set initial window size */
1246 tt_winch (); 1569 tt_winch ();
1247 1570
… …
1307rxvt_term::run_child (const char *const *argv) 1630rxvt_term::run_child (const char *const *argv)
1308{ 1631{
1309 char *login; 1632 char *login;
1310 1633
1311 if (option (Opt_console)) 1634 if (option (Opt_console))
1635 {
1312 { /* be virtual console, fail silently */ 1636 /* be virtual console, fail silently */
1313#ifdef TIOCCONS 1637#ifdef TIOCCONS
1314 unsigned int on = 1; 1638 unsigned int on = 1;
1315 1639
1316 ioctl (STDIN_FILENO, TIOCCONS, &on); 1640 ioctl (STDIN_FILENO, TIOCCONS, &on);
1317#elif defined (SRIOCSREDIR) 1641#elif defined (SRIOCSREDIR)
… …
1319 1643
1320 fd = open (CONSOLE, O_WRONLY, 0); 1644 fd = open (CONSOLE, O_WRONLY, 0);
1321 if (fd >= 0) 1645 if (fd >= 0)
1322 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1646 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1323 close (fd); 1647 close (fd);
1324#endif /* SRIOCSREDIR */ 1648#endif /* SRIOCSREDIR */
1325 } 1649 }
1326 1650
1327 /* reset signals and spin off the command interpreter */ 1651 /* reset signals and spin off the command interpreter */
1328 signal (SIGINT, SIG_DFL); 1652 signal (SIGINT, SIG_DFL);
1329 signal (SIGQUIT, SIG_DFL); 1653 signal (SIGQUIT, SIG_DFL);
1330 signal (SIGCHLD, SIG_DFL); 1654 signal (SIGCHLD, SIG_DFL);
1331 signal (SIGHUP, SIG_DFL); 1655 signal (SIGHUP, SIG_DFL);
1332 signal (SIGPIPE, SIG_DFL); 1656 signal (SIGPIPE, SIG_DFL);
1333 /* 1657 /*
1334 * mimick login's behavior by disabling the job control signals 1658 * mimic login's behavior by disabling the job control signals
1335 * a shell that wants them can turn them back on 1659 * a shell that wants them can turn them back on
1336 */ 1660 */
1337#ifdef SIGTSTP 1661#ifdef SIGTSTP
1338 signal (SIGTSTP, SIG_IGN); 1662 signal (SIGTSTP, SIG_IGN);
1339 signal (SIGTTIN, SIG_IGN); 1663 signal (SIGTTIN, SIG_IGN);
1340 signal (SIGTTOU, SIG_IGN); 1664 signal (SIGTTOU, SIG_IGN);
1341#endif /* SIGTSTP */ 1665#endif /* SIGTSTP */
1342
1343 // unblock signals (signals are blocked by iom.C
1344 sigset_t ss;
1345 sigemptyset (&ss);
1346 sigprocmask (SIG_SETMASK, &ss, 0);
1347 1666
1348 /* command interpreter path */ 1667 /* command interpreter path */
1349 if (argv != NULL) 1668 if (argv)
1350 { 1669 {
1351# ifdef DEBUG_CMD 1670# ifdef DEBUG_CMD
1352 int i; 1671 int i;
1353 1672
1354 for (i = 0; argv[i]; i++) 1673 for (i = 0; argv[i]; i++)
… …
1363 const char *argv0, *shell; 1682 const char *argv0, *shell;
1364 1683
1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1684 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1366 shell = "/bin/sh"; 1685 shell = "/bin/sh";
1367 1686
1368 argv0 = (const char *)rxvt_basename (shell); 1687 argv0 = rxvt_basename (shell);
1369 1688
1370 if (option (Opt_loginShell)) 1689 if (option (Opt_loginShell))
1371 { 1690 {
1372 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1691 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1373 1692
1374 login[0] = '-'; 1693 login[0] = '-';
1375 strcpy (&login[1], argv0); 1694 strcpy (&login[1], argv0);
1376 argv0 = login; 1695 argv0 = login;
1377 } 1696 }
1378 1697
1379 execlp (shell, argv0, NULL); 1698 execlp (shell, argv0, (char *)0);
1380 /* no error message: STDERR is closed! */ 1699 /* no error message: STDERR is closed! */
1381 } 1700 }
1382 1701
1383 return -1; 1702 return -1;
1384} 1703}

Diff Legend

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