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.226 by ayin, Tue Dec 11 17:42:04 2007 UTC vs.
Revision 1.289 by root, Mon Jan 3 03:05: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>
45 44
… …
61#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
62/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
63#include <sys/types.h> 62#include <sys/types.h>
64#include <sys/socket.h> 63#include <sys/socket.h>
65 64
66/* these next two are probably only on Sun (not Solaris) */ 65/* these next is probably only on Sun (not Solaris) */
67#ifdef HAVE_SYS_SOCKIO_H 66#ifdef HAVE_SYS_SOCKIO_H
68#include <sys/sockio.h> 67#include <sys/sockio.h>
69#endif
70#ifdef HAVE_SYS_BYTEORDER_H
71#include <sys/byteorder.h>
72#endif 68#endif
73 69
74#include <netinet/in.h> 70#include <netinet/in.h>
75#include <arpa/inet.h> 71#include <arpa/inet.h>
76#include <net/if.h> 72#include <net/if.h>
… …
144 140
145 return rval; 141 return rval;
146} 142}
147#endif 143#endif
148 144
149const char *const def_colorName[] = 145static const char *const def_colorName[] =
150 { 146 {
151 COLOR_FOREGROUND, 147 COLOR_FOREGROUND,
152 COLOR_BACKGROUND, 148 COLOR_BACKGROUND,
153 /* low-intensity colors */ 149 /* low-intensity colors */
154 "rgb:00/00/00", // 0: black (Black) 150 "rgb:00/00/00", // 0: black (Black)
… …
175 "rgb:00/00/ff", // 4/12: bright blue (Blue) 171 "rgb:00/00/ff", // 4/12: bright blue (Blue)
176 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 172 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
177 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 173 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
178 "rgb:ff/ff/ff", // 7/15: bright white (White) 174 "rgb:ff/ff/ff", // 7/15: bright white (White)
179 175
176#if !USE_256_COLORS
180 // 88 xterm colours 177 // 88 xterm colours
181 "rgb:00/00/00", 178 "rgb:00/00/00",
182 "rgb:00/00/8b", 179 "rgb:00/00/8b",
183 "rgb:00/00/cd", 180 "rgb:00/00/cd",
184 "rgb:00/00/ff", 181 "rgb:00/00/ff",
… …
248 "rgb:8b/8b/8b", 245 "rgb:8b/8b/8b",
249 "rgb:a2/a2/a2", 246 "rgb:a2/a2/a2",
250 "rgb:b9/b9/b9", 247 "rgb:b9/b9/b9",
251 "rgb:d0/d0/d0", 248 "rgb:d0/d0/d0",
252 "rgb:e7/e7/e7", 249 "rgb:e7/e7/e7",
250#else
251 // 256 xterm colours
252 "rgb:00/00/00",
253 "rgb:00/00/5f",
254 "rgb:00/00/87",
255 "rgb:00/00/af",
256 "rgb:00/00/d7",
257 "rgb:00/00/ff",
258 "rgb:00/5f/00",
259 "rgb:00/5f/5f",
260 "rgb:00/5f/87",
261 "rgb:00/5f/af",
262 "rgb:00/5f/d7",
263 "rgb:00/5f/ff",
264 "rgb:00/87/00",
265 "rgb:00/87/5f",
266 "rgb:00/87/87",
267 "rgb:00/87/af",
268 "rgb:00/87/d7",
269 "rgb:00/87/ff",
270 "rgb:00/af/00",
271 "rgb:00/af/5f",
272 "rgb:00/af/87",
273 "rgb:00/af/af",
274 "rgb:00/af/d7",
275 "rgb:00/af/ff",
276 "rgb:00/d7/00",
277 "rgb:00/d7/5f",
278 "rgb:00/d7/87",
279 "rgb:00/d7/af",
280 "rgb:00/d7/d7",
281 "rgb:00/d7/ff",
282 "rgb:00/ff/00",
283 "rgb:00/ff/5f",
284 "rgb:00/ff/87",
285 "rgb:00/ff/af",
286 "rgb:00/ff/d7",
287 "rgb:00/ff/ff",
288 "rgb:5f/00/00",
289 "rgb:5f/00/5f",
290 "rgb:5f/00/87",
291 "rgb:5f/00/af",
292 "rgb:5f/00/d7",
293 "rgb:5f/00/ff",
294 "rgb:5f/5f/00",
295 "rgb:5f/5f/5f",
296 "rgb:5f/5f/87",
297 "rgb:5f/5f/af",
298 "rgb:5f/5f/d7",
299 "rgb:5f/5f/ff",
300 "rgb:5f/87/00",
301 "rgb:5f/87/5f",
302 "rgb:5f/87/87",
303 "rgb:5f/87/af",
304 "rgb:5f/87/d7",
305 "rgb:5f/87/ff",
306 "rgb:5f/af/00",
307 "rgb:5f/af/5f",
308 "rgb:5f/af/87",
309 "rgb:5f/af/af",
310 "rgb:5f/af/d7",
311 "rgb:5f/af/ff",
312 "rgb:5f/d7/00",
313 "rgb:5f/d7/5f",
314 "rgb:5f/d7/87",
315 "rgb:5f/d7/af",
316 "rgb:5f/d7/d7",
317 "rgb:5f/d7/ff",
318 "rgb:5f/ff/00",
319 "rgb:5f/ff/5f",
320 "rgb:5f/ff/87",
321 "rgb:5f/ff/af",
322 "rgb:5f/ff/d7",
323 "rgb:5f/ff/ff",
324 "rgb:87/00/00",
325 "rgb:87/00/5f",
326 "rgb:87/00/87",
327 "rgb:87/00/af",
328 "rgb:87/00/d7",
329 "rgb:87/00/ff",
330 "rgb:87/5f/00",
331 "rgb:87/5f/5f",
332 "rgb:87/5f/87",
333 "rgb:87/5f/af",
334 "rgb:87/5f/d7",
335 "rgb:87/5f/ff",
336 "rgb:87/87/00",
337 "rgb:87/87/5f",
338 "rgb:87/87/87",
339 "rgb:87/87/af",
340 "rgb:87/87/d7",
341 "rgb:87/87/ff",
342 "rgb:87/af/00",
343 "rgb:87/af/5f",
344 "rgb:87/af/87",
345 "rgb:87/af/af",
346 "rgb:87/af/d7",
347 "rgb:87/af/ff",
348 "rgb:87/d7/00",
349 "rgb:87/d7/5f",
350 "rgb:87/d7/87",
351 "rgb:87/d7/af",
352 "rgb:87/d7/d7",
353 "rgb:87/d7/ff",
354 "rgb:87/ff/00",
355 "rgb:87/ff/5f",
356 "rgb:87/ff/87",
357 "rgb:87/ff/af",
358 "rgb:87/ff/d7",
359 "rgb:87/ff/ff",
360 "rgb:af/00/00",
361 "rgb:af/00/5f",
362 "rgb:af/00/87",
363 "rgb:af/00/af",
364 "rgb:af/00/d7",
365 "rgb:af/00/ff",
366 "rgb:af/5f/00",
367 "rgb:af/5f/5f",
368 "rgb:af/5f/87",
369 "rgb:af/5f/af",
370 "rgb:af/5f/d7",
371 "rgb:af/5f/ff",
372 "rgb:af/87/00",
373 "rgb:af/87/5f",
374 "rgb:af/87/87",
375 "rgb:af/87/af",
376 "rgb:af/87/d7",
377 "rgb:af/87/ff",
378 "rgb:af/af/00",
379 "rgb:af/af/5f",
380 "rgb:af/af/87",
381 "rgb:af/af/af",
382 "rgb:af/af/d7",
383 "rgb:af/af/ff",
384 "rgb:af/d7/00",
385 "rgb:af/d7/5f",
386 "rgb:af/d7/87",
387 "rgb:af/d7/af",
388 "rgb:af/d7/d7",
389 "rgb:af/d7/ff",
390 "rgb:af/ff/00",
391 "rgb:af/ff/5f",
392 "rgb:af/ff/87",
393 "rgb:af/ff/af",
394 "rgb:af/ff/d7",
395 "rgb:af/ff/ff",
396 "rgb:d7/00/00",
397 "rgb:d7/00/5f",
398 "rgb:d7/00/87",
399 "rgb:d7/00/af",
400 "rgb:d7/00/d7",
401 "rgb:d7/00/ff",
402 "rgb:d7/5f/00",
403 "rgb:d7/5f/5f",
404 "rgb:d7/5f/87",
405 "rgb:d7/5f/af",
406 "rgb:d7/5f/d7",
407 "rgb:d7/5f/ff",
408 "rgb:d7/87/00",
409 "rgb:d7/87/5f",
410 "rgb:d7/87/87",
411 "rgb:d7/87/af",
412 "rgb:d7/87/d7",
413 "rgb:d7/87/ff",
414 "rgb:d7/af/00",
415 "rgb:d7/af/5f",
416 "rgb:d7/af/87",
417 "rgb:d7/af/af",
418 "rgb:d7/af/d7",
419 "rgb:d7/af/ff",
420 "rgb:d7/d7/00",
421 "rgb:d7/d7/5f",
422 "rgb:d7/d7/87",
423 "rgb:d7/d7/af",
424 "rgb:d7/d7/d7",
425 "rgb:d7/d7/ff",
426 "rgb:d7/ff/00",
427 "rgb:d7/ff/5f",
428 "rgb:d7/ff/87",
429 "rgb:d7/ff/af",
430 "rgb:d7/ff/d7",
431 "rgb:d7/ff/ff",
432 "rgb:ff/00/00",
433 "rgb:ff/00/5f",
434 "rgb:ff/00/87",
435 "rgb:ff/00/af",
436 "rgb:ff/00/d7",
437 "rgb:ff/00/ff",
438 "rgb:ff/5f/00",
439 "rgb:ff/5f/5f",
440 "rgb:ff/5f/87",
441 "rgb:ff/5f/af",
442 "rgb:ff/5f/d7",
443 "rgb:ff/5f/ff",
444 "rgb:ff/87/00",
445 "rgb:ff/87/5f",
446 "rgb:ff/87/87",
447 "rgb:ff/87/af",
448 "rgb:ff/87/d7",
449 "rgb:ff/87/ff",
450 "rgb:ff/af/00",
451 "rgb:ff/af/5f",
452 "rgb:ff/af/87",
453 "rgb:ff/af/af",
454 "rgb:ff/af/d7",
455 "rgb:ff/af/ff",
456 "rgb:ff/d7/00",
457 "rgb:ff/d7/5f",
458 "rgb:ff/d7/87",
459 "rgb:ff/d7/af",
460 "rgb:ff/d7/d7",
461 "rgb:ff/d7/ff",
462 "rgb:ff/ff/00",
463 "rgb:ff/ff/5f",
464 "rgb:ff/ff/87",
465 "rgb:ff/ff/af",
466 "rgb:ff/ff/d7",
467 "rgb:ff/ff/ff",
468 "rgb:08/08/08",
469 "rgb:12/12/12",
470 "rgb:1c/1c/1c",
471 "rgb:26/26/26",
472 "rgb:30/30/30",
473 "rgb:3a/3a/3a",
474 "rgb:44/44/44",
475 "rgb:4e/4e/4e",
476 "rgb:58/58/58",
477 "rgb:62/62/62",
478 "rgb:6c/6c/6c",
479 "rgb:76/76/76",
480 "rgb:80/80/80",
481 "rgb:8a/8a/8a",
482 "rgb:94/94/94",
483 "rgb:9e/9e/9e",
484 "rgb:a8/a8/a8",
485 "rgb:b2/b2/b2",
486 "rgb:bc/bc/bc",
487 "rgb:c6/c6/c6",
488 "rgb:d0/d0/d0",
489 "rgb:da/da/da",
490 "rgb:e4/e4/e4",
491 "rgb:ee/ee/ee",
492#endif
253 493
254#ifndef NO_CURSORCOLOR 494#ifndef NO_CURSORCOLOR
255 COLOR_CURSOR_BACKGROUND, 495 COLOR_CURSOR_BACKGROUND,
256 COLOR_CURSOR_FOREGROUND, 496 COLOR_CURSOR_FOREGROUND,
257#endif /* ! NO_CURSORCOLOR */ 497#endif /* ! NO_CURSORCOLOR */
… …
267#if ENABLE_FRILLS 507#if ENABLE_FRILLS
268 NULL, // Color_underline 508 NULL, // Color_underline
269#endif 509#endif
270#ifdef OPTION_HC 510#ifdef OPTION_HC
271 NULL, 511 NULL,
512 NULL,
272#endif 513#endif
273#ifdef KEEP_SCROLLCOLOR
274 COLOR_SCROLLBAR, 514 COLOR_SCROLLBAR,
515#ifdef RXVT_SCROLLBAR
275 COLOR_SCROLLTROUGH, 516 COLOR_SCROLLTROUGH,
276#endif /* KEEP_SCROLLCOLOR */ 517#endif
277#if ENABLE_TRANSPARENCY 518#if ENABLE_TRANSPARENCY
278 NULL, 519 NULL,
279#endif 520#endif
280#if OFF_FOCUS_FADING 521#if OFF_FOCUS_FADING
281 "rgb:00/00/00", 522 "rgb:00/00/00",
282#endif 523#endif
283 }; 524 };
284 525
285bool 526void
286rxvt_term::init_vars () 527rxvt_term::init_vars ()
287{ 528{
288 pix_colors = // 529 pix_colors = pix_colors_focused;
289 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
290#ifdef OFF_FOCUS_FADING
291 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
292#endif
293
294 530
295 MEvent.time = CurrentTime; 531 MEvent.time = CurrentTime;
296 MEvent.button = AnyButton; 532 MEvent.button = AnyButton;
297 want_refresh = 1; 533 want_refresh = 1;
298 priv_modes = SavedModes = PrivMode_Default; 534 priv_modes = SavedModes = PrivMode_Default;
299 ncol = 80; 535 ncol = 80;
300 nrow = 24; 536 nrow = 24;
301 int_bwidth = INTERNALBORDERWIDTH; 537 int_bwidth = INTERNALBORDERWIDTH;
302 ext_bwidth = EXTERNALBORDERWIDTH; 538 ext_bwidth = EXTERNALBORDERWIDTH;
303 lineSpace = LINESPACE; 539 lineSpace = LINESPACE;
540 letterSpace = LETTERSPACE;
304 saveLines = SAVELINES; 541 saveLines = SAVELINES;
305 numpix_colors = TOTAL_COLORS;
306 542
307 refresh_type = SLOW_REFRESH; 543 refresh_type = SLOW_REFRESH;
308 544
309 oldcursor.row = oldcursor.col = -1; 545 oldcursor.row = oldcursor.col = -1;
310 last_bot = last_state = -1;
311 546
312 set_option (Opt_scrollBar); 547 set_option (Opt_scrollBar);
313 set_option (Opt_scrollTtyOutput); 548 set_option (Opt_scrollTtyOutput);
314 set_option (Opt_jumpScroll); 549 set_option (Opt_jumpScroll);
315 set_option (Opt_skipScroll); 550 set_option (Opt_skipScroll);
316 set_option (Opt_secondaryScreen); 551 set_option (Opt_secondaryScreen);
317 set_option (Opt_secondaryScroll); 552 set_option (Opt_secondaryScroll);
318 set_option (Opt_pastableTabs); 553 set_option (Opt_pastableTabs);
319 set_option (Opt_intensityStyles); 554 set_option (Opt_intensityStyles);
555 set_option (Opt_iso14755);
320 set_option (Opt_iso14755_52); 556 set_option (Opt_iso14755_52);
321 557 set_option (Opt_buffered);
322 return true;
323}
324
325void
326rxvt_term::init_secondary ()
327{
328 int i;
329
330 /*
331 * Close all unused file descriptors
332 * We don't want them, we don't need them.
333 */
334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
335 {
336 /* TODO: BOO HISS */
337 dup2 (STDERR_FILENO, STDIN_FILENO);
338 }
339 else if (i != STDIN_FILENO)
340 {
341 dup2 (i, STDIN_FILENO);
342 close (i);
343 }
344
345 dup2 (STDERR_FILENO, STDOUT_FILENO);
346
347#if 0 // schmorp sayz closing filies is murder
348 for (i = STDERR_FILENO + 1; i < num_fds; i++)
349 {
350#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
351 if (i == 4 || i == 7)
352 continue;
353#endif
354 close (i);
355 }
356#endif
357} 558}
358 559
359/*----------------------------------------------------------------------*/ 560/*----------------------------------------------------------------------*/
360const char ** 561const char **
361rxvt_term::init_resources (int argc, const char *const *argv) 562rxvt_term::init_resources (int argc, const char *const *argv)
… …
417#if XFT 618#if XFT
418 if (rs[Rs_depth]) 619 if (rs[Rs_depth])
419 select_visual (strtol (rs[Rs_depth], 0, 0)); 620 select_visual (strtol (rs[Rs_depth], 0, 0));
420#endif 621#endif
421 622
422#ifdef HAVE_AFTERIMAGE
423 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
424#endif
425 free (r_argv); 623 free (r_argv);
426 624
427 for (int i = NUM_RESOURCES; i--; ) 625 for (int i = NUM_RESOURCES; i--; )
428 if (rs [i] == resval_undef) 626 if (rs [i] == resval_undef)
429 rs [i] = 0; 627 rs [i] = 0;
628
629#ifdef HAVE_AFTERIMAGE
630 set_application_name ((char *)rs[Rs_name]);
631 set_output_threshold (OUTPUT_LEVEL_WARNING);
632#endif
633
634#ifdef HAVE_PIXBUF
635 g_type_init ();
636#endif
430 637
431#if ENABLE_PERL 638#if ENABLE_PERL
432 if (!rs[Rs_perl_ext_1]) 639 if (!rs[Rs_perl_ext_1])
433 rs[Rs_perl_ext_1] = "default"; 640 rs[Rs_perl_ext_1] = "default";
434 641
… …
446 */ 653 */
447 if (cmd_argv && cmd_argv[0]) 654 if (cmd_argv && cmd_argv[0])
448 { 655 {
449 if (!rs[Rs_title]) 656 if (!rs[Rs_title])
450 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 657 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
658
451 if (!rs[Rs_iconName]) 659 if (!rs[Rs_iconName])
452 rs[Rs_iconName] = rs[Rs_title]; 660 rs[Rs_iconName] = rs[Rs_title];
453 } 661 }
454 else 662 else
455 { 663 {
456 if (!rs[Rs_title]) 664 if (!rs[Rs_title])
457 rs[Rs_title] = rs[Rs_name]; 665 rs[Rs_title] = rs[Rs_name];
666
458 if (!rs[Rs_iconName]) 667 if (!rs[Rs_iconName])
459 rs[Rs_iconName] = rs[Rs_name]; 668 rs[Rs_iconName] = rs[Rs_name];
460 } 669 }
461 670
462 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 671 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
469 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 678 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
470 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 679 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
471 680
472 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 681 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
473 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 682 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
683
684 if (rs[Rs_letterSpace])
685 letterSpace = atoi (rs[Rs_letterSpace]);
474#endif 686#endif
475 687
476#ifdef POINTER_BLANK 688#ifdef POINTER_BLANK
477 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 689 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
478 pointerBlankDelay = i; 690 pointerBlankDelay = i;
… …
481#endif 693#endif
482 694
483 /* no point having a scrollbar without having any scrollback! */ 695 /* no point having a scrollbar without having any scrollback! */
484 if (!saveLines) 696 if (!saveLines)
485 set_option (Opt_scrollBar, 0); 697 set_option (Opt_scrollBar, 0);
486
487#ifdef PRINTPIPE
488 if (!rs[Rs_print_pipe])
489 rs[Rs_print_pipe] = PRINTPIPE;
490#endif
491 698
492 if (!rs[Rs_cutchars]) 699 if (!rs[Rs_cutchars])
493 rs[Rs_cutchars] = CUTCHARS; 700 rs[Rs_cutchars] = CUTCHARS;
494 701
495#ifndef NO_BACKSPACE_KEY 702#ifndef NO_BACKSPACE_KEY
… …
508# else 715# else
509 rs[Rs_delete_key] = "\033[3~"; 716 rs[Rs_delete_key] = "\033[3~";
510# endif 717# endif
511#endif 718#endif
512 719
513#ifdef HAVE_SCROLLBARS 720 scrollBar.setup (this);
514 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
515#endif
516 721
517#ifdef XTERM_REVERSE_VIDEO 722#ifdef XTERM_REVERSE_VIDEO
518 /* this is how xterm implements reverseVideo */ 723 /* this is how xterm implements reverseVideo */
519 if (option (Opt_reverseVideo)) 724 if (option (Opt_reverseVideo))
520 { 725 {
… …
558 return cmd_argv; 763 return cmd_argv;
559} 764}
560 765
561/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
562void 767void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
769{
770 this->envv = envv;
771
772 SET_R (this);
773 set_locale ("");
774 set_environ (envv); // a few things in X do not call setlocale :(
775
776 init_vars ();
777
778 const char **cmd_argv = init_resources (argc, argv);
779
780#ifdef KEYSYM_RESOURCE
781 keyboard->register_done ();
782#endif
783
784 if (const char *path = rs[Rs_chdir])
785 if (*path) // ignored if empty
786 {
787 if (*path != '/')
788 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
789
790 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 }
793
794 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
796
797 pty = ptytty::create ();
798
799 create_windows (argc, argv);
800
801 init_xlocale ();
802
803 scr_poweron (); // initialize screen
804
805#if 0
806 XSynchronize (dpy, True);
807#endif
808
809 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP
812 {
813 bgPixmap.set_target (this);
814 bgPixmap.invalidate ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bgPixmap.set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856
857#if ENABLE_PERL
858 rootwin_ev.start (display, display->root);
859#endif
860
861 set_colorfgbg ();
862
863 init_command (cmd_argv);
864
865 free (cmd_argv);
866
867 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ);
869
870 HOOK_INVOKE ((this, HOOK_START, DT_END));
871
872#if ENABLE_XEMBED
873 if (rs[Rs_embed])
874 {
875 long info[2] = { 0, XEMBED_MAPPED };
876
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2);
879 }
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]);
884
885 refresh_check ();
886}
887
888/*----------------------------------------------------------------------*/
889void
563rxvt_term::init_env () 890rxvt_term::init_env ()
564{ 891{
565 int i;
566 char *val; 892 char *val;
567 893
568#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
569 /* Fixup display_name for export over pty to any interested terminal 895 /* Fixup display_name for export over pty to any interested terminal
570 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 896 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
584 val = XDisplayString (dpy); 910 val = XDisplayString (dpy);
585 911
586 if (rs[Rs_display_name] == NULL) 912 if (rs[Rs_display_name] == NULL)
587 rs[Rs_display_name] = val; /* use broken `:0' value */ 913 rs[Rs_display_name] = val; /* use broken `:0' value */
588 914
589 i = strlen (val);
590 env_display = (char *)rxvt_malloc (i + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
591 916
592 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
593 918
594 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
595 920
… …
742 run_command (argv); 1067 run_command (argv);
743} 1068}
744 1069
745/*----------------------------------------------------------------------*/ 1070/*----------------------------------------------------------------------*/
746void 1071void
747rxvt_term::Get_Colours () 1072rxvt_term::get_colours ()
748{ 1073{
749 int i; 1074 int i;
750 1075
751#ifdef OFF_FOCUS_FADING 1076#ifdef OFF_FOCUS_FADING
752 pix_colors = pix_colors_focused; 1077 pix_colors = pix_colors_focused;
… …
812 * get scrollBar shadow colors 1137 * get scrollBar shadow colors
813 * 1138 *
814 * The calculations of topShadow/bottomShadow values are adapted 1139 * The calculations of topShadow/bottomShadow values are adapted
815 * from the fvwm window manager. 1140 * from the fvwm window manager.
816 */ 1141 */
817#ifdef KEEP_SCROLLCOLOR 1142#ifdef RXVT_SCROLLBAR
818 if (depth <= 2) 1143 if (depth <= 2)
819 { 1144 {
820 /* Monochrome */ 1145 /* Monochrome */
821 alias_color (Color_scroll, Color_fg); 1146 alias_color (Color_scroll, Color_fg);
822 alias_color (Color_topShadow, Color_bg); 1147 alias_color (Color_topShadow, Color_bg);
… …
837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1162 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
838 cscroll.a) 1163 cscroll.a)
839 )) 1164 ))
840 alias_color (Color_topShadow, Color_White); 1165 alias_color (Color_topShadow, Color_White);
841 } 1166 }
842#endif /* KEEP_SCROLLCOLOR */ 1167#endif
843 1168
844#ifdef OFF_FOCUS_FADING 1169#ifdef OFF_FOCUS_FADING
845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1170 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
846 update_fade_color (i); 1171 update_fade_color (i);
847#endif 1172#endif
… …
952 1277
953 if (i) 1278 if (i)
954 ModMetaMask = modmasks[i - 1]; 1279 ModMetaMask = modmasks[i - 1];
955} 1280}
956 1281
1282void
1283rxvt_term::set_icon (const char *file)
1284{
1285#ifdef HAVE_AFTERIMAGE
1286 init_asv ();
1287
1288 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1289 if (!im)
1290 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return;
1293 }
1294
1295 unsigned int w = im->width;
1296 unsigned int h = im->height;
1297
1298 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1299 {
1300 rxvt_warn ("Icon image too big, continuing without.\n");
1301 destroy_asimage (&im);
1302 return;
1303 }
1304
1305 ASImage *result = scale_asimage (asv, im,
1306 w, h, ASA_ARGB32,
1307 100, ASIMAGE_QUALITY_DEFAULT);
1308 destroy_asimage (&im);
1309
1310 if (!result)
1311 {
1312 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1313 return;
1314 }
1315
1316 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1317 if (buffer)
1318 {
1319 ARGB32 *asbuf = result->alt.argb32;
1320 buffer [0] = w;
1321 buffer [1] = h;
1322
1323 for (unsigned int i = 0; i < w * h; ++i)
1324 buffer [i + 2] = asbuf [i];
1325
1326 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1327 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1328 free (buffer);
1329 }
1330 else
1331 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1332
1333 destroy_asimage (&result);
1334#endif
1335
1336#ifdef HAVE_PIXBUF
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf)
1339 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n");
1341 return;
1342 }
1343
1344 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1345 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1346
1347 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1348 {
1349 rxvt_warn ("Icon image too big, continuing without.\n");
1350 g_object_unref (pixbuf);
1351 return;
1352 }
1353
1354 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1355 {
1356 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1357 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1358 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1359
1360 buffer [0] = w;
1361 buffer [1] = h;
1362 for (int i = 0; i < h; i++)
1363 {
1364 for (int j = 0; j < w; j++)
1365 {
1366 unsigned char *pixel = row + j * channels;
1367 long value;
1368
1369 if (channels == 4)
1370 value = pixel[3];
1371 else
1372 value = (unsigned char)0x00ff;
1373
1374 value = (value << 8) + pixel[0];
1375 value = (value << 8) + pixel[1];
1376 value = (value << 8) + pixel[2];
1377 buffer[(i * w + j) + 2] = value;
1378 }
1379
1380 row += rowstride;
1381 }
1382
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer);
1386 }
1387 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1389
1390 g_object_unref (pixbuf);
1391#endif
1392}
1393
957/*----------------------------------------------------------------------*/ 1394/*----------------------------------------------------------------------*/
958/* rxvt_Create_Windows () - Open and map the window */ 1395/* rxvt_Create_Windows () - Open and map the window */
959void 1396void
960rxvt_term::create_windows (int argc, const char *const *argv) 1397rxvt_term::create_windows (int argc, const char *const *argv)
961{ 1398{
… …
969 Window top, parent; 1406 Window top, parent;
970 1407
971 dLocal (Display *, dpy); 1408 dLocal (Display *, dpy);
972 1409
973 /* grab colors before netscape does */ 1410 /* grab colors before netscape does */
974 Get_Colours (); 1411 get_colours ();
975 1412
976 if (!set_fonts ()) 1413 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1414 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978 1415
979 parent = display->root; 1416 parent = display->root;
… …
1027 this->parent[0] = top; 1464 this->parent[0] = top;
1028 1465
1029 old_width = szHint.width; 1466 old_width = szHint.width;
1030 old_height = szHint.height; 1467 old_height = szHint.height;
1031 1468
1032 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1469 set_title (rs [Rs_title]);
1033 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1470 set_icon_name (rs [Rs_iconName]);
1034 1471
1035 classHint.res_name = (char *)rs[Rs_name]; 1472 classHint.res_name = (char *)rs[Rs_name];
1036 classHint.res_class = (char *)RESCLASS; 1473 classHint.res_class = (char *)RESCLASS;
1037 1474
1038 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1475 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1040 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1477 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1041 wmHint.window_group = top; 1478 wmHint.window_group = top;
1042 1479
1043 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1480 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1044 &szHint, &wmHint, &classHint); 1481 &szHint, &wmHint, &classHint);
1482#if ENABLE_EWMH
1483 /*
1484 * set up icon hint
1485 * rs [Rs_iconfile] is path to icon
1486 */
1487
1488 if (rs [Rs_iconfile])
1489 {
1490 set_icon (rs [Rs_iconfile]);
1491 }
1492#endif
1045 1493
1046#if ENABLE_FRILLS 1494#if ENABLE_FRILLS
1047 if (mwmhints.flags) 1495 if (mwmhints.flags)
1048 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1496 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1497 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1054#if ENABLE_EWMH 1502#if ENABLE_EWMH
1055 xa[XA_NET_WM_PING], 1503 xa[XA_NET_WM_PING],
1056#endif 1504#endif
1057 }; 1505 };
1058 1506
1059 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1060 1508
1061#if ENABLE_FRILLS 1509#if ENABLE_FRILLS
1062 if (rs[Rs_transient_for]) 1510 if (rs[Rs_transient_for])
1063 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1064#endif 1512#endif
… …
1083 1531
1084 termwin_ev.start (display, top); 1532 termwin_ev.start (display, top);
1085 1533
1086 /* vt cursor: Black-on-White is standard, but this is more popular */ 1534 /* vt cursor: Black-on-White is standard, but this is more popular */
1087 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1535 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1088
1089#ifdef HAVE_SCROLLBARS
1090 /* cursor scrollBar: Black-on-White */
1091 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1092#endif
1093 1536
1094 /* the vt window */ 1537 /* the vt window */
1095 vt = XCreateSimpleWindow (dpy, top, 1538 vt = XCreateSimpleWindow (dpy, top,
1096 window_vt_x, window_vt_y, 1539 window_vt_x, window_vt_y,
1097 width, height, 1540 width, height,
… …
1122 GCForeground | GCBackground | GCGraphicsExposures, 1565 GCForeground | GCBackground | GCGraphicsExposures,
1123 &gcvalue); 1566 &gcvalue);
1124 1567
1125 drawable = new rxvt_drawable (this, vt); 1568 drawable = new rxvt_drawable (this, vt);
1126 1569
1127#ifdef RXVT_SCROLLBAR
1128 gcvalue.foreground = pix_colors[Color_topShadow];
1129 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[Color_bottomShadow];
1131 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1133 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1134#endif
1135
1136#ifdef OFF_FOCUS_FADING 1570#ifdef OFF_FOCUS_FADING
1137 // initially we are in unfocused state 1571 // initially we are in unfocused state
1138 if (rs[Rs_fade]) 1572 if (rs[Rs_fade])
1139 pix_colors = pix_colors_unfocused; 1573 pix_colors = pix_colors_unfocused;
1140#endif 1574#endif
1141 1575
1142 pointer_unblank (); 1576 pointer_unblank ();
1143 scr_recolour (); 1577 scr_recolour ();
1144}
1145
1146/* ------------------------------------------------------------------------- *
1147 * GET TTY CURRENT STATE *
1148 * ------------------------------------------------------------------------- */
1149void
1150rxvt_get_ttymode (ttymode_t *tio, int erase)
1151{
1152 /*
1153 * standard System V termios interface
1154 */
1155 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1156 {
1157 // return error - use system defaults,
1158 // where possible, and zero elsewhere
1159 memset (tio, 0, sizeof (ttymode_t));
1160
1161 tio->c_cc[VINTR] = CINTR;
1162 tio->c_cc[VQUIT] = CQUIT;
1163 tio->c_cc[VERASE] = CERASE;
1164#ifdef VERASE2
1165 tio->c_cc[VERASE2] = CERASE2;
1166#endif
1167 tio->c_cc[VKILL] = CKILL;
1168 tio->c_cc[VSTART] = CSTART;
1169 tio->c_cc[VSTOP] = CSTOP;
1170 tio->c_cc[VSUSP] = CSUSP;
1171# ifdef VDSUSP
1172 tio->c_cc[VDSUSP] = CDSUSP;
1173# endif
1174# ifdef VREPRINT
1175 tio->c_cc[VREPRINT] = CRPRNT;
1176# endif
1177# ifdef VDISCRD
1178 tio->c_cc[VDISCRD] = CFLUSH;
1179# endif
1180# ifdef VWERSE
1181 tio->c_cc[VWERSE] = CWERASE;
1182# endif
1183# ifdef VLNEXT
1184 tio->c_cc[VLNEXT] = CLNEXT;
1185# endif
1186 }
1187
1188 tio->c_cc[VEOF] = CEOF;
1189 tio->c_cc[VEOL] = VDISABLE;
1190# ifdef VEOL2
1191 tio->c_cc[VEOL2] = VDISABLE;
1192# endif
1193# ifdef VSWTC
1194 tio->c_cc[VSWTC] = VDISABLE;
1195# endif
1196# ifdef VSWTCH
1197 tio->c_cc[VSWTCH] = VDISABLE;
1198# endif
1199# if VMIN != VEOF
1200 tio->c_cc[VMIN] = 1;
1201# endif
1202# if VTIME != VEOL
1203 tio->c_cc[VTIME] = 0;
1204# endif
1205
1206 if (erase != -1)
1207 tio->c_cc[VERASE] = (char)erase;
1208
1209 /* input modes */
1210 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1211# ifdef IMAXBEL
1212 | IMAXBEL
1213# endif
1214 | IXON);
1215
1216 /* output modes */
1217 tio->c_oflag = (OPOST | ONLCR);
1218
1219 /* control modes */
1220 tio->c_cflag = (CS8 | CREAD);
1221
1222 /* line discipline modes */
1223 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1224# if defined (ECHOCTL) && defined (ECHOKE)
1225 | ECHOCTL | ECHOKE
1226# endif
1227 | ECHOE | ECHOK);
1228
1229 /*
1230 * Debugging
1231 */
1232#ifdef DEBUG_TTYMODE
1233 /* c_iflag bits */
1234 fprintf (stderr, "Input flags\n");
1235
1236 /* cpp token stringize doesn't work on all machines <sigh> */
1237# define FOO(flag,name) \
1238 if ((tio->c_iflag) & flag) \
1239 fprintf (stderr, "%s ", name)
1240
1241 /* c_iflag bits */
1242 FOO (IGNBRK, "IGNBRK");
1243 FOO (BRKINT, "BRKINT");
1244 FOO (IGNPAR, "IGNPAR");
1245 FOO (PARMRK, "PARMRK");
1246 FOO (INPCK, "INPCK");
1247 FOO (ISTRIP, "ISTRIP");
1248 FOO (INLCR, "INLCR");
1249 FOO (IGNCR, "IGNCR");
1250 FOO (ICRNL, "ICRNL");
1251 FOO (IXON, "IXON");
1252 FOO (IXOFF, "IXOFF");
1253# ifdef IUCLC
1254 FOO (IUCLC, "IUCLC");
1255# endif
1256# ifdef IXANY
1257 FOO (IXANY, "IXANY");
1258# endif
1259# ifdef IMAXBEL
1260 FOO (IMAXBEL, "IMAXBEL");
1261# endif
1262
1263 fprintf (stderr, "\n");
1264
1265# undef FOO
1266# define FOO(entry, name) \
1267 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1268
1269 FOO (VINTR, "VINTR");
1270 FOO (VQUIT, "VQUIT");
1271 FOO (VERASE, "VERASE");
1272 FOO (VKILL, "VKILL");
1273 FOO (VEOF, "VEOF");
1274 FOO (VEOL, "VEOL");
1275# ifdef VEOL2
1276 FOO (VEOL2, "VEOL2");
1277# endif
1278# ifdef VSWTC
1279 FOO (VSWTC, "VSWTC");
1280# endif
1281# ifdef VSWTCH
1282 FOO (VSWTCH, "VSWTCH");
1283# endif
1284 FOO (VSTART, "VSTART");
1285 FOO (VSTOP, "VSTOP");
1286 FOO (VSUSP, "VSUSP");
1287# ifdef VDSUSP
1288 FOO (VDSUSP, "VDSUSP");
1289# endif
1290# ifdef VREPRINT
1291 FOO (VREPRINT, "VREPRINT");
1292# endif
1293# ifdef VDISCRD
1294 FOO (VDISCRD, "VDISCRD");
1295# endif
1296# ifdef VWERSE
1297 FOO (VWERSE, "VWERSE");
1298# endif
1299# ifdef VLNEXT
1300 FOO (VLNEXT, "VLNEXT");
1301# endif
1302
1303 fprintf (stderr, "\n");
1304# undef FOO
1305#endif /* DEBUG_TTYMODE */
1306} 1578}
1307 1579
1308/*----------------------------------------------------------------------*/ 1580/*----------------------------------------------------------------------*/
1309/* 1581/*
1310 * Run the command in a subprocess and return a file descriptor for the 1582 * Run the command in a subprocess and return a file descriptor for the
… …
1331 else 1603 else
1332#endif 1604#endif
1333 if (!pty->get ()) 1605 if (!pty->get ())
1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1606 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1335 1607
1336 int er; 1608 struct termios tio = def_tio;
1337 1609
1338#ifndef NO_BACKSPACE_KEY 1610#ifndef NO_BACKSPACE_KEY
1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1340 er = rs[Rs_backspace_key][0]; 1612 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1613 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1342 er = '\177'; /* the initial state anyway */ 1614 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1343 else
1344#endif 1615#endif
1345 er = -1;
1346 1616
1347 rxvt_get_ttymode (&tio, er); 1617 /* init terminal attributes */
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1618 cfsetospeed (&tio, BAUDRATE);
1619 cfsetispeed (&tio, BAUDRATE);
1620 tcsetattr (pty->tty, TCSANOW, &tio);
1349 pty->set_utf8_mode (enc_utf8); 1621 pty->set_utf8_mode (enc_utf8);
1350 1622
1351 /* set initial window size */ 1623 /* set initial window size */
1352 tt_winch (); 1624 tt_winch ();
1353 1625
… …
1436 signal (SIGQUIT, SIG_DFL); 1708 signal (SIGQUIT, SIG_DFL);
1437 signal (SIGCHLD, SIG_DFL); 1709 signal (SIGCHLD, SIG_DFL);
1438 signal (SIGHUP, SIG_DFL); 1710 signal (SIGHUP, SIG_DFL);
1439 signal (SIGPIPE, SIG_DFL); 1711 signal (SIGPIPE, SIG_DFL);
1440 /* 1712 /*
1441 * mimick login's behavior by disabling the job control signals 1713 * mimic login's behavior by disabling the job control signals
1442 * a shell that wants them can turn them back on 1714 * a shell that wants them can turn them back on
1443 */ 1715 */
1444#ifdef SIGTSTP 1716#ifdef SIGTSTP
1445 signal (SIGTSTP, SIG_IGN); 1717 signal (SIGTSTP, SIG_IGN);
1446 signal (SIGTTIN, SIG_IGN); 1718 signal (SIGTTIN, SIG_IGN);
1447 signal (SIGTTOU, SIG_IGN); 1719 signal (SIGTTOU, SIG_IGN);
1448#endif /* SIGTSTP */ 1720#endif /* SIGTSTP */
1449 1721
1450 // unblock signals (signals are blocked by iom.C
1451 sigset_t ss;
1452 sigemptyset (&ss);
1453 sigprocmask (SIG_SETMASK, &ss, 0);
1454
1455 /* command interpreter path */ 1722 /* command interpreter path */
1456 if (argv) 1723 if (argv)
1457 { 1724 {
1458# ifdef DEBUG_CMD 1725# ifdef DEBUG_CMD
1459 int i; 1726 int i;
… …
1470 const char *argv0, *shell; 1737 const char *argv0, *shell;
1471 1738
1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1739 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1473 shell = "/bin/sh"; 1740 shell = "/bin/sh";
1474 1741
1475 argv0 = (const char *)rxvt_basename (shell); 1742 argv0 = rxvt_basename (shell);
1476 1743
1477 if (option (Opt_loginShell)) 1744 if (option (Opt_loginShell))
1478 { 1745 {
1479 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1746 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1480 1747

Diff Legend

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