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.218 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.291 by sf-exg, Sun Jan 23 12:28:47 2011 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>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
… …
142 143
143 return rval; 144 return rval;
144} 145}
145#endif 146#endif
146 147
147const char *const def_colorName[] = 148static const char *const def_colorName[] =
148 { 149 {
149 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
150 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
151 /* low-intensity colors */ 152 /* low-intensity colors */
152 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
154 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
155 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
156 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
157 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
158 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
159# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
160 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
161# else 162# else
162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
163# endif 164# endif
164 /* high-intensity colors */ 165 /* high-intensity colors */
165# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
166 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 178
179#if !USE_256_COLORS
178 // 88 xterm colours 180 // 88 xterm colours
179 "rgb:00/00/00", 181 "rgb:00/00/00",
180 "rgb:00/00/8b", 182 "rgb:00/00/8b",
181 "rgb:00/00/cd", 183 "rgb:00/00/cd",
182 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
250 "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
251 496
252#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
256 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
257 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
258 NULL, /* Color_border */ 503 NULL, /* Color_border */
259#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
260 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
261 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
262 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
263 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
265#if ENABLE_FRILLS 510#if ENABLE_FRILLS
266 NULL, // Color_underline 511 NULL, // Color_underline
267#endif 512#endif
268#ifdef OPTION_HC 513#ifdef OPTION_HC
269 NULL, 514 NULL,
515 NULL,
270#endif 516#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 520#endif
275#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
276 NULL, 522 NULL,
277#endif 523#endif
278#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 525 "rgb:00/00/00",
280#endif 526#endif
281 }; 527 };
282 528
283bool 529void
284rxvt_term::init_vars () 530rxvt_term::init_vars ()
285{ 531{
286 pix_colors = // 532 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 533
293 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
295 want_refresh = 1; 536 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 538 ncol = 80;
298 nrow = 24; 539 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 544 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 545
305 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
306 547
307 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 549
310 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
318 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
319 560 set_option (Opt_buffered);
320 return true;
321}
322
323void
324rxvt_term::init_secondary ()
325{
326 int i;
327
328 /*
329 * Close all unused file descriptors
330 * We don't want them, we don't need them.
331 */
332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO);
336 }
337 else if (i != STDIN_FILENO)
338 {
339 dup2 (i, STDIN_FILENO);
340 close (i);
341 }
342
343 dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345#if 0 // schmorp sayz closing filies is murder
346 for (i = STDERR_FILENO + 1; i < num_fds; i++)
347 {
348#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349 if (i == 4 || i == 7)
350 continue;
351#endif
352 close (i);
353 }
354#endif
355} 561}
356 562
357/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
358const char ** 564const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
369 break; 575 break;
370 576
371 if (r_argc == argc) 577 if (r_argc == argc)
372 cmd_argv = NULL; 578 cmd_argv = NULL;
373 else if (!argv[r_argc + 1]) 579 else if (!argv[r_argc + 1])
374 rxvt_fatal ("-e requires an argument\n"); 580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else 581 else
376 { 582 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378 584
379 for (i = 0; i < argc - r_argc - 1; i++) 585 for (i = 0; i < argc - r_argc - 1; i++)
… …
415#if XFT 621#if XFT
416 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 624#endif
419 625
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv); 626 free (r_argv);
424 627
425 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
427 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#endif
428 640
429#if ENABLE_PERL 641#if ENABLE_PERL
430 if (!rs[Rs_perl_ext_1]) 642 if (!rs[Rs_perl_ext_1])
431 rs[Rs_perl_ext_1] = "default"; 643 rs[Rs_perl_ext_1] = "default";
432 644
… …
444 */ 656 */
445 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
446 { 658 {
447 if (!rs[Rs_title]) 659 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 660 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
661
449 if (!rs[Rs_iconName]) 662 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 663 rs[Rs_iconName] = rs[Rs_title];
451 } 664 }
452 else 665 else
453 { 666 {
454 if (!rs[Rs_title]) 667 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 668 rs[Rs_title] = rs[Rs_name];
669
456 if (!rs[Rs_iconName]) 670 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 671 rs[Rs_iconName] = rs[Rs_name];
458 } 672 }
459 673
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 674 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
467 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 681 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
468 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 682 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
469 683
470 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 684 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
471 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 685 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
686
687 if (rs[Rs_letterSpace])
688 letterSpace = atoi (rs[Rs_letterSpace]);
472#endif 689#endif
473 690
474#ifdef POINTER_BLANK 691#ifdef POINTER_BLANK
475 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
476 pointerBlankDelay = i; 693 pointerBlankDelay = i;
… …
479#endif 696#endif
480 697
481 /* no point having a scrollbar without having any scrollback! */ 698 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 699 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 700 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 701
490 if (!rs[Rs_cutchars]) 702 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 703 rs[Rs_cutchars] = CUTCHARS;
492 704
493#ifndef NO_BACKSPACE_KEY 705#ifndef NO_BACKSPACE_KEY
… …
506# else 718# else
507 rs[Rs_delete_key] = "\033[3~"; 719 rs[Rs_delete_key] = "\033[3~";
508# endif 720# endif
509#endif 721#endif
510 722
511#ifdef HAVE_SCROLLBARS 723 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 724
515#ifdef XTERM_REVERSE_VIDEO 725#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 726 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 727 if (option (Opt_reverseVideo))
518 { 728 {
… …
538 color_aliases (Color_fg); 748 color_aliases (Color_fg);
539 color_aliases (Color_bg); 749 color_aliases (Color_bg);
540#ifndef NO_CURSORCOLOR 750#ifndef NO_CURSORCOLOR
541 color_aliases (Color_cursor); 751 color_aliases (Color_cursor);
542 color_aliases (Color_cursor2); 752 color_aliases (Color_cursor2);
543#endif /* NO_CURSORCOLOR */ 753#endif /* NO_CURSORCOLOR */
544 color_aliases (Color_pointer_fg); 754 color_aliases (Color_pointer_fg);
545 color_aliases (Color_pointer_bg); 755 color_aliases (Color_pointer_bg);
546 color_aliases (Color_border); 756 color_aliases (Color_border);
547#ifndef NO_BOLD_UNDERLINE_REVERSE 757#ifndef NO_BOLD_UNDERLINE_REVERSE
548 color_aliases (Color_BD); 758 color_aliases (Color_BD);
549 color_aliases (Color_UL); 759 color_aliases (Color_UL);
550 color_aliases (Color_RV); 760 color_aliases (Color_RV);
551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 761#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
552 762
553 if (!rs[Rs_color + Color_border]) 763 if (!rs[Rs_color + Color_border])
554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 764 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
555 765
556 return cmd_argv; 766 return cmd_argv;
767}
768
769/*----------------------------------------------------------------------*/
770void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
772{
773 this->envv = envv;
774
775 SET_R (this);
776 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :(
778
779 init_vars ();
780
781 const char **cmd_argv = init_resources (argc, argv);
782
783#ifdef KEYSYM_RESOURCE
784 keyboard->register_done ();
785#endif
786
787 if (const char *path = rs[Rs_chdir])
788 if (*path) // ignored if empty
789 {
790 if (*path != '/')
791 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
792
793 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 }
796
797 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
799
800 pty = ptytty::create ();
801
802 create_windows (argc, argv);
803
804 init_xlocale ();
805
806 scr_poweron (); // initialize screen
807
808#if 0
809 XSynchronize (dpy, True);
810#endif
811
812 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP
815 {
816 bgPixmap.set_target (this);
817
818#ifdef ENABLE_TRANSPARENCY
819 if (option (Opt_transparent))
820 {
821 bgPixmap.set_transparent ();
822
823 if (rs [Rs_blurradius])
824 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
825
826 if (ISSET_PIXCOLOR (Color_tint))
827 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
828
829 if (rs [Rs_shade])
830 bgPixmap.set_shade (rs [Rs_shade]);
831
832 bgPixmap.set_root_pixmap ();
833 XSelectInput (dpy, display->root, PropertyChangeMask);
834 rootwin_ev.start (display, display->root);
835 }
836#endif
837
838#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap])
840 {
841 const char *p = rs[Rs_backgroundPixmap];
842
843 if ((p = strchr (p, ';')) != 0)
844 {
845 p++;
846 bgPixmap.set_geometry (p);
847 }
848 else
849 bgPixmap.set_defaultGeometry ();
850
851 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
852 if (!bgPixmap.window_position_sensitive ())
853 update_background ();
854 }
855#endif
856 }
857#endif
858
859#if ENABLE_PERL
860 rootwin_ev.start (display, display->root);
861#endif
862
863 set_colorfgbg ();
864
865 init_command (cmd_argv);
866
867 free (cmd_argv);
868
869 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ);
871
872 HOOK_INVOKE ((this, HOOK_START, DT_END));
873
874#if ENABLE_XEMBED
875 if (rs[Rs_embed])
876 {
877 long info[2] = { 0, XEMBED_MAPPED };
878
879 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2);
881 }
882#endif
883
884 XMapWindow (dpy, vt);
885 XMapWindow (dpy, parent[0]);
886
887 refresh_check ();
557} 888}
558 889
559/*----------------------------------------------------------------------*/ 890/*----------------------------------------------------------------------*/
560void 891void
561rxvt_term::init_env () 892rxvt_term::init_env ()
562{ 893{
563 int i;
564 char *val; 894 char *val;
565 895
566#ifdef DISPLAY_IS_IP 896#ifdef DISPLAY_IS_IP
567 /* Fixup display_name for export over pty to any interested terminal 897 /* Fixup display_name for export over pty to any interested terminal
568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 898 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
576 */ 906 */
577 val = rxvt_network_display (rs[Rs_display_name]); 907 val = rxvt_network_display (rs[Rs_display_name]);
578 rs[Rs_display_name] = (const char *)val; 908 rs[Rs_display_name] = (const char *)val;
579 909
580 if (val == NULL) 910 if (val == NULL)
581#endif /* DISPLAY_IS_IP */ 911#endif /* DISPLAY_IS_IP */
582 val = XDisplayString (dpy); 912 val = XDisplayString (dpy);
583 913
584 if (rs[Rs_display_name] == NULL) 914 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 915 rs[Rs_display_name] = val; /* use broken `:0' value */
586 916
587 i = strlen (val);
588 env_display = (char *)rxvt_malloc (i + 9); 917 env_display = (char *)rxvt_malloc (strlen (val) + 9);
589 918
590 sprintf (env_display, "DISPLAY=%s", val); 919 sprintf (env_display, "DISPLAY=%s", val);
591 920
592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
593 922
… …
626#ifdef HAVE_UNSETENV 955#ifdef HAVE_UNSETENV
627 /* avoid passing old settings and confusing term size */ 956 /* avoid passing old settings and confusing term size */
628 unsetenv ("LINES"); 957 unsetenv ("LINES");
629 unsetenv ("COLUMNS"); 958 unsetenv ("COLUMNS");
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 959 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 960#endif /* HAVE_UNSETENV */
632} 961}
633 962
634/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
635/* 964/*
636 * This is more or less stolen straight from XFree86 xterm. 965 * This is more or less stolen straight from XFree86 xterm.
… …
657 986
658 this->locale = "C"; 987 this->locale = "C";
659 } 988 }
660 989
661 990
662 this->locale = rxvt_strdup (this->locale); 991 this->locale = strdup (this->locale);
663 SET_LOCALE (this->locale); 992 SET_LOCALE (this->locale);
664 mbstate.reset (); 993 mbstate.reset ();
665#endif 994#endif
666 995
667#if HAVE_NL_LANGINFO 996#if HAVE_NL_LANGINFO
… …
740 run_command (argv); 1069 run_command (argv);
741} 1070}
742 1071
743/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
744void 1073void
745rxvt_term::Get_Colours () 1074rxvt_term::get_colours ()
746{ 1075{
747 int i; 1076 int i;
748 1077
749#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 1079 pix_colors = pix_colors_focused;
751#endif 1080#endif
752 1081
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 { 1083 {
755 const char *name = rs[Rs_color + i]; 1084 const char *name = rs[Rs_color + i];
756 1085
757 if (!name) 1086 if (!name)
… …
810 * get scrollBar shadow colors 1139 * get scrollBar shadow colors
811 * 1140 *
812 * The calculations of topShadow/bottomShadow values are adapted 1141 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 1142 * from the fvwm window manager.
814 */ 1143 */
815#ifdef KEEP_SCROLLCOLOR 1144#ifdef RXVT_SCROLLBAR
816 if (depth <= 2) 1145 if (depth <= 2)
817 { 1146 {
818 /* Monochrome */ 1147 /* Monochrome */
819 alias_color (Color_scroll, Color_fg); 1148 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg); 1149 alias_color (Color_topShadow, Color_bg);
… …
835 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),
836 cscroll.a) 1165 cscroll.a)
837 )) 1166 ))
838 alias_color (Color_topShadow, Color_White); 1167 alias_color (Color_topShadow, Color_White);
839 } 1168 }
840#endif /* KEEP_SCROLLCOLOR */ 1169#endif
841 1170
842#ifdef OFF_FOCUS_FADING 1171#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 1173 update_fade_color (i);
845#endif 1174#endif
… …
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854 { 1183 {
855 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
856 1185
857 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
858 { /* bright colors */ 1187 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1188 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 1189 else if (i >= 0 && i <= 7)
862 } 1190 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1191 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 1192 }
867} 1193}
868 1194
869/*----------------------------------------------------------------------*/ 1195/*----------------------------------------------------------------------*/
… …
953 1279
954 if (i) 1280 if (i)
955 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
956} 1282}
957 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 unsigned int w = im->width;
1298 unsigned 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#ifdef HAVE_PIXBUF
1339 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1340 if (!pixbuf)
1341 {
1342 rxvt_warn ("Loading image icon failed, continuing without.\n");
1343 return;
1344 }
1345
1346 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1347 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1348
1349 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1350 {
1351 rxvt_warn ("Icon image too big, continuing without.\n");
1352 g_object_unref (pixbuf);
1353 return;
1354 }
1355
1356 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1357 {
1358 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1359 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1360 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1361
1362 buffer [0] = w;
1363 buffer [1] = h;
1364 for (int i = 0; i < h; i++)
1365 {
1366 for (int j = 0; j < w; j++)
1367 {
1368 unsigned char *pixel = row + j * channels;
1369 long value;
1370
1371 if (channels == 4)
1372 value = pixel[3];
1373 else
1374 value = (unsigned char)0x00ff;
1375
1376 value = (value << 8) + pixel[0];
1377 value = (value << 8) + pixel[1];
1378 value = (value << 8) + pixel[2];
1379 buffer[(i * w + j) + 2] = value;
1380 }
1381
1382 row += rowstride;
1383 }
1384
1385 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1386 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1387 free (buffer);
1388 }
1389 else
1390 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1391
1392 g_object_unref (pixbuf);
1393#endif
1394}
1395
958/*----------------------------------------------------------------------*/ 1396/*----------------------------------------------------------------------*/
959/* rxvt_Create_Windows () - Open and map the window */ 1397/* rxvt_Create_Windows () - Open and map the window */
960void 1398void
961rxvt_term::create_windows (int argc, const char *const *argv) 1399rxvt_term::create_windows (int argc, const char *const *argv)
962{ 1400{
… …
970 Window top, parent; 1408 Window top, parent;
971 1409
972 dLocal (Display *, dpy); 1410 dLocal (Display *, dpy);
973 1411
974 /* grab colors before netscape does */ 1412 /* grab colors before netscape does */
975 Get_Colours (); 1413 get_colours ();
976 1414
977 if (!set_fonts ()) 1415 if (!set_fonts ())
978 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1416 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
979 1417
980 parent = display->root; 1418 parent = display->root;
… …
1028 this->parent[0] = top; 1466 this->parent[0] = top;
1029 1467
1030 old_width = szHint.width; 1468 old_width = szHint.width;
1031 old_height = szHint.height; 1469 old_height = szHint.height;
1032 1470
1033 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1471 set_title (rs [Rs_title]);
1034 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1472 set_icon_name (rs [Rs_iconName]);
1035 1473
1036 classHint.res_name = (char *)rs[Rs_name]; 1474 classHint.res_name = (char *)rs[Rs_name];
1037 classHint.res_class = (char *)RESCLASS; 1475 classHint.res_class = (char *)RESCLASS;
1038 1476
1039 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1477 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1041 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1479 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1042 wmHint.window_group = top; 1480 wmHint.window_group = top;
1043 1481
1044 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1482 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1045 &szHint, &wmHint, &classHint); 1483 &szHint, &wmHint, &classHint);
1484#if ENABLE_EWMH
1485 /*
1486 * set up icon hint
1487 * rs [Rs_iconfile] is path to icon
1488 */
1489
1490 if (rs [Rs_iconfile])
1491 {
1492 set_icon (rs [Rs_iconfile]);
1493 }
1494#endif
1046 1495
1047#if ENABLE_FRILLS 1496#if ENABLE_FRILLS
1048 if (mwmhints.flags) 1497 if (mwmhints.flags)
1049 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1498 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1050 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1499 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1055#if ENABLE_EWMH 1504#if ENABLE_EWMH
1056 xa[XA_NET_WM_PING], 1505 xa[XA_NET_WM_PING],
1057#endif 1506#endif
1058 }; 1507 };
1059 1508
1060 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1061 1510
1062#if ENABLE_FRILLS 1511#if ENABLE_FRILLS
1063 if (rs[Rs_transient_for]) 1512 if (rs[Rs_transient_for])
1064 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1065#endif 1514#endif
… …
1084 1533
1085 termwin_ev.start (display, top); 1534 termwin_ev.start (display, top);
1086 1535
1087 /* vt cursor: Black-on-White is standard, but this is more popular */ 1536 /* vt cursor: Black-on-White is standard, but this is more popular */
1088 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1537 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1089
1090#ifdef HAVE_SCROLLBARS
1091 /* cursor scrollBar: Black-on-White */
1092 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1093#endif
1094 1538
1095 /* the vt window */ 1539 /* the vt window */
1096 vt = XCreateSimpleWindow (dpy, top, 1540 vt = XCreateSimpleWindow (dpy, top,
1097 window_vt_x, window_vt_y, 1541 window_vt_x, window_vt_y,
1098 width, height, 1542 width, height,
… …
1123 GCForeground | GCBackground | GCGraphicsExposures, 1567 GCForeground | GCBackground | GCGraphicsExposures,
1124 &gcvalue); 1568 &gcvalue);
1125 1569
1126 drawable = new rxvt_drawable (this, vt); 1570 drawable = new rxvt_drawable (this, vt);
1127 1571
1128#ifdef RXVT_SCROLLBAR
1129 gcvalue.foreground = pix_colors[Color_topShadow];
1130 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1131 gcvalue.foreground = pix_colors[Color_bottomShadow];
1132 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1133 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1134 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1135#endif
1136
1137#ifdef OFF_FOCUS_FADING 1572#ifdef OFF_FOCUS_FADING
1138 // initially we are in unfocused state 1573 // initially we are in unfocused state
1139 if (rs[Rs_fade]) 1574 if (rs[Rs_fade])
1140 pix_colors = pix_colors_unfocused; 1575 pix_colors = pix_colors_unfocused;
1141#endif 1576#endif
1142 1577
1143 pointer_unblank (); 1578 pointer_unblank ();
1144 scr_recolour (); 1579 scr_recolour ();
1145}
1146
1147/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */
1150void
1151rxvt_get_ttymode (ttymode_t *tio, int erase)
1152{
1153 /*
1154 * standard System V termios interface
1155 */
1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1157 {
1158 // return error - use system defaults,
1159 // where possible, and zero elsewhere
1160 memset (tio, 0, sizeof (ttymode_t));
1161
1162 tio->c_cc[VINTR] = CINTR;
1163 tio->c_cc[VQUIT] = CQUIT;
1164 tio->c_cc[VERASE] = CERASE;
1165#ifdef VERASE2
1166 tio->c_cc[VERASE2] = CERASE2;
1167#endif
1168 tio->c_cc[VKILL] = CKILL;
1169 tio->c_cc[VSTART] = CSTART;
1170 tio->c_cc[VSTOP] = CSTOP;
1171 tio->c_cc[VSUSP] = CSUSP;
1172# ifdef VDSUSP
1173 tio->c_cc[VDSUSP] = CDSUSP;
1174# endif
1175# ifdef VREPRINT
1176 tio->c_cc[VREPRINT] = CRPRNT;
1177# endif
1178# ifdef VDISCRD
1179 tio->c_cc[VDISCRD] = CFLUSH;
1180# endif
1181# ifdef VWERSE
1182 tio->c_cc[VWERSE] = CWERASE;
1183# endif
1184# ifdef VLNEXT
1185 tio->c_cc[VLNEXT] = CLNEXT;
1186# endif
1187 }
1188
1189 tio->c_cc[VEOF] = CEOF;
1190 tio->c_cc[VEOL] = VDISABLE;
1191# ifdef VEOL2
1192 tio->c_cc[VEOL2] = VDISABLE;
1193# endif
1194# ifdef VSWTC
1195 tio->c_cc[VSWTC] = VDISABLE;
1196# endif
1197# ifdef VSWTCH
1198 tio->c_cc[VSWTCH] = VDISABLE;
1199# endif
1200# if VMIN != VEOF
1201 tio->c_cc[VMIN] = 1;
1202# endif
1203# if VTIME != VEOL
1204 tio->c_cc[VTIME] = 0;
1205# endif
1206
1207 if (erase != -1)
1208 tio->c_cc[VERASE] = (char)erase;
1209
1210 /* input modes */
1211 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1212# ifdef IMAXBEL
1213 | IMAXBEL
1214# endif
1215 | IXON);
1216
1217 /* output modes */
1218 tio->c_oflag = (OPOST | ONLCR);
1219
1220 /* control modes */
1221 tio->c_cflag = (CS8 | CREAD);
1222
1223 /* line discipline modes */
1224 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1225# if defined (ECHOCTL) && defined (ECHOKE)
1226 | ECHOCTL | ECHOKE
1227# endif
1228 | ECHOE | ECHOK);
1229
1230 /*
1231 * Debugging
1232 */
1233#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n");
1237
1238 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \
1240 if ((tio->c_iflag) & flag) \
1241 fprintf (stderr, "%s ", name)
1242
1243 /* c_iflag bits */
1244 FOO (IGNBRK, "IGNBRK");
1245 FOO (BRKINT, "BRKINT");
1246 FOO (IGNPAR, "IGNPAR");
1247 FOO (PARMRK, "PARMRK");
1248 FOO (INPCK, "INPCK");
1249 FOO (ISTRIP, "ISTRIP");
1250 FOO (INLCR, "INLCR");
1251 FOO (IGNCR, "IGNCR");
1252 FOO (ICRNL, "ICRNL");
1253 FOO (IXON, "IXON");
1254 FOO (IXOFF, "IXOFF");
1255# ifdef IUCLC
1256 FOO (IUCLC, "IUCLC");
1257# endif
1258# ifdef IXANY
1259 FOO (IXANY, "IXANY");
1260# endif
1261# ifdef IMAXBEL
1262 FOO (IMAXBEL, "IMAXBEL");
1263# endif
1264
1265 fprintf (stderr, "\n");
1266
1267# undef FOO
1268# define FOO(entry, name) \
1269 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1270
1271 FOO (VINTR, "VINTR");
1272 FOO (VQUIT, "VQUIT");
1273 FOO (VERASE, "VERASE");
1274 FOO (VKILL, "VKILL");
1275 FOO (VEOF, "VEOF");
1276 FOO (VEOL, "VEOL");
1277# ifdef VEOL2
1278 FOO (VEOL2, "VEOL2");
1279# endif
1280# ifdef VSWTC
1281 FOO (VSWTC, "VSWTC");
1282# endif
1283# ifdef VSWTCH
1284 FOO (VSWTCH, "VSWTCH");
1285# endif
1286 FOO (VSTART, "VSTART");
1287 FOO (VSTOP, "VSTOP");
1288 FOO (VSUSP, "VSUSP");
1289# ifdef VDSUSP
1290 FOO (VDSUSP, "VDSUSP");
1291# endif
1292# ifdef VREPRINT
1293 FOO (VREPRINT, "VREPRINT");
1294# endif
1295# ifdef VDISCRD
1296 FOO (VDISCRD, "VDISCRD");
1297# endif
1298# ifdef VWERSE
1299 FOO (VWERSE, "VWERSE");
1300# endif
1301# ifdef VLNEXT
1302 FOO (VLNEXT, "VLNEXT");
1303# endif
1304
1305 fprintf (stderr, "\n");
1306# undef FOO
1307# endif /* HAVE_TERMIOS_H */
1308#endif /* DEBUG_TTYMODE */
1309} 1580}
1310 1581
1311/*----------------------------------------------------------------------*/ 1582/*----------------------------------------------------------------------*/
1312/* 1583/*
1313 * Run the command in a subprocess and return a file descriptor for the 1584 * Run the command in a subprocess and return a file descriptor for the
… …
1334 else 1605 else
1335#endif 1606#endif
1336 if (!pty->get ()) 1607 if (!pty->get ())
1337 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1608 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1338 1609
1339 int er; 1610 struct termios tio = def_tio;
1340 1611
1341#ifndef NO_BACKSPACE_KEY 1612#ifndef NO_BACKSPACE_KEY
1342 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1613 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1343 er = rs[Rs_backspace_key][0]; 1614 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1344 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1615 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1345 er = '\177'; /* the initial state anyway */ 1616 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1346 else
1347#endif 1617#endif
1348 er = -1;
1349 1618
1350 rxvt_get_ttymode (&tio, er); 1619 /* init terminal attributes */
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1620 cfsetospeed (&tio, BAUDRATE);
1621 cfsetispeed (&tio, BAUDRATE);
1622 tcsetattr (pty->tty, TCSANOW, &tio);
1352 pty->set_utf8_mode (enc_utf8); 1623 pty->set_utf8_mode (enc_utf8);
1353 1624
1354 /* set initial window size */ 1625 /* set initial window size */
1355 tt_winch (); 1626 tt_winch ();
1356 1627
… …
1416rxvt_term::run_child (const char *const *argv) 1687rxvt_term::run_child (const char *const *argv)
1417{ 1688{
1418 char *login; 1689 char *login;
1419 1690
1420 if (option (Opt_console)) 1691 if (option (Opt_console))
1692 {
1421 { /* be virtual console, fail silently */ 1693 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1694#ifdef TIOCCONS
1423 unsigned int on = 1; 1695 unsigned int on = 1;
1424 1696
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1697 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1698#elif defined (SRIOCSREDIR)
… …
1428 1700
1429 fd = open (CONSOLE, O_WRONLY, 0); 1701 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1702 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1703 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432 close (fd); 1704 close (fd);
1433#endif /* SRIOCSREDIR */ 1705#endif /* SRIOCSREDIR */
1434 } 1706 }
1435 1707
1436 /* reset signals and spin off the command interpreter */ 1708 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1709 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1710 signal (SIGQUIT, SIG_DFL);
1439 signal (SIGCHLD, SIG_DFL); 1711 signal (SIGCHLD, SIG_DFL);
1440 signal (SIGHUP, SIG_DFL); 1712 signal (SIGHUP, SIG_DFL);
1441 signal (SIGPIPE, SIG_DFL); 1713 signal (SIGPIPE, SIG_DFL);
1442 /* 1714 /*
1443 * mimick login's behavior by disabling the job control signals 1715 * mimic login's behavior by disabling the job control signals
1444 * a shell that wants them can turn them back on 1716 * a shell that wants them can turn them back on
1445 */ 1717 */
1446#ifdef SIGTSTP 1718#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1719 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1720 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1721 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1722#endif /* SIGTSTP */
1451
1452 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss;
1454 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0);
1456 1723
1457 /* command interpreter path */ 1724 /* command interpreter path */
1458 if (argv) 1725 if (argv)
1459 { 1726 {
1460# ifdef DEBUG_CMD 1727# ifdef DEBUG_CMD
… …
1472 const char *argv0, *shell; 1739 const char *argv0, *shell;
1473 1740
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1741 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1742 shell = "/bin/sh";
1476 1743
1477 argv0 = (const char *)rxvt_basename (shell); 1744 argv0 = rxvt_basename (shell);
1478 1745
1479 if (option (Opt_loginShell)) 1746 if (option (Opt_loginShell))
1480 { 1747 {
1481 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1748 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1749

Diff Legend

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