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.216 by ayin, Tue Oct 9 13:34:46 2007 UTC vs.
Revision 1.284 by sf-exg, Fri Oct 15 21:59:25 2010 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * 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
20 * 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
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#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
45 59
46#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 62#include <sys/types.h>
49#include <sys/socket.h> 63#include <sys/socket.h>
… …
141 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 162# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 164# endif
151 /* high-intensity colors */ 165 /* high-intensity colors */
152# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
160 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
161 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
162 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
163 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
164 178
179#if !USE_256_COLORS
165 // 88 xterm colours 180 // 88 xterm colours
166 "rgb:00/00/00", 181 "rgb:00/00/00",
167 "rgb:00/00/8b", 182 "rgb:00/00/8b",
168 "rgb:00/00/cd", 183 "rgb:00/00/cd",
169 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
233 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
234 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
235 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
236 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
237 "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
238 496
239#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 503 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 510#if ENABLE_FRILLS
253 NULL, // Color_underline 511 NULL, // Color_underline
254#endif 512#endif
255#ifdef OPTION_HC 513#ifdef OPTION_HC
256 NULL, 514 NULL,
515 NULL,
257#endif 516#endif
258#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
260 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 520#endif
262#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
263 NULL, 522 NULL,
264#endif 523#endif
265#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 525 "rgb:00/00/00",
267#endif 526#endif
268 }; 527 };
269 528
270bool 529void
271rxvt_term::init_vars () 530rxvt_term::init_vars ()
272{ 531{
273 pix_colors = // 532 pix_colors = pix_colors_focused;
274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275#ifdef OFF_FOCUS_FADING
276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277#endif
278
279 533
280 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
282 want_refresh = 1; 536 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
284 ncol = 80; 538 ncol = 80;
285 nrow = 24; 539 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
289 saveLines = SAVELINES; 544 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 545
292 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
293 547
294 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1;
296 549
297 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
305 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
306 560 set_option (Opt_buffered);
307 return true;
308}
309
310void
311rxvt_term::init_secondary ()
312{
313 int i;
314
315 /*
316 * Close all unused file descriptors
317 * We don't want them, we don't need them.
318 */
319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
320 {
321 /* TODO: BOO HISS */
322 dup2 (STDERR_FILENO, STDIN_FILENO);
323 }
324 else if (i != STDIN_FILENO)
325 {
326 dup2 (i, STDIN_FILENO);
327 close (i);
328 }
329
330 dup2 (STDERR_FILENO, STDOUT_FILENO);
331
332#if 0 // schmorp sayz closing filies is murder
333 for (i = STDERR_FILENO + 1; i < num_fds; i++)
334 {
335#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
336 if (i == 4 || i == 7)
337 continue;
338#endif
339 close (i);
340 }
341#endif
342} 561}
343 562
344/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
345const char ** 564const char **
346rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
356 break; 575 break;
357 576
358 if (r_argc == argc) 577 if (r_argc == argc)
359 cmd_argv = NULL; 578 cmd_argv = NULL;
360 else if (!argv[r_argc + 1]) 579 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n"); 580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
362 else 581 else
363 { 582 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365 584
366 for (i = 0; i < argc - r_argc - 1; i++) 585 for (i = 0; i < argc - r_argc - 1; i++)
… …
386 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
387 606
388 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
389 608
390 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
391 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 }
392 614
393 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
394 xa = display->xa; 616 xa = display->xa;
395 617
396 set (display); 618 set (display);
… …
399#if XFT 621#if XFT
400 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
401 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
402#endif 624#endif
403 625
404#ifdef HAVE_AFTERIMAGE
405 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
406#endif
407 free (r_argv); 626 free (r_argv);
408 627
409 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
410 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
411 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
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639 gdk_pixbuf_xlib_init_with_depth (dpy, display->screen, depth);
640#endif
412 641
413#if ENABLE_PERL 642#if ENABLE_PERL
414 if (!rs[Rs_perl_ext_1]) 643 if (!rs[Rs_perl_ext_1])
415 rs[Rs_perl_ext_1] = "default"; 644 rs[Rs_perl_ext_1] = "default";
416 645
… …
428 */ 657 */
429 if (cmd_argv && cmd_argv[0]) 658 if (cmd_argv && cmd_argv[0])
430 { 659 {
431 if (!rs[Rs_title]) 660 if (!rs[Rs_title])
432 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 661 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
662
433 if (!rs[Rs_iconName]) 663 if (!rs[Rs_iconName])
434 rs[Rs_iconName] = rs[Rs_title]; 664 rs[Rs_iconName] = rs[Rs_title];
435 } 665 }
436 else 666 else
437 { 667 {
438 if (!rs[Rs_title]) 668 if (!rs[Rs_title])
439 rs[Rs_title] = rs[Rs_name]; 669 rs[Rs_title] = rs[Rs_name];
670
440 if (!rs[Rs_iconName]) 671 if (!rs[Rs_iconName])
441 rs[Rs_iconName] = rs[Rs_name]; 672 rs[Rs_iconName] = rs[Rs_name];
442 } 673 }
443 674
444 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 675 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
451 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 682 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
452 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 683 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
453 684
454 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 685 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
455 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 686 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
687
688 if (rs[Rs_letterSpace])
689 letterSpace = atoi (rs[Rs_letterSpace]);
456#endif 690#endif
457 691
458#ifdef POINTER_BLANK 692#ifdef POINTER_BLANK
459 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 693 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
460 pointerBlankDelay = i; 694 pointerBlankDelay = i;
… …
463#endif 697#endif
464 698
465 /* no point having a scrollbar without having any scrollback! */ 699 /* no point having a scrollbar without having any scrollback! */
466 if (!saveLines) 700 if (!saveLines)
467 set_option (Opt_scrollBar, 0); 701 set_option (Opt_scrollBar, 0);
468
469#ifdef PRINTPIPE
470 if (!rs[Rs_print_pipe])
471 rs[Rs_print_pipe] = PRINTPIPE;
472#endif
473 702
474 if (!rs[Rs_cutchars]) 703 if (!rs[Rs_cutchars])
475 rs[Rs_cutchars] = CUTCHARS; 704 rs[Rs_cutchars] = CUTCHARS;
476 705
477#ifndef NO_BACKSPACE_KEY 706#ifndef NO_BACKSPACE_KEY
… …
490# else 719# else
491 rs[Rs_delete_key] = "\033[3~"; 720 rs[Rs_delete_key] = "\033[3~";
492# endif 721# endif
493#endif 722#endif
494 723
495#ifdef HAVE_SCROLLBARS 724 scrollBar.setup (this);
496 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
497#endif
498 725
499#ifdef XTERM_REVERSE_VIDEO 726#ifdef XTERM_REVERSE_VIDEO
500 /* this is how xterm implements reverseVideo */ 727 /* this is how xterm implements reverseVideo */
501 if (option (Opt_reverseVideo)) 728 if (option (Opt_reverseVideo))
502 { 729 {
… …
522 color_aliases (Color_fg); 749 color_aliases (Color_fg);
523 color_aliases (Color_bg); 750 color_aliases (Color_bg);
524#ifndef NO_CURSORCOLOR 751#ifndef NO_CURSORCOLOR
525 color_aliases (Color_cursor); 752 color_aliases (Color_cursor);
526 color_aliases (Color_cursor2); 753 color_aliases (Color_cursor2);
527#endif /* NO_CURSORCOLOR */ 754#endif /* NO_CURSORCOLOR */
528 color_aliases (Color_pointer_fg); 755 color_aliases (Color_pointer_fg);
529 color_aliases (Color_pointer_bg); 756 color_aliases (Color_pointer_bg);
530 color_aliases (Color_border); 757 color_aliases (Color_border);
531#ifndef NO_BOLD_UNDERLINE_REVERSE 758#ifndef NO_BOLD_UNDERLINE_REVERSE
532 color_aliases (Color_BD); 759 color_aliases (Color_BD);
533 color_aliases (Color_UL); 760 color_aliases (Color_UL);
534 color_aliases (Color_RV); 761 color_aliases (Color_RV);
535#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 762#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
536 763
537 if (!rs[Rs_color + Color_border]) 764 if (!rs[Rs_color + Color_border])
538 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 765 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
539 766
540 return cmd_argv; 767 return cmd_argv;
768}
769
770/*----------------------------------------------------------------------*/
771void
772rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
773{
774 this->envv = envv;
775
776 SET_R (this);
777 set_locale ("");
778 set_environ (envv); // a few things in X do not call setlocale :(
779
780 init_vars ();
781
782 const char **cmd_argv = init_resources (argc, argv);
783
784#ifdef KEYSYM_RESOURCE
785 keyboard->register_done ();
786#endif
787
788 if (const char *path = rs[Rs_chdir])
789 if (*path) // ignored if empty
790 {
791 if (*path != '/')
792 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
793
794 if (chdir (path))
795 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
796 }
797
798 if (option (Opt_scrollBar))
799 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
800
801 pty = ptytty::create ();
802
803 create_windows (argc, argv);
804
805 init_xlocale ();
806
807 scr_poweron (); // initialize screen
808
809#if 0
810 XSynchronize (dpy, True);
811#endif
812
813 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */
815#ifdef HAVE_BG_PIXMAP
816 {
817 bgPixmap.set_target (this);
818 bgPixmap.invalidate ();
819
820#ifdef ENABLE_TRANSPARENCY
821 if (option (Opt_transparent))
822 {
823 bgPixmap.set_transparent ();
824
825 if (rs [Rs_blurradius])
826 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
827
828 if (ISSET_PIXCOLOR (Color_tint))
829 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
830
831 if (rs [Rs_shade])
832 bgPixmap.set_shade (rs [Rs_shade]);
833
834 bgPixmap.set_root_pixmap ();
835 XSelectInput (dpy, display->root, PropertyChangeMask);
836 rootwin_ev.start (display, display->root);
837 }
838#endif
839
840#ifdef BG_IMAGE_FROM_FILE
841 if (rs[Rs_backgroundPixmap])
842 {
843 const char *p = rs[Rs_backgroundPixmap];
844
845 if ((p = strchr (p, ';')) != 0)
846 {
847 p++;
848 bgPixmap.set_geometry (p);
849 }
850 else
851 bgPixmap.set_defaultGeometry ();
852
853 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
854 if (!bgPixmap.window_position_sensitive ())
855 update_background ();
856 }
857#endif
858 }
859#endif
860
861#if ENABLE_PERL
862 rootwin_ev.start (display, display->root);
863#endif
864
865 set_colorfgbg ();
866
867 init_command (cmd_argv);
868
869 free (cmd_argv);
870
871 if (pty->pty >= 0)
872 pty_ev.start (pty->pty, ev::READ);
873
874 HOOK_INVOKE ((this, HOOK_START, DT_END));
875
876#if ENABLE_XEMBED
877 if (rs[Rs_embed])
878 {
879 long info[2] = { 0, XEMBED_MAPPED };
880
881 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
882 32, PropModeReplace, (unsigned char *)&info, 2);
883 }
884#endif
885
886 XMapWindow (dpy, vt);
887 XMapWindow (dpy, parent[0]);
888
889 refresh_check ();
541} 890}
542 891
543/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
544void 893void
545rxvt_term::init_env () 894rxvt_term::init_env ()
… …
560 */ 909 */
561 val = rxvt_network_display (rs[Rs_display_name]); 910 val = rxvt_network_display (rs[Rs_display_name]);
562 rs[Rs_display_name] = (const char *)val; 911 rs[Rs_display_name] = (const char *)val;
563 912
564 if (val == NULL) 913 if (val == NULL)
565#endif /* DISPLAY_IS_IP */ 914#endif /* DISPLAY_IS_IP */
566 val = XDisplayString (dpy); 915 val = XDisplayString (dpy);
567 916
568 if (rs[Rs_display_name] == NULL) 917 if (rs[Rs_display_name] == NULL)
569 rs[Rs_display_name] = val; /* use broken `:0' value */ 918 rs[Rs_display_name] = val; /* use broken `:0' value */
570 919
… …
610#ifdef HAVE_UNSETENV 959#ifdef HAVE_UNSETENV
611 /* avoid passing old settings and confusing term size */ 960 /* avoid passing old settings and confusing term size */
612 unsetenv ("LINES"); 961 unsetenv ("LINES");
613 unsetenv ("COLUMNS"); 962 unsetenv ("COLUMNS");
614 unsetenv ("TERMCAP"); /* terminfo should be okay */ 963 unsetenv ("TERMCAP"); /* terminfo should be okay */
615#endif /* HAVE_UNSETENV */ 964#endif /* HAVE_UNSETENV */
616} 965}
617 966
618/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
619/* 968/*
620 * This is more or less stolen straight from XFree86 xterm. 969 * This is more or less stolen straight from XFree86 xterm.
… …
641 990
642 this->locale = "C"; 991 this->locale = "C";
643 } 992 }
644 993
645 994
646 this->locale = rxvt_strdup (this->locale); 995 this->locale = strdup (this->locale);
647 SET_LOCALE (this->locale); 996 SET_LOCALE (this->locale);
648 mbstate.reset (); 997 mbstate.reset ();
649#endif 998#endif
650 999
651#if HAVE_NL_LANGINFO 1000#if HAVE_NL_LANGINFO
… …
724 run_command (argv); 1073 run_command (argv);
725} 1074}
726 1075
727/*----------------------------------------------------------------------*/ 1076/*----------------------------------------------------------------------*/
728void 1077void
729rxvt_term::Get_Colours () 1078rxvt_term::get_colours ()
730{ 1079{
731 int i; 1080 int i;
732 1081
733#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
734 pix_colors = pix_colors_focused; 1083 pix_colors = pix_colors_focused;
735#endif 1084#endif
736 1085
737 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1086 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
738 { 1087 {
739 const char *name = rs[Rs_color + i]; 1088 const char *name = rs[Rs_color + i];
740 1089
741 if (!name) 1090 if (!name)
… …
794 * get scrollBar shadow colors 1143 * get scrollBar shadow colors
795 * 1144 *
796 * The calculations of topShadow/bottomShadow values are adapted 1145 * The calculations of topShadow/bottomShadow values are adapted
797 * from the fvwm window manager. 1146 * from the fvwm window manager.
798 */ 1147 */
799#ifdef KEEP_SCROLLCOLOR 1148#ifdef RXVT_SCROLLBAR
800 if (depth <= 2) 1149 if (depth <= 2)
801 { 1150 {
802 /* Monochrome */ 1151 /* Monochrome */
803 alias_color (Color_scroll, Color_fg); 1152 alias_color (Color_scroll, Color_fg);
804 alias_color (Color_topShadow, Color_bg); 1153 alias_color (Color_topShadow, Color_bg);
… …
819 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1168 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
820 cscroll.a) 1169 cscroll.a)
821 )) 1170 ))
822 alias_color (Color_topShadow, Color_White); 1171 alias_color (Color_topShadow, Color_White);
823 } 1172 }
824#endif /* KEEP_SCROLLCOLOR */ 1173#endif
825 1174
826#ifdef OFF_FOCUS_FADING 1175#ifdef OFF_FOCUS_FADING
827 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1176 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
828 update_fade_color (i); 1177 update_fade_color (i);
829#endif 1178#endif
… …
837 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1186 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
838 { 1187 {
839 int i = atoi (rs[Rs_color + idx]); 1188 int i = atoi (rs[Rs_color + idx]);
840 1189
841 if (i >= 8 && i <= 15) 1190 if (i >= 8 && i <= 15)
842 { /* bright colors */ 1191 /* bright colors */
843 i -= 8;
844 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1192 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
845 return; 1193 else if (i >= 0 && i <= 7)
846 } 1194 /* normal colors */
847
848 if (i >= 0 && i <= 7) /* normal colors */
849 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1195 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
850 } 1196 }
851} 1197}
852 1198
853/*----------------------------------------------------------------------*/ 1199/*----------------------------------------------------------------------*/
… …
937 1283
938 if (i) 1284 if (i)
939 ModMetaMask = modmasks[i - 1]; 1285 ModMetaMask = modmasks[i - 1];
940} 1286}
941 1287
1288void
1289rxvt_term::set_icon (const char *file)
1290{
1291#ifdef HAVE_AFTERIMAGE
1292 init_asv ();
1293
1294 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1295 if (!im)
1296 {
1297 rxvt_warn ("Loading image icon failed, continuing without.\n");
1298 return;
1299 }
1300
1301 unsigned int w = im->width;
1302 unsigned int h = im->height;
1303
1304 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1305 {
1306 rxvt_warn ("Icon image too big, continuing without.\n");
1307 destroy_asimage (&im);
1308 return;
1309 }
1310
1311 ASImage *result = scale_asimage (asv, im,
1312 w, h, ASA_ARGB32,
1313 100, ASIMAGE_QUALITY_DEFAULT);
1314 destroy_asimage (&im);
1315
1316 if (!result)
1317 {
1318 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1319 return;
1320 }
1321
1322 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1323 if (buffer)
1324 {
1325 ARGB32 *asbuf = result->alt.argb32;
1326 buffer [0] = w;
1327 buffer [1] = h;
1328
1329 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i];
1331
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer);
1335 }
1336 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1338
1339 destroy_asimage (&result);
1340#endif
1341
1342#ifdef HAVE_PIXBUF
1343 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1344 if (!pixbuf)
1345 {
1346 rxvt_warn ("Loading image icon failed, continuing without.\n");
1347 return;
1348 }
1349
1350 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1351 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1352
1353 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1354 {
1355 rxvt_warn ("Icon image too big, continuing without.\n");
1356 g_object_unref (pixbuf);
1357 return;
1358 }
1359
1360 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1361 {
1362 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1363 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1364 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1365
1366 buffer [0] = w;
1367 buffer [1] = h;
1368 for (int i = 0; i < h; i++)
1369 {
1370 for (int j = 0; j < w; j++)
1371 {
1372 unsigned char *pixel = row + j * channels;
1373 long value;
1374
1375 if (channels == 4)
1376 value = pixel[3];
1377 else
1378 value = (unsigned char)0x00ff;
1379
1380 value = (value << 8) + pixel[0];
1381 value = (value << 8) + pixel[1];
1382 value = (value << 8) + pixel[2];
1383 buffer[(i * w + j) + 2] = value;
1384 }
1385
1386 row += rowstride;
1387 }
1388
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer);
1392 }
1393 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1395
1396 g_object_unref (pixbuf);
1397#endif
1398}
1399
942/*----------------------------------------------------------------------*/ 1400/*----------------------------------------------------------------------*/
943/* rxvt_Create_Windows () - Open and map the window */ 1401/* rxvt_Create_Windows () - Open and map the window */
944void 1402void
945rxvt_term::create_windows (int argc, const char *const *argv) 1403rxvt_term::create_windows (int argc, const char *const *argv)
946{ 1404{
… …
954 Window top, parent; 1412 Window top, parent;
955 1413
956 dLocal (Display *, dpy); 1414 dLocal (Display *, dpy);
957 1415
958 /* grab colors before netscape does */ 1416 /* grab colors before netscape does */
959 Get_Colours (); 1417 get_colours ();
960 1418
961 if (!set_fonts ()) 1419 if (!set_fonts ())
962 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1420 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
963 1421
964 parent = display->root; 1422 parent = display->root;
… …
1012 this->parent[0] = top; 1470 this->parent[0] = top;
1013 1471
1014 old_width = szHint.width; 1472 old_width = szHint.width;
1015 old_height = szHint.height; 1473 old_height = szHint.height;
1016 1474
1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1475 set_title (rs [Rs_title]);
1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1476 set_icon_name (rs [Rs_iconName]);
1019 1477
1020 classHint.res_name = (char *)rs[Rs_name]; 1478 classHint.res_name = (char *)rs[Rs_name];
1021 classHint.res_class = (char *)RESCLASS; 1479 classHint.res_class = (char *)RESCLASS;
1022 1480
1023 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1481 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1025 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1483 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1026 wmHint.window_group = top; 1484 wmHint.window_group = top;
1027 1485
1028 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1486 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1029 &szHint, &wmHint, &classHint); 1487 &szHint, &wmHint, &classHint);
1488#if ENABLE_EWMH
1489 /*
1490 * set up icon hint
1491 * rs [Rs_iconfile] is path to icon
1492 */
1493
1494 if (rs [Rs_iconfile])
1495 {
1496 set_icon (rs [Rs_iconfile]);
1497 }
1498#endif
1030 1499
1031#if ENABLE_FRILLS 1500#if ENABLE_FRILLS
1032 if (mwmhints.flags) 1501 if (mwmhints.flags)
1033 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1502 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1034 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1503 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1068 1537
1069 termwin_ev.start (display, top); 1538 termwin_ev.start (display, top);
1070 1539
1071 /* vt cursor: Black-on-White is standard, but this is more popular */ 1540 /* vt cursor: Black-on-White is standard, but this is more popular */
1072 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1541 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1073
1074#ifdef HAVE_SCROLLBARS
1075 /* cursor scrollBar: Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1077#endif
1078 1542
1079 /* the vt window */ 1543 /* the vt window */
1080 vt = XCreateSimpleWindow (dpy, top, 1544 vt = XCreateSimpleWindow (dpy, top,
1081 window_vt_x, window_vt_y, 1545 window_vt_x, window_vt_y,
1082 width, height, 1546 width, height,
… …
1107 GCForeground | GCBackground | GCGraphicsExposures, 1571 GCForeground | GCBackground | GCGraphicsExposures,
1108 &gcvalue); 1572 &gcvalue);
1109 1573
1110 drawable = new rxvt_drawable (this, vt); 1574 drawable = new rxvt_drawable (this, vt);
1111 1575
1112#ifdef RXVT_SCROLLBAR
1113 gcvalue.foreground = pix_colors[Color_topShadow];
1114 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[Color_bottomShadow];
1116 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1118 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119#endif
1120
1121#ifdef OFF_FOCUS_FADING 1576#ifdef OFF_FOCUS_FADING
1122 // initially we are in unfocused state 1577 // initially we are in unfocused state
1123 if (rs[Rs_fade]) 1578 if (rs[Rs_fade])
1124 pix_colors = pix_colors_unfocused; 1579 pix_colors = pix_colors_unfocused;
1125#endif 1580#endif
1126 1581
1127 pointer_unblank (); 1582 pointer_unblank ();
1128 scr_recolour (); 1583 scr_recolour ();
1129}
1130
1131/* ------------------------------------------------------------------------- *
1132 * GET TTY CURRENT STATE *
1133 * ------------------------------------------------------------------------- */
1134void
1135rxvt_get_ttymode (ttymode_t *tio, int erase)
1136{
1137 /*
1138 * standard System V termios interface
1139 */
1140 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1141 {
1142 // return error - use system defaults,
1143 // where possible, and zero elsewhere
1144 memset (tio, 0, sizeof (ttymode_t));
1145
1146 tio->c_cc[VINTR] = CINTR;
1147 tio->c_cc[VQUIT] = CQUIT;
1148 tio->c_cc[VERASE] = CERASE;
1149#ifdef VERASE2
1150 tio->c_cc[VERASE2] = CERASE2;
1151#endif
1152 tio->c_cc[VKILL] = CKILL;
1153 tio->c_cc[VSTART] = CSTART;
1154 tio->c_cc[VSTOP] = CSTOP;
1155 tio->c_cc[VSUSP] = CSUSP;
1156# ifdef VDSUSP
1157 tio->c_cc[VDSUSP] = CDSUSP;
1158# endif
1159# ifdef VREPRINT
1160 tio->c_cc[VREPRINT] = CRPRNT;
1161# endif
1162# ifdef VDISCRD
1163 tio->c_cc[VDISCRD] = CFLUSH;
1164# endif
1165# ifdef VWERSE
1166 tio->c_cc[VWERSE] = CWERASE;
1167# endif
1168# ifdef VLNEXT
1169 tio->c_cc[VLNEXT] = CLNEXT;
1170# endif
1171 }
1172
1173 tio->c_cc[VEOF] = CEOF;
1174 tio->c_cc[VEOL] = VDISABLE;
1175# ifdef VEOL2
1176 tio->c_cc[VEOL2] = VDISABLE;
1177# endif
1178# ifdef VSWTC
1179 tio->c_cc[VSWTC] = VDISABLE;
1180# endif
1181# ifdef VSWTCH
1182 tio->c_cc[VSWTCH] = VDISABLE;
1183# endif
1184# if VMIN != VEOF
1185 tio->c_cc[VMIN] = 1;
1186# endif
1187# if VTIME != VEOL
1188 tio->c_cc[VTIME] = 0;
1189# endif
1190
1191 if (erase != -1)
1192 tio->c_cc[VERASE] = (char)erase;
1193
1194 /* input modes */
1195 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1196# ifdef IMAXBEL
1197 | IMAXBEL
1198# endif
1199 | IXON);
1200
1201 /* output modes */
1202 tio->c_oflag = (OPOST | ONLCR);
1203
1204 /* control modes */
1205 tio->c_cflag = (CS8 | CREAD);
1206
1207 /* line discipline modes */
1208 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1209# if defined (ECHOCTL) && defined (ECHOKE)
1210 | ECHOCTL | ECHOKE
1211# endif
1212 | ECHOE | ECHOK);
1213
1214 /*
1215 * Debugging
1216 */
1217#ifdef DEBUG_TTYMODE
1218#ifdef HAVE_TERMIOS_H
1219 /* c_iflag bits */
1220 fprintf (stderr, "Input flags\n");
1221
1222 /* cpp token stringize doesn't work on all machines <sigh> */
1223# define FOO(flag,name) \
1224 if ((tio->c_iflag) & flag) \
1225 fprintf (stderr, "%s ", name)
1226
1227 /* c_iflag bits */
1228 FOO (IGNBRK, "IGNBRK");
1229 FOO (BRKINT, "BRKINT");
1230 FOO (IGNPAR, "IGNPAR");
1231 FOO (PARMRK, "PARMRK");
1232 FOO (INPCK, "INPCK");
1233 FOO (ISTRIP, "ISTRIP");
1234 FOO (INLCR, "INLCR");
1235 FOO (IGNCR, "IGNCR");
1236 FOO (ICRNL, "ICRNL");
1237 FOO (IXON, "IXON");
1238 FOO (IXOFF, "IXOFF");
1239# ifdef IUCLC
1240 FOO (IUCLC, "IUCLC");
1241# endif
1242# ifdef IXANY
1243 FOO (IXANY, "IXANY");
1244# endif
1245# ifdef IMAXBEL
1246 FOO (IMAXBEL, "IMAXBEL");
1247# endif
1248
1249 fprintf (stderr, "\n");
1250
1251# undef FOO
1252# define FOO(entry, name) \
1253 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1254
1255 FOO (VINTR, "VINTR");
1256 FOO (VQUIT, "VQUIT");
1257 FOO (VERASE, "VERASE");
1258 FOO (VKILL, "VKILL");
1259 FOO (VEOF, "VEOF");
1260 FOO (VEOL, "VEOL");
1261# ifdef VEOL2
1262 FOO (VEOL2, "VEOL2");
1263# endif
1264# ifdef VSWTC
1265 FOO (VSWTC, "VSWTC");
1266# endif
1267# ifdef VSWTCH
1268 FOO (VSWTCH, "VSWTCH");
1269# endif
1270 FOO (VSTART, "VSTART");
1271 FOO (VSTOP, "VSTOP");
1272 FOO (VSUSP, "VSUSP");
1273# ifdef VDSUSP
1274 FOO (VDSUSP, "VDSUSP");
1275# endif
1276# ifdef VREPRINT
1277 FOO (VREPRINT, "VREPRINT");
1278# endif
1279# ifdef VDISCRD
1280 FOO (VDISCRD, "VDISCRD");
1281# endif
1282# ifdef VWERSE
1283 FOO (VWERSE, "VWERSE");
1284# endif
1285# ifdef VLNEXT
1286 FOO (VLNEXT, "VLNEXT");
1287# endif
1288
1289 fprintf (stderr, "\n");
1290# undef FOO
1291# endif /* HAVE_TERMIOS_H */
1292#endif /* DEBUG_TTYMODE */
1293} 1584}
1294 1585
1295/*----------------------------------------------------------------------*/ 1586/*----------------------------------------------------------------------*/
1296/* 1587/*
1297 * Run the command in a subprocess and return a file descriptor for the 1588 * Run the command in a subprocess and return a file descriptor for the
… …
1318 else 1609 else
1319#endif 1610#endif
1320 if (!pty->get ()) 1611 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1612 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1613
1323 int er; 1614 struct termios tio = def_tio;
1324 1615
1325#ifndef NO_BACKSPACE_KEY 1616#ifndef NO_BACKSPACE_KEY
1326 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1617 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1327 er = rs[Rs_backspace_key][0]; 1618 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1328 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1619 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1329 er = '\177'; /* the initial state anyway */ 1620 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1330 else
1331#endif 1621#endif
1332 er = -1;
1333 1622
1334 rxvt_get_ttymode (&tio, er); 1623 /* init terminal attributes */
1335 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1624 cfsetospeed (&tio, BAUDRATE);
1625 cfsetispeed (&tio, BAUDRATE);
1626 tcsetattr (pty->tty, TCSANOW, &tio);
1336 pty->set_utf8_mode (enc_utf8); 1627 pty->set_utf8_mode (enc_utf8);
1337 1628
1338 /* set initial window size */ 1629 /* set initial window size */
1339 tt_winch (); 1630 tt_winch ();
1340 1631
… …
1400rxvt_term::run_child (const char *const *argv) 1691rxvt_term::run_child (const char *const *argv)
1401{ 1692{
1402 char *login; 1693 char *login;
1403 1694
1404 if (option (Opt_console)) 1695 if (option (Opt_console))
1696 {
1405 { /* be virtual console, fail silently */ 1697 /* be virtual console, fail silently */
1406#ifdef TIOCCONS 1698#ifdef TIOCCONS
1407 unsigned int on = 1; 1699 unsigned int on = 1;
1408 1700
1409 ioctl (STDIN_FILENO, TIOCCONS, &on); 1701 ioctl (STDIN_FILENO, TIOCCONS, &on);
1410#elif defined (SRIOCSREDIR) 1702#elif defined (SRIOCSREDIR)
… …
1412 1704
1413 fd = open (CONSOLE, O_WRONLY, 0); 1705 fd = open (CONSOLE, O_WRONLY, 0);
1414 if (fd >= 0) 1706 if (fd >= 0)
1415 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1707 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1416 close (fd); 1708 close (fd);
1417#endif /* SRIOCSREDIR */ 1709#endif /* SRIOCSREDIR */
1418 } 1710 }
1419 1711
1420 /* reset signals and spin off the command interpreter */ 1712 /* reset signals and spin off the command interpreter */
1421 signal (SIGINT, SIG_DFL); 1713 signal (SIGINT, SIG_DFL);
1422 signal (SIGQUIT, SIG_DFL); 1714 signal (SIGQUIT, SIG_DFL);
1423 signal (SIGCHLD, SIG_DFL); 1715 signal (SIGCHLD, SIG_DFL);
1424 signal (SIGHUP, SIG_DFL); 1716 signal (SIGHUP, SIG_DFL);
1425 signal (SIGPIPE, SIG_DFL); 1717 signal (SIGPIPE, SIG_DFL);
1426 /* 1718 /*
1427 * mimick login's behavior by disabling the job control signals 1719 * mimic login's behavior by disabling the job control signals
1428 * a shell that wants them can turn them back on 1720 * a shell that wants them can turn them back on
1429 */ 1721 */
1430#ifdef SIGTSTP 1722#ifdef SIGTSTP
1431 signal (SIGTSTP, SIG_IGN); 1723 signal (SIGTSTP, SIG_IGN);
1432 signal (SIGTTIN, SIG_IGN); 1724 signal (SIGTTIN, SIG_IGN);
1433 signal (SIGTTOU, SIG_IGN); 1725 signal (SIGTTOU, SIG_IGN);
1434#endif /* SIGTSTP */ 1726#endif /* SIGTSTP */
1435
1436 // unblock signals (signals are blocked by iom.C
1437 sigset_t ss;
1438 sigemptyset (&ss);
1439 sigprocmask (SIG_SETMASK, &ss, 0);
1440 1727
1441 /* command interpreter path */ 1728 /* command interpreter path */
1442 if (argv) 1729 if (argv)
1443 { 1730 {
1444# ifdef DEBUG_CMD 1731# ifdef DEBUG_CMD
… …
1456 const char *argv0, *shell; 1743 const char *argv0, *shell;
1457 1744
1458 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1745 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1459 shell = "/bin/sh"; 1746 shell = "/bin/sh";
1460 1747
1461 argv0 = (const char *)rxvt_basename (shell); 1748 argv0 = rxvt_basename (shell);
1462 1749
1463 if (option (Opt_loginShell)) 1750 if (option (Opt_loginShell))
1464 { 1751 {
1465 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1752 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1466 1753

Diff Legend

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