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

Diff Legend

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