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.222 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.263 by sf-exg, Thu Apr 1 00:12:33 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>
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
… …
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#ifndef 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 */
… …
266 NULL, // Color_underline 511 NULL, // Color_underline
267#endif 512#endif
268#ifdef OPTION_HC 513#ifdef OPTION_HC
269 NULL, 514 NULL,
270#endif 515#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 516 COLOR_SCROLLBAR,
517#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 518 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 519#endif
275#if ENABLE_TRANSPARENCY 520#if ENABLE_TRANSPARENCY
276 NULL, 521 NULL,
277#endif 522#endif
278#if OFF_FOCUS_FADING 523#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 524 "rgb:00/00/00",
280#endif 525#endif
281 }; 526 };
282 527
283bool 528void
284rxvt_term::init_vars () 529rxvt_term::init_vars ()
285{ 530{
286 pix_colors = // 531 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 532
293 MEvent.time = CurrentTime; 533 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 534 MEvent.button = AnyButton;
295 want_refresh = 1; 535 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 536 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 537 ncol = 80;
298 nrow = 24; 538 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 539 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 540 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 541 lineSpace = LINESPACE;
542 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 543 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 544
305 refresh_type = SLOW_REFRESH; 545 refresh_type = SLOW_REFRESH;
306 546
307 oldcursor.row = oldcursor.col = -1; 547 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 548
310 set_option (Opt_scrollBar); 549 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 550 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 551 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 552 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 553 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 554 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 555 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 556 set_option (Opt_intensityStyles);
557 set_option (Opt_iso14755);
318 set_option (Opt_iso14755_52); 558 set_option (Opt_iso14755_52);
319 559 set_option (Opt_buffered);
320 return true;
321} 560}
322 561
323void 562static void
324rxvt_term::init_secondary () 563init_secondary ()
325{ 564{
326 int i; 565 int i;
327 566
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) 567 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 { 568 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO); 569 dup2 (STDERR_FILENO, STDIN_FILENO);
336 } 570 }
337 else if (i != STDIN_FILENO) 571 else if (i != STDIN_FILENO)
338 { 572 {
339 dup2 (i, STDIN_FILENO); 573 dup2 (i, STDIN_FILENO);
340 close (i); 574 close (i);
341 } 575 }
342 576
343 dup2 (STDERR_FILENO, STDOUT_FILENO); 577 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} 578}
356 579
357/*----------------------------------------------------------------------*/ 580/*----------------------------------------------------------------------*/
358const char ** 581const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 582rxvt_term::init_resources (int argc, const char *const *argv)
… …
415#if XFT 638#if XFT
416 if (rs[Rs_depth]) 639 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 640 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 641#endif
419 642
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv); 643 free (r_argv);
424 644
425 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
427 rs [i] = 0; 647 rs [i] = 0;
648
649#ifdef HAVE_AFTERIMAGE
650 set_application_name ((char *)rs[Rs_name]);
651 set_output_threshold (OUTPUT_LEVEL_WARNING);
652#endif
428 653
429#if ENABLE_PERL 654#if ENABLE_PERL
430 if (!rs[Rs_perl_ext_1]) 655 if (!rs[Rs_perl_ext_1])
431 rs[Rs_perl_ext_1] = "default"; 656 rs[Rs_perl_ext_1] = "default";
432 657
… …
444 */ 669 */
445 if (cmd_argv && cmd_argv[0]) 670 if (cmd_argv && cmd_argv[0])
446 { 671 {
447 if (!rs[Rs_title]) 672 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 673 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
674
449 if (!rs[Rs_iconName]) 675 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 676 rs[Rs_iconName] = rs[Rs_title];
451 } 677 }
452 else 678 else
453 { 679 {
454 if (!rs[Rs_title]) 680 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 681 rs[Rs_title] = rs[Rs_name];
682
456 if (!rs[Rs_iconName]) 683 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 684 rs[Rs_iconName] = rs[Rs_name];
458 } 685 }
459 686
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 687 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
467 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 694 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
468 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
469 696
470 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
471 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
699
700 if (rs[Rs_letterSpace])
701 letterSpace = atoi (rs[Rs_letterSpace]);
472#endif 702#endif
473 703
474#ifdef POINTER_BLANK 704#ifdef POINTER_BLANK
475 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 705 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
476 pointerBlankDelay = i; 706 pointerBlankDelay = i;
… …
479#endif 709#endif
480 710
481 /* no point having a scrollbar without having any scrollback! */ 711 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 712 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 713 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 714
490 if (!rs[Rs_cutchars]) 715 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 716 rs[Rs_cutchars] = CUTCHARS;
492 717
493#ifndef NO_BACKSPACE_KEY 718#ifndef NO_BACKSPACE_KEY
… …
506# else 731# else
507 rs[Rs_delete_key] = "\033[3~"; 732 rs[Rs_delete_key] = "\033[3~";
508# endif 733# endif
509#endif 734#endif
510 735
511#ifdef HAVE_SCROLLBARS 736 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 737
515#ifdef XTERM_REVERSE_VIDEO 738#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 739 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 740 if (option (Opt_reverseVideo))
518 { 741 {
… …
556 return cmd_argv; 779 return cmd_argv;
557} 780}
558 781
559/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
560void 783void
784rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
785{
786 this->envv = envv;
787
788 SET_R (this);
789 set_locale ("");
790 set_environ (envv); // a few things in X do not call setlocale :(
791
792 init_vars ();
793
794 init_secondary ();
795
796 const char **cmd_argv = init_resources (argc, argv);
797
798#ifdef KEYSYM_RESOURCE
799 keyboard->register_done ();
800#endif
801
802 if (const char *path = rs[Rs_chdir])
803 if (*path) // ignored if empty
804 {
805 if (*path != '/')
806 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
807
808 if (chdir (path))
809 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
810 }
811
812 if (option (Opt_scrollBar))
813 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
814
815 pty = ptytty::create ();
816
817 create_windows (argc, argv);
818
819 init_xlocale ();
820
821 scr_poweron (); // initialize screen
822
823#if 0
824 XSynchronize (dpy, True);
825#endif
826
827 if (option (Opt_scrollBar))
828 scrollBar.resize (); /* create and map scrollbar */
829#ifdef HAVE_BG_PIXMAP
830 {
831 bgPixmap.set_target (this);
832 bgPixmap.invalidate ();
833
834#ifdef ENABLE_TRANSPARENCY
835 if (option (Opt_transparent))
836 {
837 bgPixmap.set_transparent ();
838
839#ifdef HAVE_AFTERIMAGE
840 if (rs [Rs_blurradius])
841 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
842#endif
843 if (ISSET_PIXCOLOR (Color_tint))
844 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
845
846 if (rs [Rs_shade])
847 bgPixmap.set_shade (rs [Rs_shade]);
848
849 bgPixmap.set_root_pixmap ();
850 XSelectInput (dpy, display->root, PropertyChangeMask);
851 rootwin_ev.start (display, display->root);
852 }
853#endif
854
855#ifdef BG_IMAGE_FROM_FILE
856 if (rs[Rs_backgroundPixmap])
857 {
858 const char *p = rs[Rs_backgroundPixmap];
859
860 if ((p = strchr (p, ';')) != 0)
861 {
862 p++;
863 bgPixmap.set_geometry (p);
864 }
865 else
866 bgPixmap.set_defaultGeometry ();
867
868 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
869 if (!bgPixmap.window_position_sensitive ())
870 update_background ();
871 }
872#endif
873 }
874#endif
875
876#if ENABLE_PERL
877 rootwin_ev.start (display, display->root);
878#endif
879
880 set_colorfgbg ();
881
882 init_command (cmd_argv);
883
884 free (cmd_argv);
885
886 if (pty->pty >= 0)
887 pty_ev.start (pty->pty, ev::READ);
888
889 HOOK_INVOKE ((this, HOOK_START, DT_END));
890
891#if ENABLE_XEMBED
892 if (rs[Rs_embed])
893 {
894 long info[2] = { 0, XEMBED_MAPPED };
895
896 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
897 32, PropModeReplace, (unsigned char *)&info, 2);
898 }
899#endif
900
901 XMapWindow (dpy, vt);
902 XMapWindow (dpy, parent[0]);
903
904 refresh_check ();
905}
906
907/*----------------------------------------------------------------------*/
908void
561rxvt_term::init_env () 909rxvt_term::init_env ()
562{ 910{
563 int i; 911 int i;
564 char *val; 912 char *val;
565 913
… …
740 run_command (argv); 1088 run_command (argv);
741} 1089}
742 1090
743/*----------------------------------------------------------------------*/ 1091/*----------------------------------------------------------------------*/
744void 1092void
745rxvt_term::Get_Colours () 1093rxvt_term::get_colours ()
746{ 1094{
747 int i; 1095 int i;
748 1096
749#ifdef OFF_FOCUS_FADING 1097#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 1098 pix_colors = pix_colors_focused;
… …
810 * get scrollBar shadow colors 1158 * get scrollBar shadow colors
811 * 1159 *
812 * The calculations of topShadow/bottomShadow values are adapted 1160 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 1161 * from the fvwm window manager.
814 */ 1162 */
815#ifdef KEEP_SCROLLCOLOR 1163#ifdef RXVT_SCROLLBAR
816 if (depth <= 2) 1164 if (depth <= 2)
817 { 1165 {
818 /* Monochrome */ 1166 /* Monochrome */
819 alias_color (Color_scroll, Color_fg); 1167 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg); 1168 alias_color (Color_topShadow, Color_bg);
… …
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1183 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 1184 cscroll.a)
837 )) 1185 ))
838 alias_color (Color_topShadow, Color_White); 1186 alias_color (Color_topShadow, Color_White);
839 } 1187 }
840#endif /* KEEP_SCROLLCOLOR */ 1188#endif
841 1189
842#ifdef OFF_FOCUS_FADING 1190#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1191 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 1192 update_fade_color (i);
845#endif 1193#endif
… …
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1201 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
854 { 1202 {
855 int i = atoi (rs[Rs_color + idx]); 1203 int i = atoi (rs[Rs_color + idx]);
856 1204
857 if (i >= 8 && i <= 15) 1205 if (i >= 8 && i <= 15)
858 { /* bright colors */ 1206 /* bright colors */
859 i -= 8;
860 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1207 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
861 return; 1208 else if (i >= 0 && i <= 7)
862 } 1209 /* normal colors */
863
864 if (i >= 0 && i <= 7) /* normal colors */
865 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1210 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
866 } 1211 }
867} 1212}
868 1213
869/*----------------------------------------------------------------------*/ 1214/*----------------------------------------------------------------------*/
… …
970 Window top, parent; 1315 Window top, parent;
971 1316
972 dLocal (Display *, dpy); 1317 dLocal (Display *, dpy);
973 1318
974 /* grab colors before netscape does */ 1319 /* grab colors before netscape does */
975 Get_Colours (); 1320 get_colours ();
976 1321
977 if (!set_fonts ()) 1322 if (!set_fonts ())
978 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1323 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
979 1324
980 parent = display->root; 1325 parent = display->root;
… …
1028 this->parent[0] = top; 1373 this->parent[0] = top;
1029 1374
1030 old_width = szHint.width; 1375 old_width = szHint.width;
1031 old_height = szHint.height; 1376 old_height = szHint.height;
1032 1377
1033 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1378 set_title (rs [Rs_title]);
1034 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1379 set_icon_name (rs [Rs_iconName]);
1035 1380
1036 classHint.res_name = (char *)rs[Rs_name]; 1381 classHint.res_name = (char *)rs[Rs_name];
1037 classHint.res_class = (char *)RESCLASS; 1382 classHint.res_class = (char *)RESCLASS;
1038 1383
1039 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1384 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1041 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1386 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1042 wmHint.window_group = top; 1387 wmHint.window_group = top;
1043 1388
1044 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1389 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1045 &szHint, &wmHint, &classHint); 1390 &szHint, &wmHint, &classHint);
1391#if ENABLE_EWMH
1392# ifdef HAVE_AFTERIMAGE
1393 /*
1394 * set up icon hint
1395 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1396 */
1397
1398 if (rs [Rs_iconfile])
1399 {
1400 init_asv ();
1401
1402 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1403 if (asv && im)
1404 {
1405 int w = im->width;
1406 int h = im->height;
1407 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1408 ASImage *result = scale_asimage (asv, im,
1409 w, h, ASA_ARGB32,
1410 100, ASIMAGE_QUALITY_DEFAULT);
1411 destroy_asimage (&im);
1412
1413 if (buffer && result)
1414 {
1415 ARGB32 *asbuf = result->alt.argb32;
1416 buffer [0] = w;
1417 buffer [1] = h;
1418
1419 for (unsigned int i = 0; i < w * h; ++i)
1420 buffer [i + 2] = asbuf [i];
1421
1422 destroy_asimage (&result);
1423 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1424 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1425 free (buffer);
1426 }
1427 else
1428 {
1429 if (!buffer)
1430 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1431
1432 if (!result)
1433 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1434 }
1435 }
1436 else
1437 rxvt_warn ("Loading image icon failed, continuing without.\n");
1438 }
1439# endif
1440#endif
1046 1441
1047#if ENABLE_FRILLS 1442#if ENABLE_FRILLS
1048 if (mwmhints.flags) 1443 if (mwmhints.flags)
1049 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1444 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1050 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1445 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1084 1479
1085 termwin_ev.start (display, top); 1480 termwin_ev.start (display, top);
1086 1481
1087 /* vt cursor: Black-on-White is standard, but this is more popular */ 1482 /* vt cursor: Black-on-White is standard, but this is more popular */
1088 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 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 1484
1095 /* the vt window */ 1485 /* the vt window */
1096 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1097 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1098 width, height, 1488 width, height,
… …
1123 GCForeground | GCBackground | GCGraphicsExposures, 1513 GCForeground | GCBackground | GCGraphicsExposures,
1124 &gcvalue); 1514 &gcvalue);
1125 1515
1126 drawable = new rxvt_drawable (this, vt); 1516 drawable = new rxvt_drawable (this, vt);
1127 1517
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 1518#ifdef OFF_FOCUS_FADING
1138 // initially we are in unfocused state 1519 // initially we are in unfocused state
1139 if (rs[Rs_fade]) 1520 if (rs[Rs_fade])
1140 pix_colors = pix_colors_unfocused; 1521 pix_colors = pix_colors_unfocused;
1141#endif 1522#endif
… …
1146 1527
1147/* ------------------------------------------------------------------------- * 1528/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE * 1529 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */ 1530 * ------------------------------------------------------------------------- */
1150void 1531void
1151rxvt_get_ttymode (ttymode_t *tio, int erase) 1532rxvt_get_ttymode (struct termios *tio, int erase)
1152{ 1533{
1153 /* 1534 /*
1154 * standard System V termios interface 1535 * standard System V termios interface
1155 */ 1536 */
1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1537 if (tcgetattr (STDIN_FILENO, tio) < 0)
1157 { 1538 {
1158 // return error - use system defaults, 1539 // return error - use system defaults,
1159 // where possible, and zero elsewhere 1540 // where possible, and zero elsewhere
1160 memset (tio, 0, sizeof (ttymode_t)); 1541 memset (tio, 0, sizeof (struct termios));
1161 1542
1162 tio->c_cc[VINTR] = CINTR; 1543 tio->c_cc[VINTR] = CINTR;
1163 tio->c_cc[VQUIT] = CQUIT; 1544 tio->c_cc[VQUIT] = CQUIT;
1164 tio->c_cc[VERASE] = CERASE; 1545 tio->c_cc[VERASE] = CERASE;
1165#ifdef VERASE2 1546#ifdef VERASE2
… …
1229 1610
1230 /* 1611 /*
1231 * Debugging 1612 * Debugging
1232 */ 1613 */
1233#ifdef DEBUG_TTYMODE 1614#ifdef DEBUG_TTYMODE
1234#ifdef HAVE_TERMIOS_H
1235 /* c_iflag bits */ 1615 /* c_iflag bits */
1236 fprintf (stderr, "Input flags\n"); 1616 fprintf (stderr, "Input flags\n");
1237 1617
1238 /* cpp token stringize doesn't work on all machines <sigh> */ 1618 /* cpp token stringize doesn't work on all machines <sigh> */
1239# define FOO(flag,name) \ 1619# define FOO(flag,name) \
… …
1302 FOO (VLNEXT, "VLNEXT"); 1682 FOO (VLNEXT, "VLNEXT");
1303# endif 1683# endif
1304 1684
1305 fprintf (stderr, "\n"); 1685 fprintf (stderr, "\n");
1306# undef FOO 1686# undef FOO
1307# endif /* HAVE_TERMIOS_H */
1308#endif /* DEBUG_TTYMODE */ 1687#endif /* DEBUG_TTYMODE */
1309} 1688}
1310 1689
1311/*----------------------------------------------------------------------*/ 1690/*----------------------------------------------------------------------*/
1312/* 1691/*
… …
1346 else 1725 else
1347#endif 1726#endif
1348 er = -1; 1727 er = -1;
1349 1728
1350 rxvt_get_ttymode (&tio, er); 1729 rxvt_get_ttymode (&tio, er);
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1730 /* init terminal attributes */
1731 cfsetospeed (&tio, BAUDRATE);
1732 cfsetispeed (&tio, BAUDRATE);
1733 tcsetattr (pty->tty, TCSANOW, &tio);
1352 pty->set_utf8_mode (enc_utf8); 1734 pty->set_utf8_mode (enc_utf8);
1353 1735
1354 /* set initial window size */ 1736 /* set initial window size */
1355 tt_winch (); 1737 tt_winch ();
1356 1738
… …
1416rxvt_term::run_child (const char *const *argv) 1798rxvt_term::run_child (const char *const *argv)
1417{ 1799{
1418 char *login; 1800 char *login;
1419 1801
1420 if (option (Opt_console)) 1802 if (option (Opt_console))
1803 {
1421 { /* be virtual console, fail silently */ 1804 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1805#ifdef TIOCCONS
1423 unsigned int on = 1; 1806 unsigned int on = 1;
1424 1807
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1808 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1809#elif defined (SRIOCSREDIR)
… …
1447 signal (SIGTSTP, SIG_IGN); 1830 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1831 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1832 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1833#endif /* SIGTSTP */
1451 1834
1452 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss;
1454 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0);
1456
1457 /* command interpreter path */ 1835 /* command interpreter path */
1458 if (argv) 1836 if (argv)
1459 { 1837 {
1460# ifdef DEBUG_CMD 1838# ifdef DEBUG_CMD
1461 int i; 1839 int i;
… …
1472 const char *argv0, *shell; 1850 const char *argv0, *shell;
1473 1851
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1852 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1853 shell = "/bin/sh";
1476 1854
1477 argv0 = (const char *)rxvt_basename (shell); 1855 argv0 = rxvt_basename (shell);
1478 1856
1479 if (option (Opt_loginShell)) 1857 if (option (Opt_loginShell))
1480 { 1858 {
1481 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1859 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1860

Diff Legend

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