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.314 by sf-exg, Mon Jan 9 15:30:17 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) 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 <schmorp@schmorp.de>
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
… …
54# endif 53# endif
55#endif 54#endif
56 55
57#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
58# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
59#endif 63#endif
60 64
61#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
62/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
63#include <sys/types.h> 67#include <sys/types.h>
… …
144 148
145 return rval; 149 return rval;
146} 150}
147#endif 151#endif
148 152
149const char *const def_colorName[] = 153static const char *const def_colorName[] =
150 { 154 {
151 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
152 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
153 /* low-intensity colors */ 157 /* low-intensity colors */
154 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
175 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
176 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
177 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
178 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
179 183
184#if !USE_256_COLORS
180 // 88 xterm colours 185 // 88 xterm colours
181 "rgb:00/00/00", 186 "rgb:00/00/00",
182 "rgb:00/00/8b", 187 "rgb:00/00/8b",
183 "rgb:00/00/cd", 188 "rgb:00/00/cd",
184 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
248 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
249 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
250 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
251 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
252 "rgb:e7/e7/e7", 257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
476 "rgb:08/08/08",
477 "rgb:12/12/12",
478 "rgb:1c/1c/1c",
479 "rgb:26/26/26",
480 "rgb:30/30/30",
481 "rgb:3a/3a/3a",
482 "rgb:44/44/44",
483 "rgb:4e/4e/4e",
484 "rgb:58/58/58",
485 "rgb:62/62/62",
486 "rgb:6c/6c/6c",
487 "rgb:76/76/76",
488 "rgb:80/80/80",
489 "rgb:8a/8a/8a",
490 "rgb:94/94/94",
491 "rgb:9e/9e/9e",
492 "rgb:a8/a8/a8",
493 "rgb:b2/b2/b2",
494 "rgb:bc/bc/bc",
495 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0",
497 "rgb:da/da/da",
498 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee",
500#endif
253 501
254#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
255 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
256 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
257#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
… …
267#if ENABLE_FRILLS 515#if ENABLE_FRILLS
268 NULL, // Color_underline 516 NULL, // Color_underline
269#endif 517#endif
270#ifdef OPTION_HC 518#ifdef OPTION_HC
271 NULL, 519 NULL,
520 NULL,
272#endif 521#endif
273#ifdef KEEP_SCROLLCOLOR
274 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
275 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
276#endif /* KEEP_SCROLLCOLOR */ 525#endif
277#if ENABLE_TRANSPARENCY 526#if ENABLE_TRANSPARENCY
278 NULL, 527 NULL,
279#endif 528#endif
280#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
281 "rgb:00/00/00", 530 "rgb:00/00/00",
282#endif 531#endif
283 }; 532 };
284 533
285bool 534void
286rxvt_term::init_vars () 535rxvt_term::init_vars ()
287{ 536{
288 pix_colors = // 537 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 538
295 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
296 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
297 want_refresh = 1; 541 want_refresh = 1;
298 priv_modes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
299 ncol = 80; 543 ncol = 80;
300 nrow = 24; 544 nrow = 24;
301 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
302 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
303 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
304 saveLines = SAVELINES; 549 saveLines = SAVELINES;
305 numpix_colors = TOTAL_COLORS;
306 550
307 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
308 552
309 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
310 last_bot = last_state = -1;
311 554
312 set_option (Opt_scrollBar); 555 set_option (Opt_scrollBar);
313 set_option (Opt_scrollTtyOutput); 556 set_option (Opt_scrollTtyOutput);
314 set_option (Opt_jumpScroll); 557 set_option (Opt_jumpScroll);
315 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
316 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
317 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
318 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
319 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
320 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
321 565 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} 566}
358 567
359/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
360const char ** 569const char **
361rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
362{ 571{
363 int i, r_argc; 572 int i;
364 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
365
366 /*
367 * Look for -e option. Find => split and make cmd_argv[] of command args
368 */
369 for (r_argc = 0; r_argc < argc; r_argc++)
370 if (!strcmp (argv[r_argc], "-e"))
371 break;
372
373 if (r_argc == argc)
374 cmd_argv = NULL;
375 else if (!argv[r_argc + 1])
376 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
377 else
378 {
379 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
380
381 for (i = 0; i < argc - r_argc - 1; i++)
382 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
383
384 cmd_argv[i] = NULL;
385 }
386
387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
388
389 for (i = 0; i < r_argc; i++)
390 r_argv[i] = (const char *)argv[i];
391
392 r_argv[i] = NULL;
393 574
394 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
395 576
396 /* 577 /*
397 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
398 */ 579 */
399 580
400 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
401 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
402 583
403 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
404 585
405 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
408 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
409 }
410 588
411 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
412 xa = display->xa; 590 xa = display->xa;
413 591
414 set (display); 592 set (display);
… …
417#if XFT 595#if XFT
418 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
419 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
420#endif 598#endif
421 599
422#ifdef HAVE_AFTERIMAGE
423 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
424#endif
425 free (r_argv);
426
427 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
428 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
429 rs [i] = 0; 602 rs [i] = 0;
430 603
431#if ENABLE_PERL 604#if ENABLE_PERL
… …
438 { 611 {
439 rxvt_perl.init (this); 612 rxvt_perl.init (this);
440 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
441 } 614 }
442#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
443 620
444 /* 621 /*
445 * set any defaults not already set 622 * set any defaults not already set
446 */ 623 */
447 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
448 { 625 {
449 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
450 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
451 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
452 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
453 } 631 }
454 else 632 else
455 { 633 {
456 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
457 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
458 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
459 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
460 } 639 }
461 640
462 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
469 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 648 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
470 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
471 650
472 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
473 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 652 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
653
654 if (rs[Rs_letterSpace])
655 letterSpace = atoi (rs[Rs_letterSpace]);
474#endif 656#endif
475 657
476#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
477 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
478 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
481#endif 663#endif
482 664
483 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
484 if (!saveLines) 666 if (!saveLines)
485 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
486
487#ifdef PRINTPIPE
488 if (!rs[Rs_print_pipe])
489 rs[Rs_print_pipe] = PRINTPIPE;
490#endif
491 668
492 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
493 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
494 671
495#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
… …
508# else 685# else
509 rs[Rs_delete_key] = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
510# endif 687# endif
511#endif 688#endif
512 689
513#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
514 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
515#endif
516 691
517#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
518 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
519 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
520 { 695 {
… …
558 return cmd_argv; 733 return cmd_argv;
559} 734}
560 735
561/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
562void 737void
738rxvt_term::init (stringvec *argv, stringvec *envv)
739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
744 this->envv = envv;
745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
771 SET_R (this);
772 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :(
774
775 init_vars ();
776
777 const char **cmd_argv = init_resources (argc, argv);
778
779#ifdef KEYSYM_RESOURCE
780 keyboard->register_done ();
781#endif
782
783 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty
785 {
786 if (*path != '/')
787 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
788
789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 }
792
793 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
807
808 create_windows (argc, argv);
809
810 init_xlocale ();
811
812 scr_poweron (); // initialize screen
813
814#if 0
815 XSynchronize (dpy, True);
816#endif
817
818 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */
820#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init ();
823
824#ifdef ENABLE_TRANSPARENCY
825 if (option (Opt_transparent))
826 {
827 bg_set_transparent ();
828
829 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]);
831
832 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]);
834
835 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]);
837
838 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root);
841 }
842#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 if (bg_set_file (rs[Rs_backgroundPixmap]))
847 if (!bg_window_position_sensitive ())
848 update_background ();
849#endif
850 }
851#endif
852
853#if ENABLE_PERL
854 rootwin_ev.start (display, display->root);
855#endif
856
857 set_colorfgbg ();
858
859 init_command (cmd_argv);
860
861 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ);
863
864 HOOK_INVOKE ((this, HOOK_START, DT_END));
865
866#if ENABLE_XEMBED
867 if (rs[Rs_embed])
868 {
869 long info[2] = { 0, XEMBED_MAPPED };
870
871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
872 32, PropModeReplace, (unsigned char *)&info, 2);
873 }
874#endif
875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
888 XMapWindow (dpy, vt);
889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
902
903 refresh_check ();
904}
905
906/*----------------------------------------------------------------------*/
907void
563rxvt_term::init_env () 908rxvt_term::init_env ()
564{ 909{
565 int i;
566 char *val; 910 char *val;
911 char *env_display;
912 char *env_term;
567 913
568#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
569 /* Fixup display_name for export over pty to any interested terminal 915 /* 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 916 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
571 * (for the first non-loopback interface) that we get from 917 * (for the first non-loopback interface) that we get from
… …
584 val = XDisplayString (dpy); 930 val = XDisplayString (dpy);
585 931
586 if (rs[Rs_display_name] == NULL) 932 if (rs[Rs_display_name] == NULL)
587 rs[Rs_display_name] = val; /* use broken `:0' value */ 933 rs[Rs_display_name] = val; /* use broken `:0' value */
588 934
589 i = strlen (val);
590 env_display = (char *)rxvt_malloc (i + 9); 935 env_display = (char *)rxvt_malloc (strlen (val) + 9);
591 936
592 sprintf (env_display, "DISPLAY=%s", val); 937 sprintf (env_display, "DISPLAY=%s", val);
593 938
594 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
595 940
596 /* add entries to the environment: 941 /* add entries to the environment:
597 * @ DISPLAY: in case we started with -display 942 * @ DISPLAY: in case we started with -display
598 * @ WINDOWID: X window id number of the window 943 * @ WINDOWID: X window id number of the window
599 * @ COLORTERM: terminal sub-name and also indicates its color 944 * @ COLORTERM: terminal sub-name and also indicates its color
… …
632 unsetenv ("TERMCAP"); /* terminfo should be okay */ 977 unsetenv ("TERMCAP"); /* terminfo should be okay */
633#endif /* HAVE_UNSETENV */ 978#endif /* HAVE_UNSETENV */
634} 979}
635 980
636/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
637/*
638 * This is more or less stolen straight from XFree86 xterm.
639 * This should support all European type languages.
640 */
641void 982void
642rxvt_term::set_locale (const char *locale) 983rxvt_term::set_locale (const char *locale)
643{ 984{
644 set_environ (envv); 985 set_environ (envv);
645 986
… …
665 SET_LOCALE (this->locale); 1006 SET_LOCALE (this->locale);
666 mbstate.reset (); 1007 mbstate.reset ();
667#endif 1008#endif
668 1009
669#if HAVE_NL_LANGINFO 1010#if HAVE_NL_LANGINFO
670 char *codeset = strdup (nl_langinfo (CODESET)); 1011 char *codeset = nl_langinfo (CODESET);
671 // /^UTF.?8/i 1012 // /^UTF.?8/i
672 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
673 && (codeset[1] == 'T' || codeset[1] == 't') 1014 && (codeset[1] == 'T' || codeset[1] == 't')
674 && (codeset[2] == 'F' || codeset[2] == 'f') 1015 && (codeset[2] == 'F' || codeset[2] == 'f')
675 && (codeset[3] == '8' || codeset[4] == '8'); 1016 && (codeset[3] == '8' || codeset[4] == '8');
676 free (codeset);
677#else 1017#else
678 enc_utf8 = 0; 1018 enc_utf8 = 0;
679#endif 1019#endif
680} 1020}
681 1021
… …
684{ 1024{
685 set_environ (envv); 1025 set_environ (envv);
686 1026
687#ifdef USE_XIM 1027#ifdef USE_XIM
688 if (!locale) 1028 if (!locale)
689 rxvt_warn ("setting locale failed, working without locale support.\n"); 1029 rxvt_warn ("setting locale failed, continuing without locale support.\n");
690 else 1030 else
691 { 1031 {
692 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
693 1033
694 if (!XSupportsLocale ()) 1034 if (!XSupportsLocale ())
695 { 1035 {
696 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1036 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
697 return; 1037 return;
698 } 1038 }
699 1039
700 im_ev.start (display); 1040 im_ev.start (display);
701 1041
… …
742 run_command (argv); 1082 run_command (argv);
743} 1083}
744 1084
745/*----------------------------------------------------------------------*/ 1085/*----------------------------------------------------------------------*/
746void 1086void
747rxvt_term::Get_Colours () 1087rxvt_term::get_colours ()
748{ 1088{
749 int i; 1089 int i;
750 1090
751#ifdef OFF_FOCUS_FADING 1091#ifdef OFF_FOCUS_FADING
752 pix_colors = pix_colors_focused; 1092 pix_colors = pix_colors_focused;
… …
812 * get scrollBar shadow colors 1152 * get scrollBar shadow colors
813 * 1153 *
814 * The calculations of topShadow/bottomShadow values are adapted 1154 * The calculations of topShadow/bottomShadow values are adapted
815 * from the fvwm window manager. 1155 * from the fvwm window manager.
816 */ 1156 */
817#ifdef KEEP_SCROLLCOLOR 1157#ifdef RXVT_SCROLLBAR
818 if (depth <= 2) 1158 if (depth <= 2)
819 { 1159 {
820 /* Monochrome */ 1160 /* Monochrome */
821 alias_color (Color_scroll, Color_fg); 1161 alias_color (Color_scroll, Color_fg);
822 alias_color (Color_topShadow, Color_bg); 1162 alias_color (Color_topShadow, Color_bg);
… …
837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1177 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
838 cscroll.a) 1178 cscroll.a)
839 )) 1179 ))
840 alias_color (Color_topShadow, Color_White); 1180 alias_color (Color_topShadow, Color_White);
841 } 1181 }
842#endif /* KEEP_SCROLLCOLOR */ 1182#endif
843 1183
844#ifdef OFF_FOCUS_FADING 1184#ifdef OFF_FOCUS_FADING
845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1185 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
846 update_fade_color (i); 1186 update_fade_color (i);
847#endif 1187#endif
… …
952 1292
953 if (i) 1293 if (i)
954 ModMetaMask = modmasks[i - 1]; 1294 ModMetaMask = modmasks[i - 1];
955} 1295}
956 1296
1297void
1298rxvt_term::set_icon (const char *file)
1299{
1300#ifdef HAVE_AFTERIMAGE
1301 init_asv ();
1302
1303 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1304 if (!im)
1305 {
1306 rxvt_warn ("Loading image icon failed, continuing without.\n");
1307 return;
1308 }
1309
1310 unsigned int w = im->width;
1311 unsigned int h = im->height;
1312
1313 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1314 {
1315 rxvt_warn ("Icon image too big, continuing without.\n");
1316 destroy_asimage (&im);
1317 return;
1318 }
1319
1320 ASImage *result = scale_asimage (asv, im,
1321 w, h, ASA_ARGB32,
1322 100, ASIMAGE_QUALITY_DEFAULT);
1323 destroy_asimage (&im);
1324
1325 if (!result)
1326 {
1327 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1328 return;
1329 }
1330
1331 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1332 if (buffer)
1333 {
1334 ARGB32 *asbuf = result->alt.argb32;
1335 buffer [0] = w;
1336 buffer [1] = h;
1337
1338 for (unsigned int i = 0; i < w * h; ++i)
1339 buffer [i + 2] = asbuf [i];
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 destroy_asimage (&result);
1349#endif
1350
1351#ifdef HAVE_PIXBUF
1352 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf)
1354 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n");
1356 return;
1357 }
1358
1359 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1360 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1361
1362 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1363 {
1364 rxvt_warn ("Icon image too big, continuing without.\n");
1365 g_object_unref (pixbuf);
1366 return;
1367 }
1368
1369 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1370 {
1371 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1372 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1373 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1374
1375 buffer [0] = w;
1376 buffer [1] = h;
1377 for (int i = 0; i < h; i++)
1378 {
1379 for (int j = 0; j < w; j++)
1380 {
1381 unsigned char *pixel = row + j * channels;
1382 long value;
1383
1384 if (channels == 4)
1385 value = pixel[3];
1386 else
1387 value = (unsigned char)0x00ff;
1388
1389 value = (value << 8) + pixel[0];
1390 value = (value << 8) + pixel[1];
1391 value = (value << 8) + pixel[2];
1392 buffer[(i * w + j) + 2] = value;
1393 }
1394
1395 row += rowstride;
1396 }
1397
1398 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1399 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1400 free (buffer);
1401 }
1402 else
1403 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1404
1405 g_object_unref (pixbuf);
1406#endif
1407}
1408
957/*----------------------------------------------------------------------*/ 1409/*----------------------------------------------------------------------*/
958/* rxvt_Create_Windows () - Open and map the window */ 1410/* Open and map the window */
959void 1411void
960rxvt_term::create_windows (int argc, const char *const *argv) 1412rxvt_term::create_windows (int argc, const char *const *argv)
961{ 1413{
962 XClassHint classHint; 1414 XClassHint classHint;
963 XWMHints wmHint; 1415 XWMHints wmHint;
… …
969 Window top, parent; 1421 Window top, parent;
970 1422
971 dLocal (Display *, dpy); 1423 dLocal (Display *, dpy);
972 1424
973 /* grab colors before netscape does */ 1425 /* grab colors before netscape does */
974 Get_Colours (); 1426 get_colours ();
975 1427
976 if (!set_fonts ()) 1428 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1429 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978 1430
979 parent = display->root; 1431 parent = display->root;
… …
1009 } 1461 }
1010#endif 1462#endif
1011 1463
1012 window_calc (0, 0); 1464 window_calc (0, 0);
1013 1465
1014 /* sub-window placement & size in rxvt_resize_subwindows () */ 1466 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1015 attributes.background_pixel = pix_colors_focused [Color_border]; 1467 attributes.background_pixel = pix_colors_focused [Color_border];
1016 attributes.border_pixel = pix_colors_focused [Color_border]; 1468 attributes.border_pixel = pix_colors_focused [Color_border];
1017 attributes.colormap = cmap; 1469 attributes.colormap = cmap;
1018 1470
1019 top = XCreateWindow (dpy, parent, 1471 top = XCreateWindow (dpy, parent,
… …
1022 ext_bwidth, 1474 ext_bwidth,
1023 depth, InputOutput, visual, 1475 depth, InputOutput, visual,
1024 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1476 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1025 &attributes); 1477 &attributes);
1026 1478
1027 this->parent[0] = top; 1479 this->parent = top;
1028 1480
1029 old_width = szHint.width; 1481 set_title (rs [Rs_title]);
1030 old_height = szHint.height; 1482 set_icon_name (rs [Rs_iconName]);
1031
1032 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1033 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1034 1483
1035 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
1036 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
1037 1486
1038 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1487 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1040 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1041 wmHint.window_group = top; 1490 wmHint.window_group = top;
1042 1491
1043 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1044 &szHint, &wmHint, &classHint); 1493 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH
1495 /*
1496 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon
1498 */
1499
1500 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif
1045 1505
1046#if ENABLE_FRILLS 1506#if ENABLE_FRILLS
1047 if (mwmhints.flags) 1507 if (mwmhints.flags)
1048 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1509 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1054#if ENABLE_EWMH 1514#if ENABLE_EWMH
1055 xa[XA_NET_WM_PING], 1515 xa[XA_NET_WM_PING],
1056#endif 1516#endif
1057 }; 1517 };
1058 1518
1059 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1519 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1060 1520
1061#if ENABLE_FRILLS 1521#if ENABLE_FRILLS
1062 if (rs[Rs_transient_for]) 1522 if (rs[Rs_transient_for])
1063 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1523 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1064#endif 1524#endif
… …
1083 1543
1084 termwin_ev.start (display, top); 1544 termwin_ev.start (display, top);
1085 1545
1086 /* vt cursor: Black-on-White is standard, but this is more popular */ 1546 /* vt cursor: Black-on-White is standard, but this is more popular */
1087 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1547 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 1548
1094 /* the vt window */ 1549 /* the vt window */
1095 vt = XCreateSimpleWindow (dpy, top, 1550 vt = XCreateSimpleWindow (dpy, top,
1096 window_vt_x, window_vt_y, 1551 window_vt_x, window_vt_y,
1097 width, height, 1552 width, height,
… …
1122 GCForeground | GCBackground | GCGraphicsExposures, 1577 GCForeground | GCBackground | GCGraphicsExposures,
1123 &gcvalue); 1578 &gcvalue);
1124 1579
1125 drawable = new rxvt_drawable (this, vt); 1580 drawable = new rxvt_drawable (this, vt);
1126 1581
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 1582#ifdef OFF_FOCUS_FADING
1137 // initially we are in unfocused state 1583 // initially we are in unfocused state
1138 if (rs[Rs_fade]) 1584 if (rs[Rs_fade])
1139 pix_colors = pix_colors_unfocused; 1585 pix_colors = pix_colors_unfocused;
1140#endif 1586#endif
1141 1587
1142 pointer_unblank (); 1588 pointer_unblank ();
1143 scr_recolour (); 1589 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} 1590}
1307 1591
1308/*----------------------------------------------------------------------*/ 1592/*----------------------------------------------------------------------*/
1309/* 1593/*
1310 * Run the command in a subprocess and return a file descriptor for the 1594 * Run the command in a subprocess and return a file descriptor for the
… …
1322 if (pty->pty >= 0) 1606 if (pty->pty >= 0)
1323 { 1607 {
1324 if (getfd_hook) 1608 if (getfd_hook)
1325 pty->pty = (*getfd_hook) (pty->pty); 1609 pty->pty = (*getfd_hook) (pty->pty);
1326 1610
1327 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1611 if (pty->pty < 0)
1328 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1329 } 1613 }
1330 } 1614 }
1331 else 1615 else
1332#endif 1616#endif
1333 if (!pty->get ()) 1617 if (!pty->get ())
1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1335 1619
1336 int er; 1620 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1621
1622 struct termios tio = def_tio;
1337 1623
1338#ifndef NO_BACKSPACE_KEY 1624#ifndef NO_BACKSPACE_KEY
1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1340 er = rs[Rs_backspace_key][0]; 1626 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1627 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1342 er = '\177'; /* the initial state anyway */ 1628 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1343 else
1344#endif 1629#endif
1345 er = -1;
1346 1630
1347 rxvt_get_ttymode (&tio, er); 1631 /* init terminal attributes */
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1632 cfsetospeed (&tio, BAUDRATE);
1633 cfsetispeed (&tio, BAUDRATE);
1634 tcsetattr (pty->tty, TCSANOW, &tio);
1349 pty->set_utf8_mode (enc_utf8); 1635 pty->set_utf8_mode (enc_utf8);
1350 1636
1351 /* set initial window size */ 1637 /* set initial window size */
1352 tt_winch (); 1638 tt_winch ();
1353 1639
… …
1389 1675
1390 _exit (EXIT_FAILURE); 1676 _exit (EXIT_FAILURE);
1391 1677
1392 default: 1678 default:
1393 if (!option (Opt_utmpInhibit)) 1679 if (!option (Opt_utmpInhibit))
1680 {
1681#ifdef LOG_ONLY_ON_LOGIN
1682 bool login_shell = option (Opt_loginShell);
1683#else
1684 bool login_shell = true;
1685#endif
1394 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1686 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1687 }
1395 1688
1396 pty->close_tty (); 1689 pty->close_tty ();
1397 1690
1398 child_ev.start (cmd_pid); 1691 child_ev.start (cmd_pid);
1399 1692
… …
1424#elif defined (SRIOCSREDIR) 1717#elif defined (SRIOCSREDIR)
1425 int fd; 1718 int fd;
1426 1719
1427 fd = open (CONSOLE, O_WRONLY, 0); 1720 fd = open (CONSOLE, O_WRONLY, 0);
1428 if (fd >= 0) 1721 if (fd >= 0)
1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1722 {
1723 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1430 close (fd); 1724 close (fd);
1725 }
1431#endif /* SRIOCSREDIR */ 1726#endif /* SRIOCSREDIR */
1432 } 1727 }
1433 1728
1434 /* reset signals and spin off the command interpreter */ 1729 /* reset signals and spin off the command interpreter */
1435 signal (SIGINT, SIG_DFL); 1730 signal (SIGINT, SIG_DFL);
1436 signal (SIGQUIT, SIG_DFL); 1731 signal (SIGQUIT, SIG_DFL);
1437 signal (SIGCHLD, SIG_DFL); 1732 signal (SIGCHLD, SIG_DFL);
1438 signal (SIGHUP, SIG_DFL); 1733 signal (SIGHUP, SIG_DFL);
1439 signal (SIGPIPE, SIG_DFL); 1734 signal (SIGPIPE, SIG_DFL);
1440 /* 1735 /*
1441 * mimick login's behavior by disabling the job control signals 1736 * mimic login's behavior by disabling the job control signals
1442 * a shell that wants them can turn them back on 1737 * a shell that wants them can turn them back on
1443 */ 1738 */
1444#ifdef SIGTSTP 1739#ifdef SIGTSTP
1445 signal (SIGTSTP, SIG_IGN); 1740 signal (SIGTSTP, SIG_IGN);
1446 signal (SIGTTIN, SIG_IGN); 1741 signal (SIGTTIN, SIG_IGN);
1447 signal (SIGTTOU, SIG_IGN); 1742 signal (SIGTTOU, SIG_IGN);
1448#endif /* SIGTSTP */ 1743#endif /* SIGTSTP */
1449 1744
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 */ 1745 /* command interpreter path */
1456 if (argv) 1746 if (argv)
1457 { 1747 {
1458# ifdef DEBUG_CMD 1748# ifdef DEBUG_CMD
1459 int i; 1749 int i;
… …
1470 const char *argv0, *shell; 1760 const char *argv0, *shell;
1471 1761
1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1762 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1473 shell = "/bin/sh"; 1763 shell = "/bin/sh";
1474 1764
1475 argv0 = (const char *)rxvt_basename (shell); 1765 argv0 = rxvt_basename (shell);
1476 1766
1477 if (option (Opt_loginShell)) 1767 if (option (Opt_loginShell))
1478 { 1768 {
1479 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1769 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1480 1770

Diff Legend

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