ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.216 by ayin, Tue Oct 9 13:34:46 2007 UTC vs.
Revision 1.269 by root, Tue Jun 15 10:33:47 2010 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
45 59
46#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 62#include <sys/types.h>
49#include <sys/socket.h> 63#include <sys/socket.h>
… …
141 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 162# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 164# endif
151 /* high-intensity colors */ 165 /* high-intensity colors */
152# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
160 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
161 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
162 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
163 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
164 178
179#if !USE_256_COLORS
165 // 88 xterm colours 180 // 88 xterm colours
166 "rgb:00/00/00", 181 "rgb:00/00/00",
167 "rgb:00/00/8b", 182 "rgb:00/00/8b",
168 "rgb:00/00/cd", 183 "rgb:00/00/cd",
169 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
233 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
234 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
235 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
236 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
237 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
238 496
239#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 503 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 510#if ENABLE_FRILLS
253 NULL, // Color_underline 511 NULL, // Color_underline
254#endif 512#endif
255#ifdef OPTION_HC 513#ifdef OPTION_HC
256 NULL, 514 NULL,
515 NULL,
257#endif 516#endif
258#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
260 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 520#endif
262#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
263 NULL, 522 NULL,
264#endif 523#endif
265#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 525 "rgb:00/00/00",
267#endif 526#endif
268 }; 527 };
269 528
270bool 529void
271rxvt_term::init_vars () 530rxvt_term::init_vars ()
272{ 531{
273 pix_colors = // 532 pix_colors = pix_colors_focused;
274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275#ifdef OFF_FOCUS_FADING
276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277#endif
278
279 533
280 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
282 want_refresh = 1; 536 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
284 ncol = 80; 538 ncol = 80;
285 nrow = 24; 539 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
289 saveLines = SAVELINES; 544 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 545
292 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
293 547
294 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1;
296 549
297 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
305 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
306 560 set_option (Opt_buffered);
307 return true;
308} 561}
309 562
310void 563static void
311rxvt_term::init_secondary () 564init_secondary ()
312{ 565{
313 int i; 566 int i;
314 567
315 /*
316 * Close all unused file descriptors
317 * We don't want them, we don't need them.
318 */
319 if ((i = open ("/dev/null", O_RDONLY)) < 0) 568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
320 { 569 {
321 /* TODO: BOO HISS */
322 dup2 (STDERR_FILENO, STDIN_FILENO); 570 dup2 (STDERR_FILENO, STDIN_FILENO);
323 } 571 }
324 else if (i != STDIN_FILENO) 572 else if (i != STDIN_FILENO)
325 { 573 {
326 dup2 (i, STDIN_FILENO); 574 dup2 (i, STDIN_FILENO);
327 close (i); 575 close (i);
328 } 576 }
329 577
330 dup2 (STDERR_FILENO, STDOUT_FILENO); 578 dup2 (STDERR_FILENO, STDOUT_FILENO);
331
332#if 0 // schmorp sayz closing filies is murder
333 for (i = STDERR_FILENO + 1; i < num_fds; i++)
334 {
335#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
336 if (i == 4 || i == 7)
337 continue;
338#endif
339 close (i);
340 }
341#endif
342} 579}
343 580
344/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
345const char ** 582const char **
346rxvt_term::init_resources (int argc, const char *const *argv) 583rxvt_term::init_resources (int argc, const char *const *argv)
… …
356 break; 593 break;
357 594
358 if (r_argc == argc) 595 if (r_argc == argc)
359 cmd_argv = NULL; 596 cmd_argv = NULL;
360 else if (!argv[r_argc + 1]) 597 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n"); 598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
362 else 599 else
363 { 600 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365 602
366 for (i = 0; i < argc - r_argc - 1; i++) 603 for (i = 0; i < argc - r_argc - 1; i++)
… …
386 rs[Rs_display_name] = ":0"; 623 rs[Rs_display_name] = ":0";
387 624
388 get_options (r_argc, r_argv); 625 get_options (r_argc, r_argv);
389 626
390 if (!(display = displays.get (rs[Rs_display_name]))) 627 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
391 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
392 632
393 // using a local pointer decreases code size a lot 633 // using a local pointer decreases code size a lot
394 xa = display->xa; 634 xa = display->xa;
395 635
396 set (display); 636 set (display);
… …
399#if XFT 639#if XFT
400 if (rs[Rs_depth]) 640 if (rs[Rs_depth])
401 select_visual (strtol (rs[Rs_depth], 0, 0)); 641 select_visual (strtol (rs[Rs_depth], 0, 0));
402#endif 642#endif
403 643
404#ifdef HAVE_AFTERIMAGE
405 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
406#endif
407 free (r_argv); 644 free (r_argv);
408 645
409 for (int i = NUM_RESOURCES; i--; ) 646 for (int i = NUM_RESOURCES; i--; )
410 if (rs [i] == resval_undef) 647 if (rs [i] == resval_undef)
411 rs [i] = 0; 648 rs [i] = 0;
649
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
412 654
413#if ENABLE_PERL 655#if ENABLE_PERL
414 if (!rs[Rs_perl_ext_1]) 656 if (!rs[Rs_perl_ext_1])
415 rs[Rs_perl_ext_1] = "default"; 657 rs[Rs_perl_ext_1] = "default";
416 658
… …
428 */ 670 */
429 if (cmd_argv && cmd_argv[0]) 671 if (cmd_argv && cmd_argv[0])
430 { 672 {
431 if (!rs[Rs_title]) 673 if (!rs[Rs_title])
432 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 674 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
675
433 if (!rs[Rs_iconName]) 676 if (!rs[Rs_iconName])
434 rs[Rs_iconName] = rs[Rs_title]; 677 rs[Rs_iconName] = rs[Rs_title];
435 } 678 }
436 else 679 else
437 { 680 {
438 if (!rs[Rs_title]) 681 if (!rs[Rs_title])
439 rs[Rs_title] = rs[Rs_name]; 682 rs[Rs_title] = rs[Rs_name];
683
440 if (!rs[Rs_iconName]) 684 if (!rs[Rs_iconName])
441 rs[Rs_iconName] = rs[Rs_name]; 685 rs[Rs_iconName] = rs[Rs_name];
442 } 686 }
443 687
444 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 688 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
451 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 695 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
452 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 696 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
453 697
454 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 698 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
455 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 699 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
700
701 if (rs[Rs_letterSpace])
702 letterSpace = atoi (rs[Rs_letterSpace]);
456#endif 703#endif
457 704
458#ifdef POINTER_BLANK 705#ifdef POINTER_BLANK
459 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
460 pointerBlankDelay = i; 707 pointerBlankDelay = i;
… …
463#endif 710#endif
464 711
465 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
466 if (!saveLines) 713 if (!saveLines)
467 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
468
469#ifdef PRINTPIPE
470 if (!rs[Rs_print_pipe])
471 rs[Rs_print_pipe] = PRINTPIPE;
472#endif
473 715
474 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
475 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
476 718
477#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
… …
490# else 732# else
491 rs[Rs_delete_key] = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
492# endif 734# endif
493#endif 735#endif
494 736
495#ifdef HAVE_SCROLLBARS 737 scrollBar.setup (this);
496 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
497#endif
498 738
499#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
500 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
501 if (option (Opt_reverseVideo)) 741 if (option (Opt_reverseVideo))
502 { 742 {
… …
522 color_aliases (Color_fg); 762 color_aliases (Color_fg);
523 color_aliases (Color_bg); 763 color_aliases (Color_bg);
524#ifndef NO_CURSORCOLOR 764#ifndef NO_CURSORCOLOR
525 color_aliases (Color_cursor); 765 color_aliases (Color_cursor);
526 color_aliases (Color_cursor2); 766 color_aliases (Color_cursor2);
527#endif /* NO_CURSORCOLOR */ 767#endif /* NO_CURSORCOLOR */
528 color_aliases (Color_pointer_fg); 768 color_aliases (Color_pointer_fg);
529 color_aliases (Color_pointer_bg); 769 color_aliases (Color_pointer_bg);
530 color_aliases (Color_border); 770 color_aliases (Color_border);
531#ifndef NO_BOLD_UNDERLINE_REVERSE 771#ifndef NO_BOLD_UNDERLINE_REVERSE
532 color_aliases (Color_BD); 772 color_aliases (Color_BD);
533 color_aliases (Color_UL); 773 color_aliases (Color_UL);
534 color_aliases (Color_RV); 774 color_aliases (Color_RV);
535#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 775#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
536 776
537 if (!rs[Rs_color + Color_border]) 777 if (!rs[Rs_color + Color_border])
538 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 778 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
539 779
540 return cmd_argv; 780 return cmd_argv;
781}
782
783/*----------------------------------------------------------------------*/
784void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
786{
787 this->envv = envv;
788
789 SET_R (this);
790 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :(
792
793 init_vars ();
794
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv);
798
799#ifdef KEYSYM_RESOURCE
800 keyboard->register_done ();
801#endif
802
803 if (const char *path = rs[Rs_chdir])
804 if (*path) // ignored if empty
805 {
806 if (*path != '/')
807 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
808
809 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 }
812
813 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
815
816 pty = ptytty::create ();
817
818 create_windows (argc, argv);
819
820 init_xlocale ();
821
822 scr_poweron (); // initialize screen
823
824#if 0
825 XSynchronize (dpy, True);
826#endif
827
828 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP
831 {
832 bgPixmap.set_target (this);
833 bgPixmap.invalidate ();
834
835#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent))
837 {
838 bgPixmap.set_transparent ();
839
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843#endif
844 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846
847 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]);
849
850 bgPixmap.set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root);
853 }
854#endif
855
856#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ())
871 update_background ();
872 }
873#endif
874 }
875#endif
876
877#if ENABLE_PERL
878 rootwin_ev.start (display, display->root);
879#endif
880
881 set_colorfgbg ();
882
883 init_command (cmd_argv);
884
885 free (cmd_argv);
886
887 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ);
889
890 HOOK_INVOKE ((this, HOOK_START, DT_END));
891
892#if ENABLE_XEMBED
893 if (rs[Rs_embed])
894 {
895 long info[2] = { 0, XEMBED_MAPPED };
896
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2);
899 }
900#endif
901
902 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]);
904
905 refresh_check ();
541} 906}
542 907
543/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
544void 909void
545rxvt_term::init_env () 910rxvt_term::init_env ()
… …
560 */ 925 */
561 val = rxvt_network_display (rs[Rs_display_name]); 926 val = rxvt_network_display (rs[Rs_display_name]);
562 rs[Rs_display_name] = (const char *)val; 927 rs[Rs_display_name] = (const char *)val;
563 928
564 if (val == NULL) 929 if (val == NULL)
565#endif /* DISPLAY_IS_IP */ 930#endif /* DISPLAY_IS_IP */
566 val = XDisplayString (dpy); 931 val = XDisplayString (dpy);
567 932
568 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
569 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
570 935
… …
610#ifdef HAVE_UNSETENV 975#ifdef HAVE_UNSETENV
611 /* avoid passing old settings and confusing term size */ 976 /* avoid passing old settings and confusing term size */
612 unsetenv ("LINES"); 977 unsetenv ("LINES");
613 unsetenv ("COLUMNS"); 978 unsetenv ("COLUMNS");
614 unsetenv ("TERMCAP"); /* terminfo should be okay */ 979 unsetenv ("TERMCAP"); /* terminfo should be okay */
615#endif /* HAVE_UNSETENV */ 980#endif /* HAVE_UNSETENV */
616} 981}
617 982
618/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
619/* 984/*
620 * This is more or less stolen straight from XFree86 xterm. 985 * This is more or less stolen straight from XFree86 xterm.
… …
641 1006
642 this->locale = "C"; 1007 this->locale = "C";
643 } 1008 }
644 1009
645 1010
646 this->locale = rxvt_strdup (this->locale); 1011 this->locale = strdup (this->locale);
647 SET_LOCALE (this->locale); 1012 SET_LOCALE (this->locale);
648 mbstate.reset (); 1013 mbstate.reset ();
649#endif 1014#endif
650 1015
651#if HAVE_NL_LANGINFO 1016#if HAVE_NL_LANGINFO
… …
724 run_command (argv); 1089 run_command (argv);
725} 1090}
726 1091
727/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
728void 1093void
729rxvt_term::Get_Colours () 1094rxvt_term::get_colours ()
730{ 1095{
731 int i; 1096 int i;
732 1097
733#ifdef OFF_FOCUS_FADING 1098#ifdef OFF_FOCUS_FADING
734 pix_colors = pix_colors_focused; 1099 pix_colors = pix_colors_focused;
735#endif 1100#endif
736 1101
737 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
738 { 1103 {
739 const char *name = rs[Rs_color + i]; 1104 const char *name = rs[Rs_color + i];
740 1105
741 if (!name) 1106 if (!name)
… …
794 * get scrollBar shadow colors 1159 * get scrollBar shadow colors
795 * 1160 *
796 * The calculations of topShadow/bottomShadow values are adapted 1161 * The calculations of topShadow/bottomShadow values are adapted
797 * from the fvwm window manager. 1162 * from the fvwm window manager.
798 */ 1163 */
799#ifdef KEEP_SCROLLCOLOR 1164#ifdef RXVT_SCROLLBAR
800 if (depth <= 2) 1165 if (depth <= 2)
801 { 1166 {
802 /* Monochrome */ 1167 /* Monochrome */
803 alias_color (Color_scroll, Color_fg); 1168 alias_color (Color_scroll, Color_fg);
804 alias_color (Color_topShadow, Color_bg); 1169 alias_color (Color_topShadow, Color_bg);
… …
819 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
820 cscroll.a) 1185 cscroll.a)
821 )) 1186 ))
822 alias_color (Color_topShadow, Color_White); 1187 alias_color (Color_topShadow, Color_White);
823 } 1188 }
824#endif /* KEEP_SCROLLCOLOR */ 1189#endif
825 1190
826#ifdef OFF_FOCUS_FADING 1191#ifdef OFF_FOCUS_FADING
827 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
828 update_fade_color (i); 1193 update_fade_color (i);
829#endif 1194#endif
… …
837 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
838 { 1203 {
839 int i = atoi (rs[Rs_color + idx]); 1204 int i = atoi (rs[Rs_color + idx]);
840 1205
841 if (i >= 8 && i <= 15) 1206 if (i >= 8 && i <= 15)
842 { /* bright colors */ 1207 /* bright colors */
843 i -= 8;
844 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1208 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
845 return; 1209 else if (i >= 0 && i <= 7)
846 } 1210 /* normal colors */
847
848 if (i >= 0 && i <= 7) /* normal colors */
849 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1211 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
850 } 1212 }
851} 1213}
852 1214
853/*----------------------------------------------------------------------*/ 1215/*----------------------------------------------------------------------*/
… …
954 Window top, parent; 1316 Window top, parent;
955 1317
956 dLocal (Display *, dpy); 1318 dLocal (Display *, dpy);
957 1319
958 /* grab colors before netscape does */ 1320 /* grab colors before netscape does */
959 Get_Colours (); 1321 get_colours ();
960 1322
961 if (!set_fonts ()) 1323 if (!set_fonts ())
962 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
963 1325
964 parent = display->root; 1326 parent = display->root;
… …
1012 this->parent[0] = top; 1374 this->parent[0] = top;
1013 1375
1014 old_width = szHint.width; 1376 old_width = szHint.width;
1015 old_height = szHint.height; 1377 old_height = szHint.height;
1016 1378
1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1379 set_title (rs [Rs_title]);
1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1380 set_icon_name (rs [Rs_iconName]);
1019 1381
1020 classHint.res_name = (char *)rs[Rs_name]; 1382 classHint.res_name = (char *)rs[Rs_name];
1021 classHint.res_class = (char *)RESCLASS; 1383 classHint.res_class = (char *)RESCLASS;
1022 1384
1023 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1385 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1025 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1026 wmHint.window_group = top; 1388 wmHint.window_group = top;
1027 1389
1028 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1029 &szHint, &wmHint, &classHint); 1391 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /*
1395 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1397 */
1398
1399 if (rs [Rs_iconfile])
1400 {
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif
1030 1442
1031#if ENABLE_FRILLS 1443#if ENABLE_FRILLS
1032 if (mwmhints.flags) 1444 if (mwmhints.flags)
1033 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1034 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1446 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1068 1480
1069 termwin_ev.start (display, top); 1481 termwin_ev.start (display, top);
1070 1482
1071 /* vt cursor: Black-on-White is standard, but this is more popular */ 1483 /* vt cursor: Black-on-White is standard, but this is more popular */
1072 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1073
1074#ifdef HAVE_SCROLLBARS
1075 /* cursor scrollBar: Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1077#endif
1078 1485
1079 /* the vt window */ 1486 /* the vt window */
1080 vt = XCreateSimpleWindow (dpy, top, 1487 vt = XCreateSimpleWindow (dpy, top,
1081 window_vt_x, window_vt_y, 1488 window_vt_x, window_vt_y,
1082 width, height, 1489 width, height,
… …
1107 GCForeground | GCBackground | GCGraphicsExposures, 1514 GCForeground | GCBackground | GCGraphicsExposures,
1108 &gcvalue); 1515 &gcvalue);
1109 1516
1110 drawable = new rxvt_drawable (this, vt); 1517 drawable = new rxvt_drawable (this, vt);
1111 1518
1112#ifdef RXVT_SCROLLBAR
1113 gcvalue.foreground = pix_colors[Color_topShadow];
1114 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[Color_bottomShadow];
1116 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1118 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119#endif
1120
1121#ifdef OFF_FOCUS_FADING 1519#ifdef OFF_FOCUS_FADING
1122 // initially we are in unfocused state 1520 // initially we are in unfocused state
1123 if (rs[Rs_fade]) 1521 if (rs[Rs_fade])
1124 pix_colors = pix_colors_unfocused; 1522 pix_colors = pix_colors_unfocused;
1125#endif 1523#endif
… …
1130 1528
1131/* ------------------------------------------------------------------------- * 1529/* ------------------------------------------------------------------------- *
1132 * GET TTY CURRENT STATE * 1530 * GET TTY CURRENT STATE *
1133 * ------------------------------------------------------------------------- */ 1531 * ------------------------------------------------------------------------- */
1134void 1532void
1135rxvt_get_ttymode (ttymode_t *tio, int erase) 1533rxvt_get_ttymode (struct termios *tio, int erase)
1136{ 1534{
1137 /* 1535 /*
1138 * standard System V termios interface 1536 * standard System V termios interface
1139 */ 1537 */
1140 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1538 // does not work as stdin is not a tty
1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1141 { 1541 {
1142 // return error - use system defaults, 1542 // return error - use system defaults,
1143 // where possible, and zero elsewhere 1543 // where possible, and zero elsewhere
1144 memset (tio, 0, sizeof (ttymode_t)); 1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1145 1548
1146 tio->c_cc[VINTR] = CINTR; 1549 tio->c_cc[VINTR] = CINTR;
1147 tio->c_cc[VQUIT] = CQUIT; 1550 tio->c_cc[VQUIT] = CQUIT;
1148 tio->c_cc[VERASE] = CERASE; 1551 tio->c_cc[VERASE] = CERASE;
1149#ifdef VERASE2 1552#ifdef VERASE2
… …
1169 tio->c_cc[VLNEXT] = CLNEXT; 1572 tio->c_cc[VLNEXT] = CLNEXT;
1170# endif 1573# endif
1171 } 1574 }
1172 1575
1173 tio->c_cc[VEOF] = CEOF; 1576 tio->c_cc[VEOF] = CEOF;
1174 tio->c_cc[VEOL] = VDISABLE;
1175# ifdef VEOL2
1176 tio->c_cc[VEOL2] = VDISABLE;
1177# endif
1178# ifdef VSWTC
1179 tio->c_cc[VSWTC] = VDISABLE;
1180# endif
1181# ifdef VSWTCH
1182 tio->c_cc[VSWTCH] = VDISABLE;
1183# endif
1184# if VMIN != VEOF 1577# if VMIN != VEOF
1185 tio->c_cc[VMIN] = 1; 1578 tio->c_cc[VMIN] = 1;
1186# endif 1579# endif
1187# if VTIME != VEOL 1580# if VTIME != VEOL
1188 tio->c_cc[VTIME] = 0; 1581 tio->c_cc[VTIME] = 0;
1189# endif 1582# endif
1190 1583
1191 if (erase != -1) 1584 if (erase != -1)
1192 tio->c_cc[VERASE] = (char)erase; 1585 tio->c_cc[VERASE] = erase;
1193 1586
1194 /* input modes */ 1587 /* input modes */
1195 tio->c_iflag = (BRKINT | IGNPAR | ICRNL 1588 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1196# ifdef IMAXBEL 1589# ifdef IMAXBEL
1197 | IMAXBEL 1590 | IMAXBEL
… …
1213 1606
1214 /* 1607 /*
1215 * Debugging 1608 * Debugging
1216 */ 1609 */
1217#ifdef DEBUG_TTYMODE 1610#ifdef DEBUG_TTYMODE
1218#ifdef HAVE_TERMIOS_H
1219 /* c_iflag bits */ 1611 /* c_iflag bits */
1220 fprintf (stderr, "Input flags\n"); 1612 fprintf (stderr, "Input flags\n");
1221 1613
1222 /* cpp token stringize doesn't work on all machines <sigh> */ 1614 /* cpp token stringize doesn't work on all machines <sigh> */
1223# define FOO(flag,name) \ 1615# define FOO(flag,name) \
1224 if ((tio->c_iflag) & flag) \ 1616 if ((tio->c_iflag) & flag) \
1225 fprintf (stderr, "%s ", name) 1617 fprintf (stderr, "%s ", name)
1226 1618
1227 /* c_iflag bits */ 1619 /* c_iflag bits */
1228 FOO (IGNBRK, "IGNBRK"); 1620 FOO (IGNBRK, "IGNBRK");
1229 FOO (BRKINT, "BRKINT"); 1621 FOO (BRKINT, "BRKINT");
1230 FOO (IGNPAR, "IGNPAR"); 1622 FOO (IGNPAR, "IGNPAR");
… …
1286 FOO (VLNEXT, "VLNEXT"); 1678 FOO (VLNEXT, "VLNEXT");
1287# endif 1679# endif
1288 1680
1289 fprintf (stderr, "\n"); 1681 fprintf (stderr, "\n");
1290# undef FOO 1682# undef FOO
1291# endif /* HAVE_TERMIOS_H */ 1683#endif /* DEBUG_TTYMODE */
1292#endif /* DEBUG_TTYMODE */
1293} 1684}
1294 1685
1295/*----------------------------------------------------------------------*/ 1686/*----------------------------------------------------------------------*/
1296/* 1687/*
1297 * Run the command in a subprocess and return a file descriptor for the 1688 * Run the command in a subprocess and return a file descriptor for the
… …
1330 else 1721 else
1331#endif 1722#endif
1332 er = -1; 1723 er = -1;
1333 1724
1334 rxvt_get_ttymode (&tio, er); 1725 rxvt_get_ttymode (&tio, er);
1335 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1726 /* init terminal attributes */
1727 cfsetospeed (&tio, BAUDRATE);
1728 cfsetispeed (&tio, BAUDRATE);
1729 tcsetattr (pty->tty, TCSANOW, &tio);
1336 pty->set_utf8_mode (enc_utf8); 1730 pty->set_utf8_mode (enc_utf8);
1337 1731
1338 /* set initial window size */ 1732 /* set initial window size */
1339 tt_winch (); 1733 tt_winch ();
1340 1734
… …
1400rxvt_term::run_child (const char *const *argv) 1794rxvt_term::run_child (const char *const *argv)
1401{ 1795{
1402 char *login; 1796 char *login;
1403 1797
1404 if (option (Opt_console)) 1798 if (option (Opt_console))
1799 {
1405 { /* be virtual console, fail silently */ 1800 /* be virtual console, fail silently */
1406#ifdef TIOCCONS 1801#ifdef TIOCCONS
1407 unsigned int on = 1; 1802 unsigned int on = 1;
1408 1803
1409 ioctl (STDIN_FILENO, TIOCCONS, &on); 1804 ioctl (STDIN_FILENO, TIOCCONS, &on);
1410#elif defined (SRIOCSREDIR) 1805#elif defined (SRIOCSREDIR)
… …
1412 1807
1413 fd = open (CONSOLE, O_WRONLY, 0); 1808 fd = open (CONSOLE, O_WRONLY, 0);
1414 if (fd >= 0) 1809 if (fd >= 0)
1415 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1810 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1416 close (fd); 1811 close (fd);
1417#endif /* SRIOCSREDIR */ 1812#endif /* SRIOCSREDIR */
1418 } 1813 }
1419 1814
1420 /* reset signals and spin off the command interpreter */ 1815 /* reset signals and spin off the command interpreter */
1421 signal (SIGINT, SIG_DFL); 1816 signal (SIGINT, SIG_DFL);
1422 signal (SIGQUIT, SIG_DFL); 1817 signal (SIGQUIT, SIG_DFL);
… …
1429 */ 1824 */
1430#ifdef SIGTSTP 1825#ifdef SIGTSTP
1431 signal (SIGTSTP, SIG_IGN); 1826 signal (SIGTSTP, SIG_IGN);
1432 signal (SIGTTIN, SIG_IGN); 1827 signal (SIGTTIN, SIG_IGN);
1433 signal (SIGTTOU, SIG_IGN); 1828 signal (SIGTTOU, SIG_IGN);
1434#endif /* SIGTSTP */ 1829#endif /* SIGTSTP */
1435
1436 // unblock signals (signals are blocked by iom.C
1437 sigset_t ss;
1438 sigemptyset (&ss);
1439 sigprocmask (SIG_SETMASK, &ss, 0);
1440 1830
1441 /* command interpreter path */ 1831 /* command interpreter path */
1442 if (argv) 1832 if (argv)
1443 { 1833 {
1444# ifdef DEBUG_CMD 1834# ifdef DEBUG_CMD
… …
1456 const char *argv0, *shell; 1846 const char *argv0, *shell;
1457 1847
1458 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1848 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1459 shell = "/bin/sh"; 1849 shell = "/bin/sh";
1460 1850
1461 argv0 = (const char *)rxvt_basename (shell); 1851 argv0 = rxvt_basename (shell);
1462 1852
1463 if (option (Opt_loginShell)) 1853 if (option (Opt_loginShell))
1464 { 1854 {
1465 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1855 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1466 1856

Diff Legend

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