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.231 by ayin, Tue Dec 18 12:04:50 2007 UTC vs.
Revision 1.322 by sf-exg, Thu May 17 10:18:32 2012 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) 2003-2007 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
34 34
35#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
36#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
37#include "rxvtutil.h" 37#include "rxvtutil.h"
38#include "init.h" 38#include "init.h"
39#include "keyboard.h"
39 40
40#include <limits> 41#include <limits>
41 42
42#include <csignal> 43#include <signal.h>
43 44
44#include <fcntl.h> 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
50# ifdef HAVE_SETLOCALE
51# include <clocale> 51# include <locale.h>
52# endif
53#endif 52#endif
54 53
55#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h> 55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
57#endif 61#endif
58 62
59#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h> 65#include <sys/types.h>
… …
142 146
143 return rval; 147 return rval;
144} 148}
145#endif 149#endif
146 150
147const char *const def_colorName[] = 151static const char *const def_colorName[] =
148 { 152 {
149 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
150 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
151 /* low-intensity colors */ 155 /* low-intensity colors */
152 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 181
182#if !USE_256_COLORS
178 // 88 xterm colours 183 // 88 xterm colours
179 "rgb:00/00/00", 184 "rgb:00/00/00",
180 "rgb:00/00/8b", 185 "rgb:00/00/8b",
181 "rgb:00/00/cd", 186 "rgb:00/00/cd",
182 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
250 "rgb:e7/e7/e7", 255 "rgb:e7/e7/e7",
256#else
257 // 256 xterm colours
258 "rgb:00/00/00",
259 "rgb:00/00/5f",
260 "rgb:00/00/87",
261 "rgb:00/00/af",
262 "rgb:00/00/d7",
263 "rgb:00/00/ff",
264 "rgb:00/5f/00",
265 "rgb:00/5f/5f",
266 "rgb:00/5f/87",
267 "rgb:00/5f/af",
268 "rgb:00/5f/d7",
269 "rgb:00/5f/ff",
270 "rgb:00/87/00",
271 "rgb:00/87/5f",
272 "rgb:00/87/87",
273 "rgb:00/87/af",
274 "rgb:00/87/d7",
275 "rgb:00/87/ff",
276 "rgb:00/af/00",
277 "rgb:00/af/5f",
278 "rgb:00/af/87",
279 "rgb:00/af/af",
280 "rgb:00/af/d7",
281 "rgb:00/af/ff",
282 "rgb:00/d7/00",
283 "rgb:00/d7/5f",
284 "rgb:00/d7/87",
285 "rgb:00/d7/af",
286 "rgb:00/d7/d7",
287 "rgb:00/d7/ff",
288 "rgb:00/ff/00",
289 "rgb:00/ff/5f",
290 "rgb:00/ff/87",
291 "rgb:00/ff/af",
292 "rgb:00/ff/d7",
293 "rgb:00/ff/ff",
294 "rgb:5f/00/00",
295 "rgb:5f/00/5f",
296 "rgb:5f/00/87",
297 "rgb:5f/00/af",
298 "rgb:5f/00/d7",
299 "rgb:5f/00/ff",
300 "rgb:5f/5f/00",
301 "rgb:5f/5f/5f",
302 "rgb:5f/5f/87",
303 "rgb:5f/5f/af",
304 "rgb:5f/5f/d7",
305 "rgb:5f/5f/ff",
306 "rgb:5f/87/00",
307 "rgb:5f/87/5f",
308 "rgb:5f/87/87",
309 "rgb:5f/87/af",
310 "rgb:5f/87/d7",
311 "rgb:5f/87/ff",
312 "rgb:5f/af/00",
313 "rgb:5f/af/5f",
314 "rgb:5f/af/87",
315 "rgb:5f/af/af",
316 "rgb:5f/af/d7",
317 "rgb:5f/af/ff",
318 "rgb:5f/d7/00",
319 "rgb:5f/d7/5f",
320 "rgb:5f/d7/87",
321 "rgb:5f/d7/af",
322 "rgb:5f/d7/d7",
323 "rgb:5f/d7/ff",
324 "rgb:5f/ff/00",
325 "rgb:5f/ff/5f",
326 "rgb:5f/ff/87",
327 "rgb:5f/ff/af",
328 "rgb:5f/ff/d7",
329 "rgb:5f/ff/ff",
330 "rgb:87/00/00",
331 "rgb:87/00/5f",
332 "rgb:87/00/87",
333 "rgb:87/00/af",
334 "rgb:87/00/d7",
335 "rgb:87/00/ff",
336 "rgb:87/5f/00",
337 "rgb:87/5f/5f",
338 "rgb:87/5f/87",
339 "rgb:87/5f/af",
340 "rgb:87/5f/d7",
341 "rgb:87/5f/ff",
342 "rgb:87/87/00",
343 "rgb:87/87/5f",
344 "rgb:87/87/87",
345 "rgb:87/87/af",
346 "rgb:87/87/d7",
347 "rgb:87/87/ff",
348 "rgb:87/af/00",
349 "rgb:87/af/5f",
350 "rgb:87/af/87",
351 "rgb:87/af/af",
352 "rgb:87/af/d7",
353 "rgb:87/af/ff",
354 "rgb:87/d7/00",
355 "rgb:87/d7/5f",
356 "rgb:87/d7/87",
357 "rgb:87/d7/af",
358 "rgb:87/d7/d7",
359 "rgb:87/d7/ff",
360 "rgb:87/ff/00",
361 "rgb:87/ff/5f",
362 "rgb:87/ff/87",
363 "rgb:87/ff/af",
364 "rgb:87/ff/d7",
365 "rgb:87/ff/ff",
366 "rgb:af/00/00",
367 "rgb:af/00/5f",
368 "rgb:af/00/87",
369 "rgb:af/00/af",
370 "rgb:af/00/d7",
371 "rgb:af/00/ff",
372 "rgb:af/5f/00",
373 "rgb:af/5f/5f",
374 "rgb:af/5f/87",
375 "rgb:af/5f/af",
376 "rgb:af/5f/d7",
377 "rgb:af/5f/ff",
378 "rgb:af/87/00",
379 "rgb:af/87/5f",
380 "rgb:af/87/87",
381 "rgb:af/87/af",
382 "rgb:af/87/d7",
383 "rgb:af/87/ff",
384 "rgb:af/af/00",
385 "rgb:af/af/5f",
386 "rgb:af/af/87",
387 "rgb:af/af/af",
388 "rgb:af/af/d7",
389 "rgb:af/af/ff",
390 "rgb:af/d7/00",
391 "rgb:af/d7/5f",
392 "rgb:af/d7/87",
393 "rgb:af/d7/af",
394 "rgb:af/d7/d7",
395 "rgb:af/d7/ff",
396 "rgb:af/ff/00",
397 "rgb:af/ff/5f",
398 "rgb:af/ff/87",
399 "rgb:af/ff/af",
400 "rgb:af/ff/d7",
401 "rgb:af/ff/ff",
402 "rgb:d7/00/00",
403 "rgb:d7/00/5f",
404 "rgb:d7/00/87",
405 "rgb:d7/00/af",
406 "rgb:d7/00/d7",
407 "rgb:d7/00/ff",
408 "rgb:d7/5f/00",
409 "rgb:d7/5f/5f",
410 "rgb:d7/5f/87",
411 "rgb:d7/5f/af",
412 "rgb:d7/5f/d7",
413 "rgb:d7/5f/ff",
414 "rgb:d7/87/00",
415 "rgb:d7/87/5f",
416 "rgb:d7/87/87",
417 "rgb:d7/87/af",
418 "rgb:d7/87/d7",
419 "rgb:d7/87/ff",
420 "rgb:d7/af/00",
421 "rgb:d7/af/5f",
422 "rgb:d7/af/87",
423 "rgb:d7/af/af",
424 "rgb:d7/af/d7",
425 "rgb:d7/af/ff",
426 "rgb:d7/d7/00",
427 "rgb:d7/d7/5f",
428 "rgb:d7/d7/87",
429 "rgb:d7/d7/af",
430 "rgb:d7/d7/d7",
431 "rgb:d7/d7/ff",
432 "rgb:d7/ff/00",
433 "rgb:d7/ff/5f",
434 "rgb:d7/ff/87",
435 "rgb:d7/ff/af",
436 "rgb:d7/ff/d7",
437 "rgb:d7/ff/ff",
438 "rgb:ff/00/00",
439 "rgb:ff/00/5f",
440 "rgb:ff/00/87",
441 "rgb:ff/00/af",
442 "rgb:ff/00/d7",
443 "rgb:ff/00/ff",
444 "rgb:ff/5f/00",
445 "rgb:ff/5f/5f",
446 "rgb:ff/5f/87",
447 "rgb:ff/5f/af",
448 "rgb:ff/5f/d7",
449 "rgb:ff/5f/ff",
450 "rgb:ff/87/00",
451 "rgb:ff/87/5f",
452 "rgb:ff/87/87",
453 "rgb:ff/87/af",
454 "rgb:ff/87/d7",
455 "rgb:ff/87/ff",
456 "rgb:ff/af/00",
457 "rgb:ff/af/5f",
458 "rgb:ff/af/87",
459 "rgb:ff/af/af",
460 "rgb:ff/af/d7",
461 "rgb:ff/af/ff",
462 "rgb:ff/d7/00",
463 "rgb:ff/d7/5f",
464 "rgb:ff/d7/87",
465 "rgb:ff/d7/af",
466 "rgb:ff/d7/d7",
467 "rgb:ff/d7/ff",
468 "rgb:ff/ff/00",
469 "rgb:ff/ff/5f",
470 "rgb:ff/ff/87",
471 "rgb:ff/ff/af",
472 "rgb:ff/ff/d7",
473 "rgb:ff/ff/ff",
474 "rgb:08/08/08",
475 "rgb:12/12/12",
476 "rgb:1c/1c/1c",
477 "rgb:26/26/26",
478 "rgb:30/30/30",
479 "rgb:3a/3a/3a",
480 "rgb:44/44/44",
481 "rgb:4e/4e/4e",
482 "rgb:58/58/58",
483 "rgb:62/62/62",
484 "rgb:6c/6c/6c",
485 "rgb:76/76/76",
486 "rgb:80/80/80",
487 "rgb:8a/8a/8a",
488 "rgb:94/94/94",
489 "rgb:9e/9e/9e",
490 "rgb:a8/a8/a8",
491 "rgb:b2/b2/b2",
492 "rgb:bc/bc/bc",
493 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0",
495 "rgb:da/da/da",
496 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee",
498#endif
251 499
252#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
… …
265#if ENABLE_FRILLS 513#if ENABLE_FRILLS
266 NULL, // Color_underline 514 NULL, // Color_underline
267#endif 515#endif
268#ifdef OPTION_HC 516#ifdef OPTION_HC
269 NULL, 517 NULL,
518 NULL,
270#endif 519#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 523#endif
275#if ENABLE_TRANSPARENCY 524#if ENABLE_TRANSPARENCY
276 NULL, 525 NULL,
277#endif 526#endif
278#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 528 "rgb:00/00/00",
… …
281 }; 530 };
282 531
283void 532void
284rxvt_term::init_vars () 533rxvt_term::init_vars ()
285{ 534{
286 pix_colors = // 535 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 536
292 MEvent.time = CurrentTime; 537 MEvent.time = CurrentTime;
293 MEvent.button = AnyButton; 538 MEvent.button = AnyButton;
294 want_refresh = 1; 539 want_refresh = 1;
295 priv_modes = SavedModes = PrivMode_Default; 540 priv_modes = SavedModes = PrivMode_Default;
296 ncol = 80; 541 ncol = 80;
297 nrow = 24; 542 nrow = 24;
298 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
299 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
300 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
301 saveLines = SAVELINES; 547 saveLines = SAVELINES;
302 548
303 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
304 550
305 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
306 last_bot = last_state = -1;
307 552
308 set_option (Opt_scrollBar); 553 set_option (Opt_scrollBar);
309 set_option (Opt_scrollTtyOutput); 554 set_option (Opt_scrollTtyOutput);
310 set_option (Opt_jumpScroll); 555 set_option (Opt_jumpScroll);
311 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
312 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
313 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
314 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
315 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
316 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
317} 563 set_option (Opt_buffered);
318
319void
320rxvt_term::init_secondary ()
321{
322 int i;
323
324 /*
325 * Close all unused file descriptors
326 * We don't want them, we don't need them.
327 */
328 if ((i = open ("/dev/null", O_RDONLY)) < 0)
329 {
330 /* TODO: BOO HISS */
331 dup2 (STDERR_FILENO, STDIN_FILENO);
332 }
333 else if (i != STDIN_FILENO)
334 {
335 dup2 (i, STDIN_FILENO);
336 close (i);
337 }
338
339 dup2 (STDERR_FILENO, STDOUT_FILENO);
340
341#if 0 // schmorp sayz closing filies is murder
342 for (i = STDERR_FILENO + 1; i < num_fds; i++)
343 {
344#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
345 if (i == 4 || i == 7)
346 continue;
347#endif
348 close (i);
349 }
350#endif
351} 564}
352 565
353/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
354const char ** 567const char **
355rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
356{ 569{
357 int i, r_argc; 570 int i;
358 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
359
360 /*
361 * Look for -e option. Find => split and make cmd_argv[] of command args
362 */
363 for (r_argc = 0; r_argc < argc; r_argc++)
364 if (!strcmp (argv[r_argc], "-e"))
365 break;
366
367 if (r_argc == argc)
368 cmd_argv = NULL;
369 else if (!argv[r_argc + 1])
370 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
371 else
372 {
373 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
374
375 for (i = 0; i < argc - r_argc - 1; i++)
376 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
377
378 cmd_argv[i] = NULL;
379 }
380
381 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
382
383 for (i = 0; i < r_argc; i++)
384 r_argv[i] = (const char *)argv[i];
385
386 r_argv[i] = NULL;
387 572
388 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
389 574
390 /* 575 /*
391 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
392 */ 577 */
393 578
394 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
395 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
396 581
397 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
398 583
399 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
400 {
401 free (r_argv);
402 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
403 }
404 586
405 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
406 xa = display->xa; 588 xa = display->xa;
407 589
408 set (display); 590 set (display);
… …
411#if XFT 593#if XFT
412 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
413 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
414#endif 596#endif
415 597
416#ifdef HAVE_AFTERIMAGE
417 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
418#endif
419 free (r_argv);
420
421 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
422 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
423 rs [i] = 0; 600 rs [i] = 0;
424 601
425#if ENABLE_PERL 602#if ENABLE_PERL
… …
432 { 609 {
433 rxvt_perl.init (this); 610 rxvt_perl.init (this);
434 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
435 } 612 }
436#endif 613#endif
614
615 // must be called after initialising the perl interpreter as it
616 // may invoke the `on_register_command' hook
617 extract_keysym_resources ();
437 618
438 /* 619 /*
439 * set any defaults not already set 620 * set any defaults not already set
440 */ 621 */
441 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
442 { 623 {
443 if (!rs[Rs_title]) 624 if (!rs[Rs_title])
444 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 625 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
626
445 if (!rs[Rs_iconName]) 627 if (!rs[Rs_iconName])
446 rs[Rs_iconName] = rs[Rs_title]; 628 rs[Rs_iconName] = rs[Rs_title];
447 } 629 }
448 else 630 else
449 { 631 {
450 if (!rs[Rs_title]) 632 if (!rs[Rs_title])
451 rs[Rs_title] = rs[Rs_name]; 633 rs[Rs_title] = rs[Rs_name];
634
452 if (!rs[Rs_iconName]) 635 if (!rs[Rs_iconName])
453 rs[Rs_iconName] = rs[Rs_name]; 636 rs[Rs_iconName] = rs[Rs_name];
454 } 637 }
455 638
456 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 639 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
463 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 646 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
464 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
465 648
466 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
467 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 650 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
651
652 if (rs[Rs_letterSpace])
653 letterSpace = atoi (rs[Rs_letterSpace]);
468#endif 654#endif
469 655
470#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
471 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
472 pointerBlankDelay = i; 658 pointerBlankDelay = i;
… …
475#endif 661#endif
476 662
477 /* no point having a scrollbar without having any scrollback! */ 663 /* no point having a scrollbar without having any scrollback! */
478 if (!saveLines) 664 if (!saveLines)
479 set_option (Opt_scrollBar, 0); 665 set_option (Opt_scrollBar, 0);
480
481#ifdef PRINTPIPE
482 if (!rs[Rs_print_pipe])
483 rs[Rs_print_pipe] = PRINTPIPE;
484#endif
485 666
486 if (!rs[Rs_cutchars]) 667 if (!rs[Rs_cutchars])
487 rs[Rs_cutchars] = CUTCHARS; 668 rs[Rs_cutchars] = CUTCHARS;
488 669
489#ifndef NO_BACKSPACE_KEY 670#ifndef NO_BACKSPACE_KEY
… …
502# else 683# else
503 rs[Rs_delete_key] = "\033[3~"; 684 rs[Rs_delete_key] = "\033[3~";
504# endif 685# endif
505#endif 686#endif
506 687
507#ifdef HAVE_SCROLLBARS 688 scrollBar.setup (this);
508 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
509#endif
510 689
511#ifdef XTERM_REVERSE_VIDEO 690#ifdef XTERM_REVERSE_VIDEO
512 /* this is how xterm implements reverseVideo */ 691 /* this is how xterm implements reverseVideo */
513 if (option (Opt_reverseVideo)) 692 if (option (Opt_reverseVideo))
514 { 693 {
… …
552 return cmd_argv; 731 return cmd_argv;
553} 732}
554 733
555/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
556void 735void
736rxvt_term::init (stringvec *argv, stringvec *envv)
737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
742 this->envv = envv;
743
744 init2 (argv->size () - 1, argv->begin ());
745}
746
747void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
749{
750#if ENABLE_PERL
751 // perl might want to access the stringvecs later, so we need to copy them
752 stringvec *args = new stringvec;
753 for (int i = 0; i < argc; i++)
754 args->push_back (strdup (argv [i]));
755
756 stringvec *envs = new stringvec;
757 for (const char *const *var = envv; *var; var++)
758 envs->push_back (strdup (*var));
759
760 init (args, envs);
761#else
762 init2 (argc, argv);
763#endif
764}
765
766void
767rxvt_term::init2 (int argc, const char *const *argv)
768{
769 SET_R (this);
770 set_locale ("");
771 set_environ (envv); // a few things in X do not call setlocale :(
772
773 init_vars ();
774
775 const char **cmd_argv = init_resources (argc, argv);
776
777#ifdef KEYSYM_RESOURCE
778 keyboard->register_done ();
779#endif
780
781 if (const char *path = rs[Rs_chdir])
782 if (*path) // ignored if empty
783 {
784 if (*path != '/')
785 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
786
787 if (chdir (path))
788 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
789 }
790
791 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793
794 pty = ptytty::create ();
795
796 // must be called before create_windows, because the latter may call set_icon
797#ifdef HAVE_PIXBUF
798 g_type_init ();
799#endif
800
801 create_windows (argc, argv);
802
803 init_xlocale ();
804
805 scr_poweron (); // initialize screen
806
807#if 0
808 XSynchronize (dpy, True);
809#endif
810
811 if (option (Opt_scrollBar))
812 scrollBar.resize (); /* create and map scrollbar */
813#ifdef HAVE_BG_PIXMAP
814 {
815 bg_init ();
816
817#ifdef ENABLE_TRANSPARENCY
818 if (option (Opt_transparent))
819 {
820 bg_set_transparent ();
821
822 if (rs [Rs_blurradius])
823 bg_set_blur (rs [Rs_blurradius]);
824
825 if (ISSET_PIXCOLOR (Color_tint))
826 bg_set_tint (pix_colors_focused [Color_tint]);
827
828 if (rs [Rs_shade])
829 bg_set_shade (rs [Rs_shade]);
830
831 bg_set_root_pixmap ();
832 XSelectInput (dpy, display->root, PropertyChangeMask);
833 rootwin_ev.start (display, display->root);
834 }
835#endif
836
837#ifdef BG_IMAGE_FROM_FILE
838 if (rs[Rs_backgroundPixmap])
839 if (bg_image.set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842#endif
843 }
844#endif
845
846#if ENABLE_PERL
847 rootwin_ev.start (display, display->root);
848#endif
849
850 init_done = 1;
851
852 init_command (cmd_argv);
853
854 if (pty->pty >= 0)
855 pty_ev.start (pty->pty, ev::READ);
856
857 HOOK_INVOKE ((this, HOOK_START, DT_END));
858
859#if ENABLE_XEMBED
860 if (rs[Rs_embed])
861 {
862 long info[2] = { 0, XEMBED_MAPPED };
863
864 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
865 32, PropModeReplace, (unsigned char *)&info, 2);
866 }
867#endif
868
869#if HAVE_STARTUP_NOTIFICATION
870 SnDisplay *snDisplay;
871 SnLauncheeContext *snContext;
872
873 snDisplay = sn_display_new (dpy, NULL, NULL);
874 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
875
876 /* Tell the window manager that this window is part of the startup context */
877 if (snContext)
878 sn_launchee_context_setup_window (snContext, parent);
879#endif
880
881 XMapWindow (dpy, vt);
882 XMapWindow (dpy, parent);
883
884#if HAVE_STARTUP_NOTIFICATION
885 if (snContext)
886 {
887 /* Mark the startup process as complete */
888 sn_launchee_context_complete (snContext);
889
890 sn_launchee_context_unref (snContext);
891 }
892
893 sn_display_unref (snDisplay);
894#endif
895
896 refresh_check ();
897}
898
899/*----------------------------------------------------------------------*/
900void
557rxvt_term::init_env () 901rxvt_term::init_env ()
558{ 902{
559 int i;
560 char *val; 903 char *val;
904 char *env_display;
905 char *env_windowid;
906 char *env_colorfgbg;
907 char *env_term;
561 908
562#ifdef DISPLAY_IS_IP 909#ifdef DISPLAY_IS_IP
563 /* Fixup display_name for export over pty to any interested terminal 910 /* Fixup display_name for export over pty to any interested terminal
564 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 911 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
565 * (for the first non-loopback interface) that we get from 912 * (for the first non-loopback interface) that we get from
… …
578 val = XDisplayString (dpy); 925 val = XDisplayString (dpy);
579 926
580 if (rs[Rs_display_name] == NULL) 927 if (rs[Rs_display_name] == NULL)
581 rs[Rs_display_name] = val; /* use broken `:0' value */ 928 rs[Rs_display_name] = val; /* use broken `:0' value */
582 929
583 i = strlen (val);
584 env_display = (char *)rxvt_malloc (i + 9); 930 env_display = (char *)rxvt_malloc (strlen (val) + 9);
585 931
586 sprintf (env_display, "DISPLAY=%s", val); 932 sprintf (env_display, "DISPLAY=%s", val);
587 933
934 env_windowid = (char *)rxvt_malloc (21);
588 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 935 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
589 936
590 /* add entries to the environment: 937 /* add entries to the environment:
591 * @ DISPLAY: in case we started with -display 938 * @ DISPLAY: in case we started with -display
592 * @ WINDOWID: X window id number of the window 939 * @ WINDOWID: X window id number of the window
593 * @ COLORTERM: terminal sub-name and also indicates its color 940 * @ COLORTERM: terminal sub-name and also indicates its color
… …
596 * @ COLORFGBG: fg;bg color codes 943 * @ COLORFGBG: fg;bg color codes
597 */ 944 */
598 putenv (env_display); 945 putenv (env_display);
599 putenv (env_windowid); 946 putenv (env_windowid);
600 947
601 if (env_colorfgbg) 948 env_colorfgbg = get_colorfgbg ();
602 putenv (env_colorfgbg); 949 putenv (env_colorfgbg);
603 950
604#ifdef RXVT_TERMINFO 951#ifdef RXVT_TERMINFO
605 putenv ("TERMINFO=" RXVT_TERMINFO); 952 putenv ("TERMINFO=" RXVT_TERMINFO);
606#endif 953#endif
607 954
… …
626 unsetenv ("TERMCAP"); /* terminfo should be okay */ 973 unsetenv ("TERMCAP"); /* terminfo should be okay */
627#endif /* HAVE_UNSETENV */ 974#endif /* HAVE_UNSETENV */
628} 975}
629 976
630/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
631/*
632 * This is more or less stolen straight from XFree86 xterm.
633 * This should support all European type languages.
634 */
635void 978void
636rxvt_term::set_locale (const char *locale) 979rxvt_term::set_locale (const char *locale)
637{ 980{
638 set_environ (envv); 981 set_environ (envv);
639 982
640#if HAVE_XSETLOCALE || HAVE_SETLOCALE
641 free (this->locale); 983 free (this->locale);
642 this->locale = setlocale (LC_CTYPE, locale); 984 this->locale = setlocale (LC_CTYPE, locale);
643 985
644 if (!this->locale) 986 if (!this->locale)
645 { 987 {
… …
656 998
657 999
658 this->locale = strdup (this->locale); 1000 this->locale = strdup (this->locale);
659 SET_LOCALE (this->locale); 1001 SET_LOCALE (this->locale);
660 mbstate.reset (); 1002 mbstate.reset ();
661#endif
662 1003
663#if HAVE_NL_LANGINFO 1004#if HAVE_NL_LANGINFO
664 char *codeset = strdup (nl_langinfo (CODESET)); 1005 char *codeset = nl_langinfo (CODESET);
665 // /^UTF.?8/i 1006 // /^UTF.?8/i
666 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1007 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
667 && (codeset[1] == 'T' || codeset[1] == 't') 1008 && (codeset[1] == 'T' || codeset[1] == 't')
668 && (codeset[2] == 'F' || codeset[2] == 'f') 1009 && (codeset[2] == 'F' || codeset[2] == 'f')
669 && (codeset[3] == '8' || codeset[4] == '8'); 1010 && (codeset[3] == '8' || codeset[4] == '8');
670 free (codeset);
671#else 1011#else
672 enc_utf8 = 0; 1012 enc_utf8 = 0;
673#endif 1013#endif
674} 1014}
675 1015
… …
678{ 1018{
679 set_environ (envv); 1019 set_environ (envv);
680 1020
681#ifdef USE_XIM 1021#ifdef USE_XIM
682 if (!locale) 1022 if (!locale)
683 rxvt_warn ("setting locale failed, working without locale support.\n"); 1023 rxvt_warn ("setting locale failed, continuing without locale support.\n");
684 else 1024 else
685 { 1025 {
686 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1026 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
687 1027
688 if (!XSupportsLocale ()) 1028 if (!XSupportsLocale ())
689 { 1029 {
690 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1030 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
691 return; 1031 return;
692 } 1032 }
693 1033
694 im_ev.start (display); 1034 im_ev.start (display);
695 1035
… …
736 run_command (argv); 1076 run_command (argv);
737} 1077}
738 1078
739/*----------------------------------------------------------------------*/ 1079/*----------------------------------------------------------------------*/
740void 1080void
741rxvt_term::Get_Colours () 1081rxvt_term::get_colours ()
742{ 1082{
743 int i; 1083 int i;
744 1084
745#ifdef OFF_FOCUS_FADING 1085#ifdef OFF_FOCUS_FADING
746 pix_colors = pix_colors_focused; 1086 pix_colors = pix_colors_focused;
… …
806 * get scrollBar shadow colors 1146 * get scrollBar shadow colors
807 * 1147 *
808 * The calculations of topShadow/bottomShadow values are adapted 1148 * The calculations of topShadow/bottomShadow values are adapted
809 * from the fvwm window manager. 1149 * from the fvwm window manager.
810 */ 1150 */
811#ifdef KEEP_SCROLLCOLOR 1151#ifdef RXVT_SCROLLBAR
812 if (depth <= 2) 1152 if (depth <= 2)
813 { 1153 {
814 /* Monochrome */ 1154 /* Monochrome */
815 alias_color (Color_scroll, Color_fg); 1155 alias_color (Color_scroll, Color_fg);
816 alias_color (Color_topShadow, Color_bg); 1156 alias_color (Color_topShadow, Color_bg);
… …
831 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1171 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
832 cscroll.a) 1172 cscroll.a)
833 )) 1173 ))
834 alias_color (Color_topShadow, Color_White); 1174 alias_color (Color_topShadow, Color_White);
835 } 1175 }
836#endif /* KEEP_SCROLLCOLOR */ 1176#endif
837 1177
838#ifdef OFF_FOCUS_FADING 1178#ifdef OFF_FOCUS_FADING
839 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1179 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
840 update_fade_color (i); 1180 update_fade_color (i);
841#endif 1181#endif
… …
844/*----------------------------------------------------------------------*/ 1184/*----------------------------------------------------------------------*/
845/* color aliases, fg/bg bright-bold */ 1185/* color aliases, fg/bg bright-bold */
846void 1186void
847rxvt_term::color_aliases (int idx) 1187rxvt_term::color_aliases (int idx)
848{ 1188{
849 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1189 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
850 { 1190 {
851 int i = atoi (rs[Rs_color + idx]); 1191 int i = atoi (rs[Rs_color + idx]);
852 1192
853 if (i >= 8 && i <= 15) 1193 if (i >= 8 && i <= 15)
854 /* bright colors */ 1194 /* bright colors */
… …
946 1286
947 if (i) 1287 if (i)
948 ModMetaMask = modmasks[i - 1]; 1288 ModMetaMask = modmasks[i - 1];
949} 1289}
950 1290
1291void
1292rxvt_term::set_icon (const char *file)
1293{
1294#ifdef HAVE_PIXBUF
1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1296 if (!pixbuf)
1297 {
1298 rxvt_warn ("Loading image icon failed, continuing without.\n");
1299 return;
1300 }
1301
1302 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1303 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1304
1305 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1306 {
1307 rxvt_warn ("Icon image too big, continuing without.\n");
1308 g_object_unref (pixbuf);
1309 return;
1310 }
1311
1312 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1313 {
1314 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1315 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1316 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1317
1318 buffer [0] = w;
1319 buffer [1] = h;
1320 for (int i = 0; i < h; i++)
1321 {
1322 for (int j = 0; j < w; j++)
1323 {
1324 unsigned char *pixel = row + j * channels;
1325 long value;
1326
1327 if (channels == 4)
1328 value = pixel[3];
1329 else
1330 value = (unsigned char)0x00ff;
1331
1332 value = (value << 8) + pixel[0];
1333 value = (value << 8) + pixel[1];
1334 value = (value << 8) + pixel[2];
1335 buffer[(i * w + j) + 2] = value;
1336 }
1337
1338 row += rowstride;
1339 }
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 g_object_unref (pixbuf);
1349#endif
1350}
1351
951/*----------------------------------------------------------------------*/ 1352/*----------------------------------------------------------------------*/
952/* rxvt_Create_Windows () - Open and map the window */ 1353/* Open and map the window */
953void 1354void
954rxvt_term::create_windows (int argc, const char *const *argv) 1355rxvt_term::create_windows (int argc, const char *const *argv)
955{ 1356{
956 XClassHint classHint; 1357 XClassHint classHint;
957 XWMHints wmHint; 1358 XWMHints wmHint;
… …
963 Window top, parent; 1364 Window top, parent;
964 1365
965 dLocal (Display *, dpy); 1366 dLocal (Display *, dpy);
966 1367
967 /* grab colors before netscape does */ 1368 /* grab colors before netscape does */
968 Get_Colours (); 1369 get_colours ();
969 1370
970 if (!set_fonts ()) 1371 if (!set_fonts ())
971 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1372 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
972 1373
973 parent = display->root; 1374 parent = display->root;
… …
1003 } 1404 }
1004#endif 1405#endif
1005 1406
1006 window_calc (0, 0); 1407 window_calc (0, 0);
1007 1408
1008 /* sub-window placement & size in rxvt_resize_subwindows () */ 1409 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1009 attributes.background_pixel = pix_colors_focused [Color_border]; 1410 attributes.background_pixel = pix_colors_focused [Color_border];
1010 attributes.border_pixel = pix_colors_focused [Color_border]; 1411 attributes.border_pixel = pix_colors_focused [Color_border];
1011 attributes.colormap = cmap; 1412 attributes.colormap = cmap;
1012 1413
1013 top = XCreateWindow (dpy, parent, 1414 top = XCreateWindow (dpy, parent,
… …
1016 ext_bwidth, 1417 ext_bwidth,
1017 depth, InputOutput, visual, 1418 depth, InputOutput, visual,
1018 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1419 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1019 &attributes); 1420 &attributes);
1020 1421
1021 this->parent[0] = top; 1422 this->parent = top;
1022 1423
1023 old_width = szHint.width; 1424 set_title (rs [Rs_title]);
1024 old_height = szHint.height; 1425 set_icon_name (rs [Rs_iconName]);
1025
1026 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1027 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1028 1426
1029 classHint.res_name = (char *)rs[Rs_name]; 1427 classHint.res_name = (char *)rs[Rs_name];
1030 classHint.res_class = (char *)RESCLASS; 1428 classHint.res_class = (char *)RESCLASS;
1031 1429
1032 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1430 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1034 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1432 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1035 wmHint.window_group = top; 1433 wmHint.window_group = top;
1036 1434
1037 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1435 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1038 &szHint, &wmHint, &classHint); 1436 &szHint, &wmHint, &classHint);
1437#if ENABLE_EWMH
1438 /*
1439 * set up icon hint
1440 * rs [Rs_iconfile] is path to icon
1441 */
1442
1443 if (rs [Rs_iconfile])
1444 {
1445 set_icon (rs [Rs_iconfile]);
1446 }
1447#endif
1039 1448
1040#if ENABLE_FRILLS 1449#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1450 if (mwmhints.flags)
1042 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1451 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1452 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1048#if ENABLE_EWMH 1457#if ENABLE_EWMH
1049 xa[XA_NET_WM_PING], 1458 xa[XA_NET_WM_PING],
1050#endif 1459#endif
1051 }; 1460 };
1052 1461
1053 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1462 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1054 1463
1055#if ENABLE_FRILLS 1464#if ENABLE_FRILLS
1056 if (rs[Rs_transient_for]) 1465 if (rs[Rs_transient_for])
1057 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1466 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1058#endif 1467#endif
… …
1078 termwin_ev.start (display, top); 1487 termwin_ev.start (display, top);
1079 1488
1080 /* vt cursor: Black-on-White is standard, but this is more popular */ 1489 /* vt cursor: Black-on-White is standard, but this is more popular */
1081 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1490 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1082 1491
1083#ifdef HAVE_SCROLLBARS
1084 /* cursor scrollBar: Black-on-White */
1085 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1086#endif
1087
1088 /* the vt window */ 1492 /* the vt window */
1089 vt = XCreateSimpleWindow (dpy, top, 1493 vt = XCreateSimpleWindow (dpy, top,
1090 window_vt_x, window_vt_y, 1494 window_vt_x, window_vt_y,
1091 width, height, 1495 vt_width, vt_height,
1092 0, 1496 0,
1093 pix_colors_focused[Color_fg], 1497 pix_colors_focused[Color_fg],
1094 pix_colors_focused[Color_bg]); 1498 pix_colors_focused[Color_bg]);
1095 1499
1096 attributes.bit_gravity = NorthWestGravity; 1500 attributes.bit_gravity = NorthWestGravity;
… …
1116 GCForeground | GCBackground | GCGraphicsExposures, 1520 GCForeground | GCBackground | GCGraphicsExposures,
1117 &gcvalue); 1521 &gcvalue);
1118 1522
1119 drawable = new rxvt_drawable (this, vt); 1523 drawable = new rxvt_drawable (this, vt);
1120 1524
1121#ifdef RXVT_SCROLLBAR
1122 gcvalue.foreground = pix_colors[Color_topShadow];
1123 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1124 gcvalue.foreground = pix_colors[Color_bottomShadow];
1125 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1127 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128#endif
1129
1130#ifdef OFF_FOCUS_FADING 1525#ifdef OFF_FOCUS_FADING
1131 // initially we are in unfocused state 1526 // initially we are in unfocused state
1132 if (rs[Rs_fade]) 1527 if (rs[Rs_fade])
1133 pix_colors = pix_colors_unfocused; 1528 pix_colors = pix_colors_unfocused;
1134#endif 1529#endif
1135 1530
1136 pointer_unblank (); 1531 pointer_unblank ();
1137 scr_recolour (); 1532 scr_recolour ();
1138}
1139
1140/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */
1143void
1144rxvt_get_ttymode (ttymode_t *tio, int erase)
1145{
1146 /*
1147 * standard System V termios interface
1148 */
1149 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1150 {
1151 // return error - use system defaults,
1152 // where possible, and zero elsewhere
1153 memset (tio, 0, sizeof (ttymode_t));
1154
1155 tio->c_cc[VINTR] = CINTR;
1156 tio->c_cc[VQUIT] = CQUIT;
1157 tio->c_cc[VERASE] = CERASE;
1158#ifdef VERASE2
1159 tio->c_cc[VERASE2] = CERASE2;
1160#endif
1161 tio->c_cc[VKILL] = CKILL;
1162 tio->c_cc[VSTART] = CSTART;
1163 tio->c_cc[VSTOP] = CSTOP;
1164 tio->c_cc[VSUSP] = CSUSP;
1165# ifdef VDSUSP
1166 tio->c_cc[VDSUSP] = CDSUSP;
1167# endif
1168# ifdef VREPRINT
1169 tio->c_cc[VREPRINT] = CRPRNT;
1170# endif
1171# ifdef VDISCRD
1172 tio->c_cc[VDISCRD] = CFLUSH;
1173# endif
1174# ifdef VWERSE
1175 tio->c_cc[VWERSE] = CWERASE;
1176# endif
1177# ifdef VLNEXT
1178 tio->c_cc[VLNEXT] = CLNEXT;
1179# endif
1180 }
1181
1182 tio->c_cc[VEOF] = CEOF;
1183 tio->c_cc[VEOL] = VDISABLE;
1184# ifdef VEOL2
1185 tio->c_cc[VEOL2] = VDISABLE;
1186# endif
1187# ifdef VSWTC
1188 tio->c_cc[VSWTC] = VDISABLE;
1189# endif
1190# ifdef VSWTCH
1191 tio->c_cc[VSWTCH] = VDISABLE;
1192# endif
1193# if VMIN != VEOF
1194 tio->c_cc[VMIN] = 1;
1195# endif
1196# if VTIME != VEOL
1197 tio->c_cc[VTIME] = 0;
1198# endif
1199
1200 if (erase != -1)
1201 tio->c_cc[VERASE] = (char)erase;
1202
1203 /* input modes */
1204 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1205# ifdef IMAXBEL
1206 | IMAXBEL
1207# endif
1208 | IXON);
1209
1210 /* output modes */
1211 tio->c_oflag = (OPOST | ONLCR);
1212
1213 /* control modes */
1214 tio->c_cflag = (CS8 | CREAD);
1215
1216 /* line discipline modes */
1217 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1218# if defined (ECHOCTL) && defined (ECHOKE)
1219 | ECHOCTL | ECHOKE
1220# endif
1221 | ECHOE | ECHOK);
1222
1223 /*
1224 * Debugging
1225 */
1226#ifdef DEBUG_TTYMODE
1227 /* c_iflag bits */
1228 fprintf (stderr, "Input flags\n");
1229
1230 /* cpp token stringize doesn't work on all machines <sigh> */
1231# define FOO(flag,name) \
1232 if ((tio->c_iflag) & flag) \
1233 fprintf (stderr, "%s ", name)
1234
1235 /* c_iflag bits */
1236 FOO (IGNBRK, "IGNBRK");
1237 FOO (BRKINT, "BRKINT");
1238 FOO (IGNPAR, "IGNPAR");
1239 FOO (PARMRK, "PARMRK");
1240 FOO (INPCK, "INPCK");
1241 FOO (ISTRIP, "ISTRIP");
1242 FOO (INLCR, "INLCR");
1243 FOO (IGNCR, "IGNCR");
1244 FOO (ICRNL, "ICRNL");
1245 FOO (IXON, "IXON");
1246 FOO (IXOFF, "IXOFF");
1247# ifdef IUCLC
1248 FOO (IUCLC, "IUCLC");
1249# endif
1250# ifdef IXANY
1251 FOO (IXANY, "IXANY");
1252# endif
1253# ifdef IMAXBEL
1254 FOO (IMAXBEL, "IMAXBEL");
1255# endif
1256
1257 fprintf (stderr, "\n");
1258
1259# undef FOO
1260# define FOO(entry, name) \
1261 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1262
1263 FOO (VINTR, "VINTR");
1264 FOO (VQUIT, "VQUIT");
1265 FOO (VERASE, "VERASE");
1266 FOO (VKILL, "VKILL");
1267 FOO (VEOF, "VEOF");
1268 FOO (VEOL, "VEOL");
1269# ifdef VEOL2
1270 FOO (VEOL2, "VEOL2");
1271# endif
1272# ifdef VSWTC
1273 FOO (VSWTC, "VSWTC");
1274# endif
1275# ifdef VSWTCH
1276 FOO (VSWTCH, "VSWTCH");
1277# endif
1278 FOO (VSTART, "VSTART");
1279 FOO (VSTOP, "VSTOP");
1280 FOO (VSUSP, "VSUSP");
1281# ifdef VDSUSP
1282 FOO (VDSUSP, "VDSUSP");
1283# endif
1284# ifdef VREPRINT
1285 FOO (VREPRINT, "VREPRINT");
1286# endif
1287# ifdef VDISCRD
1288 FOO (VDISCRD, "VDISCRD");
1289# endif
1290# ifdef VWERSE
1291 FOO (VWERSE, "VWERSE");
1292# endif
1293# ifdef VLNEXT
1294 FOO (VLNEXT, "VLNEXT");
1295# endif
1296
1297 fprintf (stderr, "\n");
1298# undef FOO
1299#endif /* DEBUG_TTYMODE */
1300} 1533}
1301 1534
1302/*----------------------------------------------------------------------*/ 1535/*----------------------------------------------------------------------*/
1303/* 1536/*
1304 * Run the command in a subprocess and return a file descriptor for the 1537 * Run the command in a subprocess and return a file descriptor for the
… …
1316 if (pty->pty >= 0) 1549 if (pty->pty >= 0)
1317 { 1550 {
1318 if (getfd_hook) 1551 if (getfd_hook)
1319 pty->pty = (*getfd_hook) (pty->pty); 1552 pty->pty = (*getfd_hook) (pty->pty);
1320 1553
1321 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1554 if (pty->pty < 0)
1322 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1555 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1323 } 1556 }
1324 } 1557 }
1325 else 1558 else
1326#endif 1559#endif
1327 if (!pty->get ()) 1560 if (!pty->get ())
1328 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1561 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1329 1562
1330 int er; 1563 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1564
1565 struct termios tio = def_tio;
1331 1566
1332#ifndef NO_BACKSPACE_KEY 1567#ifndef NO_BACKSPACE_KEY
1333 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1568 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1334 er = rs[Rs_backspace_key][0]; 1569 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1335 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1570 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1336 er = '\177'; /* the initial state anyway */ 1571 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1337 else
1338#endif 1572#endif
1339 er = -1;
1340 1573
1341 rxvt_get_ttymode (&tio, er); 1574 /* init terminal attributes */
1342 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1575 cfsetospeed (&tio, BAUDRATE);
1576 cfsetispeed (&tio, BAUDRATE);
1577 tcsetattr (pty->tty, TCSANOW, &tio);
1343 pty->set_utf8_mode (enc_utf8); 1578 pty->set_utf8_mode (enc_utf8);
1344 1579
1345 /* set initial window size */ 1580 /* set initial window size */
1346 tt_winch (); 1581 tt_winch ();
1347 1582
… …
1383 1618
1384 _exit (EXIT_FAILURE); 1619 _exit (EXIT_FAILURE);
1385 1620
1386 default: 1621 default:
1387 if (!option (Opt_utmpInhibit)) 1622 if (!option (Opt_utmpInhibit))
1623 {
1624#ifdef LOG_ONLY_ON_LOGIN
1625 bool login_shell = option (Opt_loginShell);
1626#else
1627 bool login_shell = true;
1628#endif
1388 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1629 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1630 }
1389 1631
1390 pty->close_tty (); 1632 pty->close_tty ();
1391 1633
1392 child_ev.start (cmd_pid); 1634 child_ev.start (cmd_pid);
1393 1635
… …
1418#elif defined (SRIOCSREDIR) 1660#elif defined (SRIOCSREDIR)
1419 int fd; 1661 int fd;
1420 1662
1421 fd = open (CONSOLE, O_WRONLY, 0); 1663 fd = open (CONSOLE, O_WRONLY, 0);
1422 if (fd >= 0) 1664 if (fd >= 0)
1423 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1665 {
1666 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1424 close (fd); 1667 close (fd);
1668 }
1425#endif /* SRIOCSREDIR */ 1669#endif /* SRIOCSREDIR */
1426 } 1670 }
1427 1671
1428 /* reset signals and spin off the command interpreter */ 1672 /* reset signals and spin off the command interpreter */
1429 signal (SIGINT, SIG_DFL); 1673 signal (SIGINT, SIG_DFL);
1430 signal (SIGQUIT, SIG_DFL); 1674 signal (SIGQUIT, SIG_DFL);
1431 signal (SIGCHLD, SIG_DFL); 1675 signal (SIGCHLD, SIG_DFL);
1432 signal (SIGHUP, SIG_DFL); 1676 signal (SIGHUP, SIG_DFL);
1433 signal (SIGPIPE, SIG_DFL); 1677 signal (SIGPIPE, SIG_DFL);
1434 /* 1678 /*
1435 * mimick login's behavior by disabling the job control signals 1679 * mimic login's behavior by disabling the job control signals
1436 * a shell that wants them can turn them back on 1680 * a shell that wants them can turn them back on
1437 */ 1681 */
1438#ifdef SIGTSTP 1682#ifdef SIGTSTP
1439 signal (SIGTSTP, SIG_IGN); 1683 signal (SIGTSTP, SIG_IGN);
1440 signal (SIGTTIN, SIG_IGN); 1684 signal (SIGTTIN, SIG_IGN);
1441 signal (SIGTTOU, SIG_IGN); 1685 signal (SIGTTOU, SIG_IGN);
1442#endif /* SIGTSTP */ 1686#endif /* SIGTSTP */
1443 1687
1444 // unblock signals (signals are blocked by iom.C
1445 sigset_t ss;
1446 sigemptyset (&ss);
1447 sigprocmask (SIG_SETMASK, &ss, 0);
1448
1449 /* command interpreter path */ 1688 /* command interpreter path */
1450 if (argv) 1689 if (argv)
1451 { 1690 {
1452# ifdef DEBUG_CMD 1691# ifdef DEBUG_CMD
1453 int i; 1692 int i;
… …
1464 const char *argv0, *shell; 1703 const char *argv0, *shell;
1465 1704
1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1705 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1467 shell = "/bin/sh"; 1706 shell = "/bin/sh";
1468 1707
1469 argv0 = (const char *)rxvt_basename (shell); 1708 argv0 = rxvt_basename (shell);
1470 1709
1471 if (option (Opt_loginShell)) 1710 if (option (Opt_loginShell))
1472 { 1711 {
1473 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1712 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1474 1713

Diff Legend

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