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.229 by root, Fri Dec 14 02:22:24 2007 UTC vs.
Revision 1.326 by root, Sun Jun 3 10:42:34 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>
… …
72#include <netinet/in.h> 76#include <netinet/in.h>
73#include <arpa/inet.h> 77#include <arpa/inet.h>
74#include <net/if.h> 78#include <net/if.h>
75#include <net/if_arp.h> 79#include <net/if_arp.h>
76 80
77static char * 81static char * ecb_cold
78rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
79{ 83{
80 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
81 struct ifconf ifc; 85 struct ifconf ifc;
82 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
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
292 536
293 MEvent.time = CurrentTime; 537 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 538 MEvent.button = AnyButton;
295 want_refresh = 1; 539 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 540 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 541 ncol = 80;
298 nrow = 24; 542 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 547 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 548
305 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
306 550
307 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 552
310 set_option (Opt_scrollBar); 553 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 554 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 555 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
318 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
319} 563 set_option (Opt_buffered);
320
321void
322rxvt_term::init_secondary ()
323{
324 int i;
325
326 /*
327 * Close all unused file descriptors
328 * We don't want them, we don't need them.
329 */
330 if ((i = open ("/dev/null", O_RDONLY)) < 0)
331 {
332 /* TODO: BOO HISS */
333 dup2 (STDERR_FILENO, STDIN_FILENO);
334 }
335 else if (i != STDIN_FILENO)
336 {
337 dup2 (i, STDIN_FILENO);
338 close (i);
339 }
340
341 dup2 (STDERR_FILENO, STDOUT_FILENO);
342
343#if 0 // schmorp sayz closing filies is murder
344 for (i = STDERR_FILENO + 1; i < num_fds; i++)
345 {
346#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
347 if (i == 4 || i == 7)
348 continue;
349#endif
350 close (i);
351 }
352#endif
353} 564}
354 565
355/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
356const char ** 567const char **
357rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
358{ 569{
359 int i, r_argc; 570 int i;
360 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
361
362 /*
363 * Look for -e option. Find => split and make cmd_argv[] of command args
364 */
365 for (r_argc = 0; r_argc < argc; r_argc++)
366 if (!strcmp (argv[r_argc], "-e"))
367 break;
368
369 if (r_argc == argc)
370 cmd_argv = NULL;
371 else if (!argv[r_argc + 1])
372 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
373 else
374 {
375 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
376
377 for (i = 0; i < argc - r_argc - 1; i++)
378 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
379
380 cmd_argv[i] = NULL;
381 }
382
383 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
384
385 for (i = 0; i < r_argc; i++)
386 r_argv[i] = (const char *)argv[i];
387
388 r_argv[i] = NULL;
389 572
390 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
391 574
392 /* 575 /*
393 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
394 */ 577 */
395 578
396 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
397 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
398 581
399 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
400 583
401 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
402 {
403 free (r_argv);
404 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]);
405 }
406 586
407 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
408 xa = display->xa; 588 xa = display->xa;
409 589
410 set (display); 590 set (display);
… …
413#if XFT 593#if XFT
414 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
415 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
416#endif 596#endif
417 597
418#ifdef HAVE_AFTERIMAGE
419 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
420#endif
421 free (r_argv);
422
423 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
424 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
425 rs [i] = 0; 600 rs [i] = 0;
426 601
427#if ENABLE_PERL 602#if ENABLE_PERL
… …
434 { 609 {
435 rxvt_perl.init (this); 610 rxvt_perl.init (this);
436 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
437 } 612 }
438#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 ();
439 618
440 /* 619 /*
441 * set any defaults not already set 620 * set any defaults not already set
442 */ 621 */
443 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
444 { 623 {
445 if (!rs[Rs_title]) 624 if (!rs[Rs_title])
446 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 625 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
626
447 if (!rs[Rs_iconName]) 627 if (!rs[Rs_iconName])
448 rs[Rs_iconName] = rs[Rs_title]; 628 rs[Rs_iconName] = rs[Rs_title];
449 } 629 }
450 else 630 else
451 { 631 {
452 if (!rs[Rs_title]) 632 if (!rs[Rs_title])
453 rs[Rs_title] = rs[Rs_name]; 633 rs[Rs_title] = rs[Rs_name];
634
454 if (!rs[Rs_iconName]) 635 if (!rs[Rs_iconName])
455 rs[Rs_iconName] = rs[Rs_name]; 636 rs[Rs_iconName] = rs[Rs_name];
456 } 637 }
457 638
458 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 639 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
465 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)
466 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
467 648
468 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
469 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]);
470#endif 654#endif
471 655
472#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
473 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
474 pointerBlankDelay = i; 658 pointerBlankDelay = i;
… …
477#endif 661#endif
478 662
479 /* no point having a scrollbar without having any scrollback! */ 663 /* no point having a scrollbar without having any scrollback! */
480 if (!saveLines) 664 if (!saveLines)
481 set_option (Opt_scrollBar, 0); 665 set_option (Opt_scrollBar, 0);
482
483#ifdef PRINTPIPE
484 if (!rs[Rs_print_pipe])
485 rs[Rs_print_pipe] = PRINTPIPE;
486#endif
487 666
488 if (!rs[Rs_cutchars]) 667 if (!rs[Rs_cutchars])
489 rs[Rs_cutchars] = CUTCHARS; 668 rs[Rs_cutchars] = CUTCHARS;
490 669
491#ifndef NO_BACKSPACE_KEY 670#ifndef NO_BACKSPACE_KEY
… …
504# else 683# else
505 rs[Rs_delete_key] = "\033[3~"; 684 rs[Rs_delete_key] = "\033[3~";
506# endif 685# endif
507#endif 686#endif
508 687
509#ifdef HAVE_SCROLLBARS 688 scrollBar.setup (this);
510 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
511#endif
512 689
513#ifdef XTERM_REVERSE_VIDEO 690#ifdef XTERM_REVERSE_VIDEO
514 /* this is how xterm implements reverseVideo */ 691 /* this is how xterm implements reverseVideo */
515 if (option (Opt_reverseVideo)) 692 if (option (Opt_reverseVideo))
516 { 693 {
… …
554 return cmd_argv; 731 return cmd_argv;
555} 732}
556 733
557/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
558void 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 create_windows (argc, argv);
797
798 init_xlocale ();
799
800 scr_poweron (); // initialize screen
801
802#if 0
803 XSynchronize (dpy, True);
804#endif
805
806 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */
808#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init ();
811
812#ifdef ENABLE_TRANSPARENCY
813 if (option (Opt_transparent))
814 {
815 bg_set_transparent ();
816
817 if (rs [Rs_blurradius])
818 root_effects.set_blur (rs [Rs_blurradius]);
819
820 if (ISSET_PIXCOLOR (Color_tint))
821 root_effects.set_tint (pix_colors_focused [Color_tint]);
822
823 if (rs [Rs_shade])
824 root_effects.set_shade (rs [Rs_shade]);
825
826 bg_set_root_pixmap ();
827 XSelectInput (dpy, display->root, PropertyChangeMask);
828 rootwin_ev.start (display, display->root);
829 }
830#endif
831 }
832#endif
833
834#if ENABLE_PERL
835 rootwin_ev.start (display, display->root);
836#endif
837
838 init_done = 1;
839
840 init_command (cmd_argv);
841
842 if (pty->pty >= 0)
843 pty_ev.start (pty->pty, ev::READ);
844
845 HOOK_INVOKE ((this, HOOK_START, DT_END));
846
847#if ENABLE_XEMBED
848 if (rs[Rs_embed])
849 {
850 long info[2] = { 0, XEMBED_MAPPED };
851
852 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
853 32, PropModeReplace, (unsigned char *)&info, 2);
854 }
855#endif
856
857#if HAVE_STARTUP_NOTIFICATION
858 SnDisplay *snDisplay;
859 SnLauncheeContext *snContext;
860
861 snDisplay = sn_display_new (dpy, NULL, NULL);
862 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
863
864 /* Tell the window manager that this window is part of the startup context */
865 if (snContext)
866 sn_launchee_context_setup_window (snContext, parent);
867#endif
868
869 XMapWindow (dpy, vt);
870 XMapWindow (dpy, parent);
871
872#if HAVE_STARTUP_NOTIFICATION
873 if (snContext)
874 {
875 /* Mark the startup process as complete */
876 sn_launchee_context_complete (snContext);
877
878 sn_launchee_context_unref (snContext);
879 }
880
881 sn_display_unref (snDisplay);
882#endif
883
884 refresh_check ();
885}
886
887/*----------------------------------------------------------------------*/
888void
559rxvt_term::init_env () 889rxvt_term::init_env ()
560{ 890{
561 int i;
562 char *val; 891 char *val;
892 char *env_display;
893 char *env_windowid;
894 char *env_colorfgbg;
895 char *env_term;
563 896
564#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
565 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
566 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
567 * (for the first non-loopback interface) that we get from 900 * (for the first non-loopback interface) that we get from
… …
580 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
581 914
582 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
583 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
584 917
585 i = strlen (val);
586 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
587 919
588 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
589 921
922 env_windowid = (char *)rxvt_malloc (21);
590 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 923 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
591 924
592 /* add entries to the environment: 925 /* add entries to the environment:
593 * @ DISPLAY: in case we started with -display 926 * @ DISPLAY: in case we started with -display
594 * @ WINDOWID: X window id number of the window 927 * @ WINDOWID: X window id number of the window
595 * @ COLORTERM: terminal sub-name and also indicates its color 928 * @ COLORTERM: terminal sub-name and also indicates its color
… …
598 * @ COLORFGBG: fg;bg color codes 931 * @ COLORFGBG: fg;bg color codes
599 */ 932 */
600 putenv (env_display); 933 putenv (env_display);
601 putenv (env_windowid); 934 putenv (env_windowid);
602 935
603 if (env_colorfgbg) 936 env_colorfgbg = get_colorfgbg ();
604 putenv (env_colorfgbg); 937 putenv (env_colorfgbg);
605 938
606#ifdef RXVT_TERMINFO 939#ifdef RXVT_TERMINFO
607 putenv ("TERMINFO=" RXVT_TERMINFO); 940 putenv ("TERMINFO=" RXVT_TERMINFO);
608#endif 941#endif
609 942
… …
628 unsetenv ("TERMCAP"); /* terminfo should be okay */ 961 unsetenv ("TERMCAP"); /* terminfo should be okay */
629#endif /* HAVE_UNSETENV */ 962#endif /* HAVE_UNSETENV */
630} 963}
631 964
632/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
633/*
634 * This is more or less stolen straight from XFree86 xterm.
635 * This should support all European type languages.
636 */
637void 966void
638rxvt_term::set_locale (const char *locale) 967rxvt_term::set_locale (const char *locale)
639{ 968{
640 set_environ (envv); 969 set_environ (envv);
641 970
642#if HAVE_XSETLOCALE || HAVE_SETLOCALE
643 free (this->locale); 971 free (this->locale);
644 this->locale = setlocale (LC_CTYPE, locale); 972 this->locale = setlocale (LC_CTYPE, locale);
645 973
646 if (!this->locale) 974 if (!this->locale)
647 { 975 {
… …
658 986
659 987
660 this->locale = strdup (this->locale); 988 this->locale = strdup (this->locale);
661 SET_LOCALE (this->locale); 989 SET_LOCALE (this->locale);
662 mbstate.reset (); 990 mbstate.reset ();
663#endif
664 991
665#if HAVE_NL_LANGINFO 992#if HAVE_NL_LANGINFO
666 char *codeset = strdup (nl_langinfo (CODESET)); 993 char *codeset = nl_langinfo (CODESET);
667 // /^UTF.?8/i 994 // /^UTF.?8/i
668 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 995 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
669 && (codeset[1] == 'T' || codeset[1] == 't') 996 && (codeset[1] == 'T' || codeset[1] == 't')
670 && (codeset[2] == 'F' || codeset[2] == 'f') 997 && (codeset[2] == 'F' || codeset[2] == 'f')
671 && (codeset[3] == '8' || codeset[4] == '8'); 998 && (codeset[3] == '8' || codeset[4] == '8');
672 free (codeset);
673#else 999#else
674 enc_utf8 = 0; 1000 enc_utf8 = 0;
675#endif 1001#endif
676} 1002}
677 1003
… …
680{ 1006{
681 set_environ (envv); 1007 set_environ (envv);
682 1008
683#ifdef USE_XIM 1009#ifdef USE_XIM
684 if (!locale) 1010 if (!locale)
685 rxvt_warn ("setting locale failed, working without locale support.\n"); 1011 rxvt_warn ("setting locale failed, continuing without locale support.\n");
686 else 1012 else
687 { 1013 {
688 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
689 1015
690 if (!XSupportsLocale ()) 1016 if (!XSupportsLocale ())
691 { 1017 {
692 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1018 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
693 return; 1019 return;
694 } 1020 }
695 1021
696 im_ev.start (display); 1022 im_ev.start (display);
697 1023
… …
738 run_command (argv); 1064 run_command (argv);
739} 1065}
740 1066
741/*----------------------------------------------------------------------*/ 1067/*----------------------------------------------------------------------*/
742void 1068void
743rxvt_term::Get_Colours () 1069rxvt_term::get_colours ()
744{ 1070{
745 int i; 1071 int i;
746 1072
747#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
748 pix_colors = pix_colors_focused; 1074 pix_colors = pix_colors_focused;
… …
808 * get scrollBar shadow colors 1134 * get scrollBar shadow colors
809 * 1135 *
810 * The calculations of topShadow/bottomShadow values are adapted 1136 * The calculations of topShadow/bottomShadow values are adapted
811 * from the fvwm window manager. 1137 * from the fvwm window manager.
812 */ 1138 */
813#ifdef KEEP_SCROLLCOLOR 1139#ifdef RXVT_SCROLLBAR
814 if (depth <= 2) 1140 if (depth <= 2)
815 { 1141 {
816 /* Monochrome */ 1142 /* Monochrome */
817 alias_color (Color_scroll, Color_fg); 1143 alias_color (Color_scroll, Color_fg);
818 alias_color (Color_topShadow, Color_bg); 1144 alias_color (Color_topShadow, Color_bg);
… …
833 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1159 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
834 cscroll.a) 1160 cscroll.a)
835 )) 1161 ))
836 alias_color (Color_topShadow, Color_White); 1162 alias_color (Color_topShadow, Color_White);
837 } 1163 }
838#endif /* KEEP_SCROLLCOLOR */ 1164#endif
839 1165
840#ifdef OFF_FOCUS_FADING 1166#ifdef OFF_FOCUS_FADING
841 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1167 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
842 update_fade_color (i); 1168 update_fade_color (i);
843#endif 1169#endif
… …
846/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
847/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
848void 1174void
849rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
850{ 1176{
851 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
852 { 1178 {
853 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
854 1180
855 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
856 /* bright colors */ 1182 /* bright colors */
… …
948 1274
949 if (i) 1275 if (i)
950 ModMetaMask = modmasks[i - 1]; 1276 ModMetaMask = modmasks[i - 1];
951} 1277}
952 1278
1279void
1280rxvt_term::set_icon (const char *file)
1281{
1282#ifdef HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf)
1285 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return;
1288 }
1289
1290 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1291 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1292
1293 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1294 {
1295 rxvt_warn ("Icon image too big, continuing without.\n");
1296 g_object_unref (pixbuf);
1297 return;
1298 }
1299
1300 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1301 {
1302 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1303 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1304 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1305
1306 buffer [0] = w;
1307 buffer [1] = h;
1308 for (int i = 0; i < h; i++)
1309 {
1310 for (int j = 0; j < w; j++)
1311 {
1312 unsigned char *pixel = row + j * channels;
1313 long value;
1314
1315 if (channels == 4)
1316 value = pixel[3];
1317 else
1318 value = (unsigned char)0x00ff;
1319
1320 value = (value << 8) + pixel[0];
1321 value = (value << 8) + pixel[1];
1322 value = (value << 8) + pixel[2];
1323 buffer[(i * w + j) + 2] = value;
1324 }
1325
1326 row += rowstride;
1327 }
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 g_object_unref (pixbuf);
1337#endif
1338}
1339
953/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
954/* rxvt_Create_Windows () - Open and map the window */ 1341/* Open and map the window */
955void 1342void
956rxvt_term::create_windows (int argc, const char *const *argv) 1343rxvt_term::create_windows (int argc, const char *const *argv)
957{ 1344{
958 XClassHint classHint; 1345 XClassHint classHint;
959 XWMHints wmHint; 1346 XWMHints wmHint;
… …
965 Window top, parent; 1352 Window top, parent;
966 1353
967 dLocal (Display *, dpy); 1354 dLocal (Display *, dpy);
968 1355
969 /* grab colors before netscape does */ 1356 /* grab colors before netscape does */
970 Get_Colours (); 1357 get_colours ();
971 1358
972 if (!set_fonts ()) 1359 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974 1361
975 parent = display->root; 1362 parent = display->root;
… …
1005 } 1392 }
1006#endif 1393#endif
1007 1394
1008 window_calc (0, 0); 1395 window_calc (0, 0);
1009 1396
1010 /* sub-window placement & size in rxvt_resize_subwindows () */ 1397 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1011 attributes.background_pixel = pix_colors_focused [Color_border]; 1398 attributes.background_pixel = pix_colors_focused [Color_border];
1012 attributes.border_pixel = pix_colors_focused [Color_border]; 1399 attributes.border_pixel = pix_colors_focused [Color_border];
1013 attributes.colormap = cmap; 1400 attributes.colormap = cmap;
1014 1401
1015 top = XCreateWindow (dpy, parent, 1402 top = XCreateWindow (dpy, parent,
… …
1018 ext_bwidth, 1405 ext_bwidth,
1019 depth, InputOutput, visual, 1406 depth, InputOutput, visual,
1020 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1021 &attributes); 1408 &attributes);
1022 1409
1023 this->parent[0] = top; 1410 this->parent = top;
1024 1411
1025 old_width = szHint.width; 1412 set_title (rs [Rs_title]);
1026 old_height = szHint.height; 1413 set_icon_name (rs [Rs_iconName]);
1027
1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1029 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1030 1414
1031 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
1032 classHint.res_class = (char *)RESCLASS; 1416 classHint.res_class = (char *)RESCLASS;
1033 1417
1034 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1418 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1036 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1037 wmHint.window_group = top; 1421 wmHint.window_group = top;
1038 1422
1039 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1040 &szHint, &wmHint, &classHint); 1424 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH
1426 /*
1427 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon
1429 */
1430
1431 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif
1041 1436
1042#if ENABLE_FRILLS 1437#if ENABLE_FRILLS
1043 if (mwmhints.flags) 1438 if (mwmhints.flags)
1044 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1045 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1440 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1050#if ENABLE_EWMH 1445#if ENABLE_EWMH
1051 xa[XA_NET_WM_PING], 1446 xa[XA_NET_WM_PING],
1052#endif 1447#endif
1053 }; 1448 };
1054 1449
1055 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1450 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1056 1451
1057#if ENABLE_FRILLS 1452#if ENABLE_FRILLS
1058 if (rs[Rs_transient_for]) 1453 if (rs[Rs_transient_for])
1059 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1454 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1060#endif 1455#endif
… …
1080 termwin_ev.start (display, top); 1475 termwin_ev.start (display, top);
1081 1476
1082 /* vt cursor: Black-on-White is standard, but this is more popular */ 1477 /* vt cursor: Black-on-White is standard, but this is more popular */
1083 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1084 1479
1085#ifdef HAVE_SCROLLBARS
1086 /* cursor scrollBar: Black-on-White */
1087 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1088#endif
1089
1090 /* the vt window */ 1480 /* the vt window */
1091 vt = XCreateSimpleWindow (dpy, top, 1481 vt = XCreateSimpleWindow (dpy, top,
1092 window_vt_x, window_vt_y, 1482 window_vt_x, window_vt_y,
1093 width, height, 1483 vt_width, vt_height,
1094 0, 1484 0,
1095 pix_colors_focused[Color_fg], 1485 pix_colors_focused[Color_fg],
1096 pix_colors_focused[Color_bg]); 1486 pix_colors_focused[Color_bg]);
1097 1487
1098 attributes.bit_gravity = NorthWestGravity; 1488 attributes.bit_gravity = NorthWestGravity;
… …
1118 GCForeground | GCBackground | GCGraphicsExposures, 1508 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1509 &gcvalue);
1120 1510
1121 drawable = new rxvt_drawable (this, vt); 1511 drawable = new rxvt_drawable (this, vt);
1122 1512
1123#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif
1131
1132#ifdef OFF_FOCUS_FADING 1513#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1514 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1515 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1516 pix_colors = pix_colors_unfocused;
1136#endif 1517#endif
1137 1518
1138 pointer_unblank (); 1519 pointer_unblank ();
1139 scr_recolour (); 1520 scr_recolour ();
1140}
1141
1142/* ------------------------------------------------------------------------- *
1143 * GET TTY CURRENT STATE *
1144 * ------------------------------------------------------------------------- */
1145void
1146rxvt_get_ttymode (ttymode_t *tio, int erase)
1147{
1148 /*
1149 * standard System V termios interface
1150 */
1151 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1152 {
1153 // return error - use system defaults,
1154 // where possible, and zero elsewhere
1155 memset (tio, 0, sizeof (ttymode_t));
1156
1157 tio->c_cc[VINTR] = CINTR;
1158 tio->c_cc[VQUIT] = CQUIT;
1159 tio->c_cc[VERASE] = CERASE;
1160#ifdef VERASE2
1161 tio->c_cc[VERASE2] = CERASE2;
1162#endif
1163 tio->c_cc[VKILL] = CKILL;
1164 tio->c_cc[VSTART] = CSTART;
1165 tio->c_cc[VSTOP] = CSTOP;
1166 tio->c_cc[VSUSP] = CSUSP;
1167# ifdef VDSUSP
1168 tio->c_cc[VDSUSP] = CDSUSP;
1169# endif
1170# ifdef VREPRINT
1171 tio->c_cc[VREPRINT] = CRPRNT;
1172# endif
1173# ifdef VDISCRD
1174 tio->c_cc[VDISCRD] = CFLUSH;
1175# endif
1176# ifdef VWERSE
1177 tio->c_cc[VWERSE] = CWERASE;
1178# endif
1179# ifdef VLNEXT
1180 tio->c_cc[VLNEXT] = CLNEXT;
1181# endif
1182 }
1183
1184 tio->c_cc[VEOF] = CEOF;
1185 tio->c_cc[VEOL] = VDISABLE;
1186# ifdef VEOL2
1187 tio->c_cc[VEOL2] = VDISABLE;
1188# endif
1189# ifdef VSWTC
1190 tio->c_cc[VSWTC] = VDISABLE;
1191# endif
1192# ifdef VSWTCH
1193 tio->c_cc[VSWTCH] = VDISABLE;
1194# endif
1195# if VMIN != VEOF
1196 tio->c_cc[VMIN] = 1;
1197# endif
1198# if VTIME != VEOL
1199 tio->c_cc[VTIME] = 0;
1200# endif
1201
1202 if (erase != -1)
1203 tio->c_cc[VERASE] = (char)erase;
1204
1205 /* input modes */
1206 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1207# ifdef IMAXBEL
1208 | IMAXBEL
1209# endif
1210 | IXON);
1211
1212 /* output modes */
1213 tio->c_oflag = (OPOST | ONLCR);
1214
1215 /* control modes */
1216 tio->c_cflag = (CS8 | CREAD);
1217
1218 /* line discipline modes */
1219 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1220# if defined (ECHOCTL) && defined (ECHOKE)
1221 | ECHOCTL | ECHOKE
1222# endif
1223 | ECHOE | ECHOK);
1224
1225 /*
1226 * Debugging
1227 */
1228#ifdef DEBUG_TTYMODE
1229 /* c_iflag bits */
1230 fprintf (stderr, "Input flags\n");
1231
1232 /* cpp token stringize doesn't work on all machines <sigh> */
1233# define FOO(flag,name) \
1234 if ((tio->c_iflag) & flag) \
1235 fprintf (stderr, "%s ", name)
1236
1237 /* c_iflag bits */
1238 FOO (IGNBRK, "IGNBRK");
1239 FOO (BRKINT, "BRKINT");
1240 FOO (IGNPAR, "IGNPAR");
1241 FOO (PARMRK, "PARMRK");
1242 FOO (INPCK, "INPCK");
1243 FOO (ISTRIP, "ISTRIP");
1244 FOO (INLCR, "INLCR");
1245 FOO (IGNCR, "IGNCR");
1246 FOO (ICRNL, "ICRNL");
1247 FOO (IXON, "IXON");
1248 FOO (IXOFF, "IXOFF");
1249# ifdef IUCLC
1250 FOO (IUCLC, "IUCLC");
1251# endif
1252# ifdef IXANY
1253 FOO (IXANY, "IXANY");
1254# endif
1255# ifdef IMAXBEL
1256 FOO (IMAXBEL, "IMAXBEL");
1257# endif
1258
1259 fprintf (stderr, "\n");
1260
1261# undef FOO
1262# define FOO(entry, name) \
1263 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1264
1265 FOO (VINTR, "VINTR");
1266 FOO (VQUIT, "VQUIT");
1267 FOO (VERASE, "VERASE");
1268 FOO (VKILL, "VKILL");
1269 FOO (VEOF, "VEOF");
1270 FOO (VEOL, "VEOL");
1271# ifdef VEOL2
1272 FOO (VEOL2, "VEOL2");
1273# endif
1274# ifdef VSWTC
1275 FOO (VSWTC, "VSWTC");
1276# endif
1277# ifdef VSWTCH
1278 FOO (VSWTCH, "VSWTCH");
1279# endif
1280 FOO (VSTART, "VSTART");
1281 FOO (VSTOP, "VSTOP");
1282 FOO (VSUSP, "VSUSP");
1283# ifdef VDSUSP
1284 FOO (VDSUSP, "VDSUSP");
1285# endif
1286# ifdef VREPRINT
1287 FOO (VREPRINT, "VREPRINT");
1288# endif
1289# ifdef VDISCRD
1290 FOO (VDISCRD, "VDISCRD");
1291# endif
1292# ifdef VWERSE
1293 FOO (VWERSE, "VWERSE");
1294# endif
1295# ifdef VLNEXT
1296 FOO (VLNEXT, "VLNEXT");
1297# endif
1298
1299 fprintf (stderr, "\n");
1300# undef FOO
1301#endif /* DEBUG_TTYMODE */
1302} 1521}
1303 1522
1304/*----------------------------------------------------------------------*/ 1523/*----------------------------------------------------------------------*/
1305/* 1524/*
1306 * Run the command in a subprocess and return a file descriptor for the 1525 * Run the command in a subprocess and return a file descriptor for the
… …
1318 if (pty->pty >= 0) 1537 if (pty->pty >= 0)
1319 { 1538 {
1320 if (getfd_hook) 1539 if (getfd_hook)
1321 pty->pty = (*getfd_hook) (pty->pty); 1540 pty->pty = (*getfd_hook) (pty->pty);
1322 1541
1323 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1542 if (pty->pty < 0)
1324 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1543 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1325 } 1544 }
1326 } 1545 }
1327 else 1546 else
1328#endif 1547#endif
1329 if (!pty->get ()) 1548 if (!pty->get ())
1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1331 1550
1332 int er; 1551 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552
1553 struct termios tio = def_tio;
1333 1554
1334#ifndef NO_BACKSPACE_KEY 1555#ifndef NO_BACKSPACE_KEY
1335 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1336 er = rs[Rs_backspace_key][0]; 1557 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1337 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1558 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1338 er = '\177'; /* the initial state anyway */ 1559 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1339 else
1340#endif 1560#endif
1341 er = -1;
1342 1561
1343 rxvt_get_ttymode (&tio, er); 1562 /* init terminal attributes */
1344 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1563 cfsetospeed (&tio, BAUDRATE);
1564 cfsetispeed (&tio, BAUDRATE);
1565 tcsetattr (pty->tty, TCSANOW, &tio);
1345 pty->set_utf8_mode (enc_utf8); 1566 pty->set_utf8_mode (enc_utf8);
1346 1567
1347 /* set initial window size */ 1568 /* set initial window size */
1348 tt_winch (); 1569 tt_winch ();
1349 1570
… …
1385 1606
1386 _exit (EXIT_FAILURE); 1607 _exit (EXIT_FAILURE);
1387 1608
1388 default: 1609 default:
1389 if (!option (Opt_utmpInhibit)) 1610 if (!option (Opt_utmpInhibit))
1611 {
1612#ifdef LOG_ONLY_ON_LOGIN
1613 bool login_shell = option (Opt_loginShell);
1614#else
1615 bool login_shell = true;
1616#endif
1390 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1617 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1618 }
1391 1619
1392 pty->close_tty (); 1620 pty->close_tty ();
1393 1621
1394 child_ev.start (cmd_pid); 1622 child_ev.start (cmd_pid);
1395 1623
… …
1420#elif defined (SRIOCSREDIR) 1648#elif defined (SRIOCSREDIR)
1421 int fd; 1649 int fd;
1422 1650
1423 fd = open (CONSOLE, O_WRONLY, 0); 1651 fd = open (CONSOLE, O_WRONLY, 0);
1424 if (fd >= 0) 1652 if (fd >= 0)
1425 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1653 {
1654 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1426 close (fd); 1655 close (fd);
1656 }
1427#endif /* SRIOCSREDIR */ 1657#endif /* SRIOCSREDIR */
1428 } 1658 }
1429 1659
1430 /* reset signals and spin off the command interpreter */ 1660 /* reset signals and spin off the command interpreter */
1431 signal (SIGINT, SIG_DFL); 1661 signal (SIGINT, SIG_DFL);
1432 signal (SIGQUIT, SIG_DFL); 1662 signal (SIGQUIT, SIG_DFL);
1433 signal (SIGCHLD, SIG_DFL); 1663 signal (SIGCHLD, SIG_DFL);
1434 signal (SIGHUP, SIG_DFL); 1664 signal (SIGHUP, SIG_DFL);
1435 signal (SIGPIPE, SIG_DFL); 1665 signal (SIGPIPE, SIG_DFL);
1436 /* 1666 /*
1437 * mimick login's behavior by disabling the job control signals 1667 * mimic login's behavior by disabling the job control signals
1438 * a shell that wants them can turn them back on 1668 * a shell that wants them can turn them back on
1439 */ 1669 */
1440#ifdef SIGTSTP 1670#ifdef SIGTSTP
1441 signal (SIGTSTP, SIG_IGN); 1671 signal (SIGTSTP, SIG_IGN);
1442 signal (SIGTTIN, SIG_IGN); 1672 signal (SIGTTIN, SIG_IGN);
1443 signal (SIGTTOU, SIG_IGN); 1673 signal (SIGTTOU, SIG_IGN);
1444#endif /* SIGTSTP */ 1674#endif /* SIGTSTP */
1445 1675
1446 // unblock signals (signals are blocked by iom.C
1447 sigset_t ss;
1448 sigemptyset (&ss);
1449 sigprocmask (SIG_SETMASK, &ss, 0);
1450
1451 /* command interpreter path */ 1676 /* command interpreter path */
1452 if (argv) 1677 if (argv)
1453 { 1678 {
1454# ifdef DEBUG_CMD 1679# ifdef DEBUG_CMD
1455 int i; 1680 int i;
… …
1466 const char *argv0, *shell; 1691 const char *argv0, *shell;
1467 1692
1468 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1693 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1469 shell = "/bin/sh"; 1694 shell = "/bin/sh";
1470 1695
1471 argv0 = (const char *)rxvt_basename (shell); 1696 argv0 = rxvt_basename (shell);
1472 1697
1473 if (option (Opt_loginShell)) 1698 if (option (Opt_loginShell))
1474 { 1699 {
1475 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1700 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1476 1701

Diff Legend

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