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.245 by ayin, Sun Jan 27 16:52:13 2008 UTC vs.
Revision 1.331 by root, Tue Dec 10 19:47:14 2013 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-2008 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.
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# 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>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
… …
73#include <netinet/in.h> 76#include <netinet/in.h>
74#include <arpa/inet.h> 77#include <arpa/inet.h>
75#include <net/if.h> 78#include <net/if.h>
76#include <net/if_arp.h> 79#include <net/if_arp.h>
77 80
78static char * 81static char * ecb_cold
79rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
80{ 83{
81 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 85 struct ifconf ifc;
83 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
143 146
144 return rval; 147 return rval;
145} 148}
146#endif 149#endif
147 150
148const char *const def_colorName[] = 151static const char *const def_colorName[] =
149 { 152 {
150 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
152 /* low-intensity colors */ 155 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 181
182#if !USE_256_COLORS
179 // 88 xterm colours 183 // 88 xterm colours
180 "rgb:00/00/00", 184 "rgb:00/00/00",
181 "rgb:00/00/8b", 185 "rgb:00/00/8b",
182 "rgb:00/00/cd", 186 "rgb:00/00/cd",
183 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
251 "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
252 499
253#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 513#if ENABLE_FRILLS
267 NULL, // Color_underline 514 NULL, // Color_underline
268#endif 515#endif
269#ifdef OPTION_HC 516#ifdef OPTION_HC
270 NULL, 517 NULL,
518 NULL,
271#endif 519#endif
272#ifdef HAVE_SCROLLBARS
273 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
274#endif
275#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
276 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
277#endif 523#endif
278#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
279 NULL, 525 NULL,
280#endif 526#endif
281#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
282 "rgb:00/00/00", 528 "rgb:00/00/00",
283#endif 529#endif
… …
295 ncol = 80; 541 ncol = 80;
296 nrow = 24; 542 nrow = 24;
297 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
298 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
299 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
300 saveLines = SAVELINES; 547 saveLines = SAVELINES;
301 548
302 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
303 550
304 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
… …
309 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
310 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
311 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
312 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
313 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 563 set_option (Opt_buffered);
316}
317
318static void
319init_secondary ()
320{
321 int i;
322
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 dup2 (STDERR_FILENO, STDIN_FILENO);
326 }
327 else if (i != STDIN_FILENO)
328 {
329 dup2 (i, STDIN_FILENO);
330 close (i);
331 }
332
333 dup2 (STDERR_FILENO, STDOUT_FILENO);
334} 564}
335 565
336/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
337const char ** 567const char **
338rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
339{ 569{
340 int i, r_argc; 570 int i;
341 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
342
343 /*
344 * Look for -e option. Find => split and make cmd_argv[] of command args
345 */
346 for (r_argc = 0; r_argc < argc; r_argc++)
347 if (!strcmp (argv[r_argc], "-e"))
348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
363
364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
365
366 for (i = 0; i < r_argc; i++)
367 r_argv[i] = (const char *)argv[i];
368
369 r_argv[i] = NULL;
370 572
371 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
372 574
373 /* 575 /*
374 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
375 */ 577 */
376 578
377 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
378 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
379 581
380 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
381 583
382 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
385 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]);
386 }
387 586
388 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
389 xa = display->xa; 588 xa = display->xa;
390 589
391 set (display); 590 set (display);
392 extract_resources (); 591 extract_resources ();
393 592
394#if XFT 593#if ENABLE_FRILLS
395 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
396 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));
397#endif 598#endif
398
399#ifdef HAVE_AFTERIMAGE
400 set_application_name ((char*)rs[Rs_name]);
401 set_output_threshold (OUTPUT_LEVEL_WARNING);
402 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
403#endif
404 free (r_argv);
405 599
406 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
407 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
408 rs [i] = 0; 602 rs [i] = 0;
409 603
… …
417 { 611 {
418 rxvt_perl.init (this); 612 rxvt_perl.init (this);
419 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
420 } 614 }
421#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 ();
422 620
423 /* 621 /*
424 * set any defaults not already set 622 * set any defaults not already set
425 */ 623 */
426 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
427 { 625 {
428 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
429 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
430 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
431 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
432 } 631 }
433 else 632 else
434 { 633 {
435 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
436 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
437 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
438 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
439 } 639 }
440 640
441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
448 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)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 650
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 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]);
453#endif 656#endif
454 657
455#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
460#endif 663#endif
461 664
462 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
463 if (!saveLines) 666 if (!saveLines)
464 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
465
466#ifdef PRINTPIPE
467 if (!rs[Rs_print_pipe])
468 rs[Rs_print_pipe] = PRINTPIPE;
469#endif
470 668
471 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
472 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
473 671
474#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
… …
487# else 685# else
488 rs[Rs_delete_key] = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
489# endif 687# endif
490#endif 688#endif
491 689
492#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
494#endif
495 691
496#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
497 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
498 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
499 { 695 {
… …
537 return cmd_argv; 733 return cmd_argv;
538} 734}
539 735
540/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
541void 737void
542rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
543{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
544 this->envv = envv; 744 this->envv = envv;
545 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{
546 SET_R (this); 771 SET_R (this);
547 set_locale (""); 772 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
549 774
550 init_vars (); 775 init_vars ();
551
552 init_secondary ();
553 776
554 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
555 778
556#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
557 keyboard->register_done (); 780 keyboard->register_done ();
558#endif 781#endif
559 782
560#ifdef HAVE_SCROLLBARS 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
561 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
563#endif
564 795
565 pty = ptytty::create (); 796 pty = ptytty::create ();
566 797
567 create_windows (argc, argv); 798 create_windows (argc, argv);
568 799
569 init_xlocale (); 800 init_xlocale ();
570 801
571 scr_reset (); // initialize screen 802 scr_poweron (); // initialize screen
572 803
573#if 0 804#if 0
574 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
575#endif 806#endif
576 807
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
580#endif 810
581#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
582 { 812 bg_init ();
583 bgPixmap.set_target (this);
584 bgPixmap.invalidate ();
585
586#ifdef ENABLE_TRANSPARENCY
587 if (option (Opt_transparent))
588 {
589 bgPixmap.set_transparent ();
590
591#ifdef HAVE_AFTERIMAGE
592 if (rs [Rs_blurradius])
593 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
594#endif
595 if (ISSET_PIXCOLOR (Color_tint))
596 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
597
598 if (rs [Rs_shade])
599 bgPixmap.set_shade (rs [Rs_shade]);
600
601 bgPixmap.set_root_pixmap ();
602 XSelectInput (dpy, display->root, PropertyChangeMask);
603 rootwin_ev.start (display, display->root);
604 }
605#endif
606
607#ifdef BG_IMAGE_FROM_FILE
608 if (rs[Rs_backgroundPixmap])
609 {
610 const char *p = rs[Rs_backgroundPixmap];
611
612 if ((p = strchr (p, ';')) != 0)
613 {
614 p++;
615 bgPixmap.set_geometry (p);
616 }
617 else
618 bgPixmap.set_defaultGeometry ();
619
620 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
621 if (!bgPixmap.window_position_sensitive ())
622 update_background ();
623 }
624#endif
625 }
626#endif 813#endif
627 814
628#if ENABLE_PERL 815#if ENABLE_PERL
629 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
630#endif 817#endif
631 818
632 set_colorfgbg (); 819 init_done = 1;
633 820
634 init_command (cmd_argv); 821 init_command (cmd_argv);
635
636 free (cmd_argv);
637 822
638 if (pty->pty >= 0) 823 if (pty->pty >= 0)
639 pty_ev.start (pty->pty, ev::READ); 824 pty_ev.start (pty->pty, ev::READ);
640 825
641 HOOK_INVOKE ((this, HOOK_START, DT_END)); 826 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
643#if ENABLE_XEMBED 828#if ENABLE_XEMBED
644 if (rs[Rs_embed]) 829 if (rs[Rs_embed])
645 { 830 {
646 long info[2] = { 0, XEMBED_MAPPED }; 831 long info[2] = { 0, XEMBED_MAPPED };
647 832
648 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 833 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
649 32, PropModeReplace, (unsigned char *)&info, 2); 834 32, PropModeReplace, (unsigned char *)&info, 2);
650 } 835 }
651#endif 836#endif
652 837
838#if HAVE_STARTUP_NOTIFICATION
839 SnDisplay *snDisplay;
840 SnLauncheeContext *snContext;
841
842 snDisplay = sn_display_new (dpy, NULL, NULL);
843 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
844
845 /* Tell the window manager that this window is part of the startup context */
846 if (snContext)
847 sn_launchee_context_setup_window (snContext, parent);
848#endif
849
653 XMapWindow (dpy, vt); 850 XMapWindow (dpy, vt);
654 XMapWindow (dpy, parent[0]); 851 XMapWindow (dpy, parent);
852
853#if HAVE_STARTUP_NOTIFICATION
854 if (snContext)
855 {
856 /* Mark the startup process as complete */
857 sn_launchee_context_complete (snContext);
858
859 sn_launchee_context_unref (snContext);
860 }
861
862 sn_display_unref (snDisplay);
863#endif
655 864
656 refresh_check (); 865 refresh_check ();
657} 866}
658 867
659/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
660void 869void
661rxvt_term::init_env () 870rxvt_term::init_env ()
662{ 871{
663 int i;
664 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
665 877
666#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
667 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
668 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
669 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
682 val = XDisplayString (dpy); 894 val = XDisplayString (dpy);
683 895
684 if (rs[Rs_display_name] == NULL) 896 if (rs[Rs_display_name] == NULL)
685 rs[Rs_display_name] = val; /* use broken `:0' value */ 897 rs[Rs_display_name] = val; /* use broken `:0' value */
686 898
687 i = strlen (val);
688 env_display = (char *)rxvt_malloc (i + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
689 900
690 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
691 902
903 env_windowid = (char *)rxvt_malloc (21);
692 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
693 905
694 /* add entries to the environment: 906 /* add entries to the environment:
695 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
696 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
697 * @ COLORTERM: terminal sub-name and also indicates its color 909 * @ COLORTERM: terminal sub-name and also indicates its color
… …
700 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
701 */ 913 */
702 putenv (env_display); 914 putenv (env_display);
703 putenv (env_windowid); 915 putenv (env_windowid);
704 916
705 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
706 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
707 919
708#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
709 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
710#endif 922#endif
711 923
… …
730 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
731#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
732} 944}
733 945
734/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
735/*
736 * This is more or less stolen straight from XFree86 xterm.
737 * This should support all European type languages.
738 */
739void 947void
740rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
741{ 949{
742 set_environ (envv); 950 set_environ (envv);
743 951
744#if HAVE_XSETLOCALE || HAVE_SETLOCALE
745 free (this->locale); 952 free (this->locale);
746 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
747 954
748 if (!this->locale) 955 if (!this->locale)
749 { 956 {
… …
760 967
761 968
762 this->locale = strdup (this->locale); 969 this->locale = strdup (this->locale);
763 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
764 mbstate.reset (); 971 mbstate.reset ();
765#endif
766 972
767#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
768 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
769 // /^UTF.?8/i 975 // /^UTF.?8/i
770 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
771 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
772 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
773 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
774 free (codeset);
775#else 980#else
776 enc_utf8 = 0; 981 enc_utf8 = 0;
777#endif 982#endif
778} 983}
779 984
780void 985void
781rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
782{ 987{
783 set_environ (envv); 988 set_environ (envv);
784 989
785#ifdef USE_XIM 990#if USE_XIM
786 if (!locale) 991 if (!locale)
787 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
788 else 993 else
789 { 994 {
790 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
791 996
792 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
793 { 998 {
794 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
795 return; 1000 return;
796 } 1001 }
797 1002
798 im_ev.start (display); 1003 im_ev.start (display);
799 1004
… …
840 run_command (argv); 1045 run_command (argv);
841} 1046}
842 1047
843/*----------------------------------------------------------------------*/ 1048/*----------------------------------------------------------------------*/
844void 1049void
845rxvt_term::Get_Colours () 1050rxvt_term::get_colours ()
846{ 1051{
847 int i; 1052 int i;
848 1053
849#ifdef OFF_FOCUS_FADING 1054#ifdef OFF_FOCUS_FADING
850 pix_colors = pix_colors_focused; 1055 pix_colors = pix_colors_focused;
… …
948/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
949/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
950void 1155void
951rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
952{ 1157{
953 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
954 { 1159 {
955 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
956 1161
957 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
958 /* bright colors */ 1163 /* bright colors */
… …
1050 1255
1051 if (i) 1256 if (i)
1052 ModMetaMask = modmasks[i - 1]; 1257 ModMetaMask = modmasks[i - 1];
1053} 1258}
1054 1259
1260void
1261rxvt_term::set_icon (const char *file)
1262{
1263#if HAVE_PIXBUF
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf)
1266 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return;
1269 }
1270
1271 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1272 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1273
1274 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1275 {
1276 rxvt_warn ("Icon image too big, continuing without.\n");
1277 g_object_unref (pixbuf);
1278 return;
1279 }
1280
1281 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1282 {
1283 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1284 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1285 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1286
1287 buffer [0] = w;
1288 buffer [1] = h;
1289 for (int i = 0; i < h; i++)
1290 {
1291 for (int j = 0; j < w; j++)
1292 {
1293 unsigned char *pixel = row + j * channels;
1294 long value;
1295
1296 if (channels == 4)
1297 value = pixel[3];
1298 else
1299 value = (unsigned char)0x00ff;
1300
1301 value = (value << 8) + pixel[0];
1302 value = (value << 8) + pixel[1];
1303 value = (value << 8) + pixel[2];
1304 buffer[(i * w + j) + 2] = value;
1305 }
1306
1307 row += rowstride;
1308 }
1309
1310 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1311 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1312 free (buffer);
1313 }
1314 else
1315 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1316
1317 g_object_unref (pixbuf);
1318#endif
1319}
1320
1055/*----------------------------------------------------------------------*/ 1321/*----------------------------------------------------------------------*/
1056/* rxvt_Create_Windows () - Open and map the window */ 1322/* Open and map the window */
1057void 1323void
1058rxvt_term::create_windows (int argc, const char *const *argv) 1324rxvt_term::create_windows (int argc, const char *const *argv)
1059{ 1325{
1060 XClassHint classHint; 1326 XClassHint classHint;
1061 XWMHints wmHint; 1327 XWMHints wmHint;
… …
1067 Window top, parent; 1333 Window top, parent;
1068 1334
1069 dLocal (Display *, dpy); 1335 dLocal (Display *, dpy);
1070 1336
1071 /* grab colors before netscape does */ 1337 /* grab colors before netscape does */
1072 Get_Colours (); 1338 get_colours ();
1073 1339
1074 if (!set_fonts ()) 1340 if (!set_fonts ())
1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1341 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1076 1342
1077 parent = display->root; 1343 parent = display->root;
… …
1107 } 1373 }
1108#endif 1374#endif
1109 1375
1110 window_calc (0, 0); 1376 window_calc (0, 0);
1111 1377
1112 /* sub-window placement & size in rxvt_resize_subwindows () */ 1378 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1113 attributes.background_pixel = pix_colors_focused [Color_border]; 1379 attributes.background_pixel = pix_colors_focused [Color_border];
1114 attributes.border_pixel = pix_colors_focused [Color_border]; 1380 attributes.border_pixel = pix_colors_focused [Color_border];
1115 attributes.colormap = cmap; 1381 attributes.colormap = cmap;
1116 1382
1117 top = XCreateWindow (dpy, parent, 1383 top = XCreateWindow (dpy, parent,
… …
1120 ext_bwidth, 1386 ext_bwidth,
1121 depth, InputOutput, visual, 1387 depth, InputOutput, visual,
1122 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1123 &attributes); 1389 &attributes);
1124 1390
1125 this->parent[0] = top; 1391 this->parent = top;
1126 1392
1127 old_width = szHint.width; 1393 set_title (rs [Rs_title]);
1128 old_height = szHint.height; 1394 set_icon_name (rs [Rs_iconName]);
1129
1130 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1131 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1132 1395
1133 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1134 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
1135 1398
1136 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1138 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1139 wmHint.window_group = top; 1402 wmHint.window_group = top;
1140 1403
1141 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1142 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH
1407 /*
1408 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon
1410 */
1411
1412 if (rs [Rs_iconfile])
1413 set_icon (rs [Rs_iconfile]);
1414#endif
1143 1415
1144#if ENABLE_FRILLS 1416#if ENABLE_FRILLS
1145 if (mwmhints.flags) 1417 if (mwmhints.flags)
1146 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1418 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1147 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1419 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1152#if ENABLE_EWMH 1424#if ENABLE_EWMH
1153 xa[XA_NET_WM_PING], 1425 xa[XA_NET_WM_PING],
1154#endif 1426#endif
1155 }; 1427 };
1156 1428
1157 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1429 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1158 1430
1159#if ENABLE_FRILLS 1431#if ENABLE_FRILLS
1160 if (rs[Rs_transient_for]) 1432 if (rs[Rs_transient_for])
1161 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1433 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1162#endif 1434#endif
… …
1185 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1457 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1186 1458
1187 /* the vt window */ 1459 /* the vt window */
1188 vt = XCreateSimpleWindow (dpy, top, 1460 vt = XCreateSimpleWindow (dpy, top,
1189 window_vt_x, window_vt_y, 1461 window_vt_x, window_vt_y,
1190 width, height, 1462 vt_width, vt_height,
1191 0, 1463 0,
1192 pix_colors_focused[Color_fg], 1464 pix_colors_focused[Color_fg],
1193 pix_colors_focused[Color_bg]); 1465 pix_colors_focused[Color_bg]);
1194 1466
1195 attributes.bit_gravity = NorthWestGravity; 1467 attributes.bit_gravity = NorthWestGravity;
… …
1223 pix_colors = pix_colors_unfocused; 1495 pix_colors = pix_colors_unfocused;
1224#endif 1496#endif
1225 1497
1226 pointer_unblank (); 1498 pointer_unblank ();
1227 scr_recolour (); 1499 scr_recolour ();
1228}
1229
1230/* ------------------------------------------------------------------------- *
1231 * GET TTY CURRENT STATE *
1232 * ------------------------------------------------------------------------- */
1233void
1234rxvt_get_ttymode (struct termios *tio, int erase)
1235{
1236 /*
1237 * standard System V termios interface
1238 */
1239 if (tcgetattr (STDIN_FILENO, tio) < 0)
1240 {
1241 // return error - use system defaults,
1242 // where possible, and zero elsewhere
1243 memset (tio, 0, sizeof (struct termios));
1244
1245 tio->c_cc[VINTR] = CINTR;
1246 tio->c_cc[VQUIT] = CQUIT;
1247 tio->c_cc[VERASE] = CERASE;
1248#ifdef VERASE2
1249 tio->c_cc[VERASE2] = CERASE2;
1250#endif
1251 tio->c_cc[VKILL] = CKILL;
1252 tio->c_cc[VSTART] = CSTART;
1253 tio->c_cc[VSTOP] = CSTOP;
1254 tio->c_cc[VSUSP] = CSUSP;
1255# ifdef VDSUSP
1256 tio->c_cc[VDSUSP] = CDSUSP;
1257# endif
1258# ifdef VREPRINT
1259 tio->c_cc[VREPRINT] = CRPRNT;
1260# endif
1261# ifdef VDISCRD
1262 tio->c_cc[VDISCRD] = CFLUSH;
1263# endif
1264# ifdef VWERSE
1265 tio->c_cc[VWERSE] = CWERASE;
1266# endif
1267# ifdef VLNEXT
1268 tio->c_cc[VLNEXT] = CLNEXT;
1269# endif
1270 }
1271
1272 tio->c_cc[VEOF] = CEOF;
1273 tio->c_cc[VEOL] = VDISABLE;
1274# ifdef VEOL2
1275 tio->c_cc[VEOL2] = VDISABLE;
1276# endif
1277# ifdef VSWTC
1278 tio->c_cc[VSWTC] = VDISABLE;
1279# endif
1280# ifdef VSWTCH
1281 tio->c_cc[VSWTCH] = VDISABLE;
1282# endif
1283# if VMIN != VEOF
1284 tio->c_cc[VMIN] = 1;
1285# endif
1286# if VTIME != VEOL
1287 tio->c_cc[VTIME] = 0;
1288# endif
1289
1290 if (erase != -1)
1291 tio->c_cc[VERASE] = (char)erase;
1292
1293 /* input modes */
1294 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1295# ifdef IMAXBEL
1296 | IMAXBEL
1297# endif
1298 | IXON);
1299
1300 /* output modes */
1301 tio->c_oflag = (OPOST | ONLCR);
1302
1303 /* control modes */
1304 tio->c_cflag = (CS8 | CREAD);
1305
1306 /* line discipline modes */
1307 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1308# if defined (ECHOCTL) && defined (ECHOKE)
1309 | ECHOCTL | ECHOKE
1310# endif
1311 | ECHOE | ECHOK);
1312
1313 /*
1314 * Debugging
1315 */
1316#ifdef DEBUG_TTYMODE
1317 /* c_iflag bits */
1318 fprintf (stderr, "Input flags\n");
1319
1320 /* cpp token stringize doesn't work on all machines <sigh> */
1321# define FOO(flag,name) \
1322 if ((tio->c_iflag) & flag) \
1323 fprintf (stderr, "%s ", name)
1324
1325 /* c_iflag bits */
1326 FOO (IGNBRK, "IGNBRK");
1327 FOO (BRKINT, "BRKINT");
1328 FOO (IGNPAR, "IGNPAR");
1329 FOO (PARMRK, "PARMRK");
1330 FOO (INPCK, "INPCK");
1331 FOO (ISTRIP, "ISTRIP");
1332 FOO (INLCR, "INLCR");
1333 FOO (IGNCR, "IGNCR");
1334 FOO (ICRNL, "ICRNL");
1335 FOO (IXON, "IXON");
1336 FOO (IXOFF, "IXOFF");
1337# ifdef IUCLC
1338 FOO (IUCLC, "IUCLC");
1339# endif
1340# ifdef IXANY
1341 FOO (IXANY, "IXANY");
1342# endif
1343# ifdef IMAXBEL
1344 FOO (IMAXBEL, "IMAXBEL");
1345# endif
1346
1347 fprintf (stderr, "\n");
1348
1349# undef FOO
1350# define FOO(entry, name) \
1351 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1352
1353 FOO (VINTR, "VINTR");
1354 FOO (VQUIT, "VQUIT");
1355 FOO (VERASE, "VERASE");
1356 FOO (VKILL, "VKILL");
1357 FOO (VEOF, "VEOF");
1358 FOO (VEOL, "VEOL");
1359# ifdef VEOL2
1360 FOO (VEOL2, "VEOL2");
1361# endif
1362# ifdef VSWTC
1363 FOO (VSWTC, "VSWTC");
1364# endif
1365# ifdef VSWTCH
1366 FOO (VSWTCH, "VSWTCH");
1367# endif
1368 FOO (VSTART, "VSTART");
1369 FOO (VSTOP, "VSTOP");
1370 FOO (VSUSP, "VSUSP");
1371# ifdef VDSUSP
1372 FOO (VDSUSP, "VDSUSP");
1373# endif
1374# ifdef VREPRINT
1375 FOO (VREPRINT, "VREPRINT");
1376# endif
1377# ifdef VDISCRD
1378 FOO (VDISCRD, "VDISCRD");
1379# endif
1380# ifdef VWERSE
1381 FOO (VWERSE, "VWERSE");
1382# endif
1383# ifdef VLNEXT
1384 FOO (VLNEXT, "VLNEXT");
1385# endif
1386
1387 fprintf (stderr, "\n");
1388# undef FOO
1389#endif /* DEBUG_TTYMODE */
1390} 1500}
1391 1501
1392/*----------------------------------------------------------------------*/ 1502/*----------------------------------------------------------------------*/
1393/* 1503/*
1394 * Run the command in a subprocess and return a file descriptor for the 1504 * Run the command in a subprocess and return a file descriptor for the
… …
1406 if (pty->pty >= 0) 1516 if (pty->pty >= 0)
1407 { 1517 {
1408 if (getfd_hook) 1518 if (getfd_hook)
1409 pty->pty = (*getfd_hook) (pty->pty); 1519 pty->pty = (*getfd_hook) (pty->pty);
1410 1520
1411 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1521 if (pty->pty < 0)
1412 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1522 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1413 } 1523 }
1414 } 1524 }
1415 else 1525 else
1416#endif 1526#endif
1417 if (!pty->get ()) 1527 if (!pty->get ())
1418 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1528 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1419 1529
1420 int er; 1530 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1531
1532 struct termios tio = def_tio;
1421 1533
1422#ifndef NO_BACKSPACE_KEY 1534#ifndef NO_BACKSPACE_KEY
1423 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1535 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1424 er = rs[Rs_backspace_key][0]; 1536 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1425 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1537 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1426 er = '\177'; /* the initial state anyway */ 1538 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1427 else
1428#endif 1539#endif
1429 er = -1;
1430 1540
1431 rxvt_get_ttymode (&tio, er);
1432 /* init terminal attributes */ 1541 /* init terminal attributes */
1433 cfsetospeed (&tio, BAUDRATE); 1542 cfsetospeed (&tio, BAUDRATE);
1434 cfsetispeed (&tio, BAUDRATE); 1543 cfsetispeed (&tio, BAUDRATE);
1435 tcsetattr (pty->tty, TCSANOW, &tio); 1544 tcsetattr (pty->tty, TCSANOW, &tio);
1436 pty->set_utf8_mode (enc_utf8); 1545 pty->set_utf8_mode (enc_utf8);
… …
1476 1585
1477 _exit (EXIT_FAILURE); 1586 _exit (EXIT_FAILURE);
1478 1587
1479 default: 1588 default:
1480 if (!option (Opt_utmpInhibit)) 1589 if (!option (Opt_utmpInhibit))
1590 {
1591#ifdef LOG_ONLY_ON_LOGIN
1592 bool login_shell = option (Opt_loginShell);
1593#else
1594 bool login_shell = true;
1595#endif
1481 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1596 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1597 }
1482 1598
1483 pty->close_tty (); 1599 pty->close_tty ();
1484 1600
1485 child_ev.start (cmd_pid); 1601 child_ev.start (cmd_pid);
1486 1602
… …
1511#elif defined (SRIOCSREDIR) 1627#elif defined (SRIOCSREDIR)
1512 int fd; 1628 int fd;
1513 1629
1514 fd = open (CONSOLE, O_WRONLY, 0); 1630 fd = open (CONSOLE, O_WRONLY, 0);
1515 if (fd >= 0) 1631 if (fd >= 0)
1516 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1632 {
1633 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1517 close (fd); 1634 close (fd);
1635 }
1518#endif /* SRIOCSREDIR */ 1636#endif /* SRIOCSREDIR */
1519 } 1637 }
1520 1638
1521 /* reset signals and spin off the command interpreter */ 1639 /* reset signals and spin off the command interpreter */
1522 signal (SIGINT, SIG_DFL); 1640 signal (SIGINT, SIG_DFL);
1523 signal (SIGQUIT, SIG_DFL); 1641 signal (SIGQUIT, SIG_DFL);
1524 signal (SIGCHLD, SIG_DFL); 1642 signal (SIGCHLD, SIG_DFL);
1525 signal (SIGHUP, SIG_DFL); 1643 signal (SIGHUP, SIG_DFL);
1526 signal (SIGPIPE, SIG_DFL); 1644 signal (SIGPIPE, SIG_DFL);
1527 /* 1645 /*
1528 * mimick login's behavior by disabling the job control signals 1646 * mimic login's behavior by disabling the job control signals
1529 * a shell that wants them can turn them back on 1647 * a shell that wants them can turn them back on
1530 */ 1648 */
1531#ifdef SIGTSTP 1649#ifdef SIGTSTP
1532 signal (SIGTSTP, SIG_IGN); 1650 signal (SIGTSTP, SIG_IGN);
1533 signal (SIGTTIN, SIG_IGN); 1651 signal (SIGTTIN, SIG_IGN);
1534 signal (SIGTTOU, SIG_IGN); 1652 signal (SIGTTOU, SIG_IGN);
1535#endif /* SIGTSTP */ 1653#endif /* SIGTSTP */
1536 1654
1537 // unblock signals (signals are blocked by iom.C
1538 sigset_t ss;
1539 sigemptyset (&ss);
1540 sigprocmask (SIG_SETMASK, &ss, 0);
1541
1542 /* command interpreter path */ 1655 /* command interpreter path */
1543 if (argv) 1656 if (argv)
1544 { 1657 {
1545# ifdef DEBUG_CMD 1658# ifdef DEBUG_CMD
1546 int i; 1659 int i;
… …
1557 const char *argv0, *shell; 1670 const char *argv0, *shell;
1558 1671
1559 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1672 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1560 shell = "/bin/sh"; 1673 shell = "/bin/sh";
1561 1674
1562 argv0 = (const char *)rxvt_basename (shell); 1675 argv0 = rxvt_basename (shell);
1563 1676
1564 if (option (Opt_loginShell)) 1677 if (option (Opt_loginShell))
1565 { 1678 {
1566 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1679 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1567 1680

Diff Legend

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