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.254 by root, Tue Nov 4 11:03:29 2008 UTC vs.
Revision 1.314 by sf-exg, Mon Jan 9 15:30:17 2012 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 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.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 183
184#if !USE_256_COLORS
179 // 88 xterm colours 185 // 88 xterm colours
180 "rgb:00/00/00", 186 "rgb:00/00/00",
181 "rgb:00/00/8b", 187 "rgb:00/00/8b",
182 "rgb:00/00/cd", 188 "rgb:00/00/cd",
183 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
476 "rgb:08/08/08",
477 "rgb:12/12/12",
478 "rgb:1c/1c/1c",
479 "rgb:26/26/26",
480 "rgb:30/30/30",
481 "rgb:3a/3a/3a",
482 "rgb:44/44/44",
483 "rgb:4e/4e/4e",
484 "rgb:58/58/58",
485 "rgb:62/62/62",
486 "rgb:6c/6c/6c",
487 "rgb:76/76/76",
488 "rgb:80/80/80",
489 "rgb:8a/8a/8a",
490 "rgb:94/94/94",
491 "rgb:9e/9e/9e",
492 "rgb:a8/a8/a8",
493 "rgb:b2/b2/b2",
494 "rgb:bc/bc/bc",
495 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0",
497 "rgb:da/da/da",
498 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee",
500#endif
252 501
253#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 515#if ENABLE_FRILLS
267 NULL, // Color_underline 516 NULL, // Color_underline
268#endif 517#endif
269#ifdef OPTION_HC 518#ifdef OPTION_HC
270 NULL, 519 NULL,
520 NULL,
271#endif 521#endif
272 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 523#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
275#endif 525#endif
… …
293 ncol = 80; 543 ncol = 80;
294 nrow = 24; 544 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 549 saveLines = SAVELINES;
299 550
300 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
301 552
302 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 565 set_option (Opt_buffered);
314}
315
316static void
317init_secondary ()
318{
319 int i;
320
321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
322 {
323 dup2 (STDERR_FILENO, STDIN_FILENO);
324 }
325 else if (i != STDIN_FILENO)
326 {
327 dup2 (i, STDIN_FILENO);
328 close (i);
329 }
330
331 dup2 (STDERR_FILENO, STDOUT_FILENO);
332} 566}
333 567
334/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
335const char ** 569const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
337{ 571{
338 int i, r_argc; 572 int i;
339 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
340
341 /*
342 * Look for -e option. Find => split and make cmd_argv[] of command args
343 */
344 for (r_argc = 0; r_argc < argc; r_argc++)
345 if (!strcmp (argv[r_argc], "-e"))
346 break;
347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
363
364 for (i = 0; i < r_argc; i++)
365 r_argv[i] = (const char *)argv[i];
366
367 r_argv[i] = NULL;
368 574
369 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
370 576
371 /* 577 /*
372 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
373 */ 579 */
374 580
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
377 583
378 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
379 585
380 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 588
386 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
387 xa = display->xa; 590 xa = display->xa;
388 591
389 set (display); 592 set (display);
… …
392#if XFT 595#if XFT
393 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 598#endif
396 599
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
402 free (r_argv);
403
404 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
406 rs [i] = 0; 602 rs [i] = 0;
407 603
408#if ENABLE_PERL 604#if ENABLE_PERL
… …
415 { 611 {
416 rxvt_perl.init (this); 612 rxvt_perl.init (this);
417 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
418 } 614 }
419#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 ();
420 620
421 /* 621 /*
422 * set any defaults not already set 622 * set any defaults not already set
423 */ 623 */
424 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
425 { 625 {
426 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
428 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
430 } 631 }
431 else 632 else
432 { 633 {
433 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
435 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
437 } 639 }
438 640
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 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)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 650
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 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]);
451#endif 656#endif
452 657
453#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
528 return cmd_argv; 733 return cmd_argv;
529} 734}
530 735
531/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
532void 737void
533rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
534{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
535 this->envv = envv; 744 this->envv = envv;
536 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{
537 SET_R (this); 771 SET_R (this);
538 set_locale (""); 772 set_locale ("");
539 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
540 774
541 init_vars (); 775 init_vars ();
542
543 init_secondary ();
544 776
545 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
546 778
547#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
548 keyboard->register_done (); 780 keyboard->register_done ();
… …
557 if (chdir (path)) 789 if (chdir (path))
558 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
559 } 791 }
560 792
561 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
562 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
563 795
564 pty = ptytty::create (); 796 pty = ptytty::create ();
565 797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
807
566 create_windows (argc, argv); 808 create_windows (argc, argv);
567 809
568 init_xlocale (); 810 init_xlocale ();
569 811
570 scr_reset (); // initialize screen 812 scr_poweron (); // initialize screen
571 813
572#if 0 814#if 0
573 XSynchronize (dpy, True); 815 XSynchronize (dpy, True);
574#endif 816#endif
575 817
576 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
577 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
578#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
579 { 821 {
580 bgPixmap.set_target (this); 822 bg_init ();
581 bgPixmap.invalidate ();
582 823
583#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
585 { 826 {
586 bgPixmap.set_transparent (); 827 bg_set_transparent ();
587 828
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
591#endif 831
592 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
594 834
595 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
597 837
598 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
601 } 841 }
602#endif 842#endif
603 843
604#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
619 update_background (); 848 update_background ();
620 }
621#endif 849#endif
622 } 850 }
623#endif 851#endif
624 852
625#if ENABLE_PERL 853#if ENABLE_PERL
… …
628 856
629 set_colorfgbg (); 857 set_colorfgbg ();
630 858
631 init_command (cmd_argv); 859 init_command (cmd_argv);
632 860
633 free (cmd_argv);
634
635 if (pty->pty >= 0) 861 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
637 863
638 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
639 865
640#if ENABLE_XEMBED 866#if ENABLE_XEMBED
641 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
642 { 868 {
643 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
644 870
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
647 } 873 }
648#endif 874#endif
649 875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
650 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]); 889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
652 902
653 refresh_check (); 903 refresh_check ();
654} 904}
655 905
656/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
657void 907void
658rxvt_term::init_env () 908rxvt_term::init_env ()
659{ 909{
660 int i;
661 char *val; 910 char *val;
911 char *env_display;
912 char *env_term;
662 913
663#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
664 /* Fixup display_name for export over pty to any interested terminal 915 /* Fixup display_name for export over pty to any interested terminal
665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 916 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
666 * (for the first non-loopback interface) that we get from 917 * (for the first non-loopback interface) that we get from
… …
679 val = XDisplayString (dpy); 930 val = XDisplayString (dpy);
680 931
681 if (rs[Rs_display_name] == NULL) 932 if (rs[Rs_display_name] == NULL)
682 rs[Rs_display_name] = val; /* use broken `:0' value */ 933 rs[Rs_display_name] = val; /* use broken `:0' value */
683 934
684 i = strlen (val);
685 env_display = (char *)rxvt_malloc (i + 9); 935 env_display = (char *)rxvt_malloc (strlen (val) + 9);
686 936
687 sprintf (env_display, "DISPLAY=%s", val); 937 sprintf (env_display, "DISPLAY=%s", val);
688 938
689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
690 940
691 /* add entries to the environment: 941 /* add entries to the environment:
692 * @ DISPLAY: in case we started with -display 942 * @ DISPLAY: in case we started with -display
693 * @ WINDOWID: X window id number of the window 943 * @ WINDOWID: X window id number of the window
694 * @ COLORTERM: terminal sub-name and also indicates its color 944 * @ COLORTERM: terminal sub-name and also indicates its color
… …
727 unsetenv ("TERMCAP"); /* terminfo should be okay */ 977 unsetenv ("TERMCAP"); /* terminfo should be okay */
728#endif /* HAVE_UNSETENV */ 978#endif /* HAVE_UNSETENV */
729} 979}
730 980
731/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
732/*
733 * This is more or less stolen straight from XFree86 xterm.
734 * This should support all European type languages.
735 */
736void 982void
737rxvt_term::set_locale (const char *locale) 983rxvt_term::set_locale (const char *locale)
738{ 984{
739 set_environ (envv); 985 set_environ (envv);
740 986
… …
760 SET_LOCALE (this->locale); 1006 SET_LOCALE (this->locale);
761 mbstate.reset (); 1007 mbstate.reset ();
762#endif 1008#endif
763 1009
764#if HAVE_NL_LANGINFO 1010#if HAVE_NL_LANGINFO
765 char *codeset = strdup (nl_langinfo (CODESET)); 1011 char *codeset = nl_langinfo (CODESET);
766 // /^UTF.?8/i 1012 // /^UTF.?8/i
767 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
768 && (codeset[1] == 'T' || codeset[1] == 't') 1014 && (codeset[1] == 'T' || codeset[1] == 't')
769 && (codeset[2] == 'F' || codeset[2] == 'f') 1015 && (codeset[2] == 'F' || codeset[2] == 'f')
770 && (codeset[3] == '8' || codeset[4] == '8'); 1016 && (codeset[3] == '8' || codeset[4] == '8');
771 free (codeset);
772#else 1017#else
773 enc_utf8 = 0; 1018 enc_utf8 = 0;
774#endif 1019#endif
775} 1020}
776 1021
… …
779{ 1024{
780 set_environ (envv); 1025 set_environ (envv);
781 1026
782#ifdef USE_XIM 1027#ifdef USE_XIM
783 if (!locale) 1028 if (!locale)
784 rxvt_warn ("setting locale failed, working without locale support.\n"); 1029 rxvt_warn ("setting locale failed, continuing without locale support.\n");
785 else 1030 else
786 { 1031 {
787 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
788 1033
789 if (!XSupportsLocale ()) 1034 if (!XSupportsLocale ())
790 { 1035 {
791 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1036 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
792 return; 1037 return;
793 } 1038 }
794 1039
795 im_ev.start (display); 1040 im_ev.start (display);
796 1041
… …
1047 1292
1048 if (i) 1293 if (i)
1049 ModMetaMask = modmasks[i - 1]; 1294 ModMetaMask = modmasks[i - 1];
1050} 1295}
1051 1296
1297void
1298rxvt_term::set_icon (const char *file)
1299{
1300#ifdef HAVE_AFTERIMAGE
1301 init_asv ();
1302
1303 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1304 if (!im)
1305 {
1306 rxvt_warn ("Loading image icon failed, continuing without.\n");
1307 return;
1308 }
1309
1310 unsigned int w = im->width;
1311 unsigned int h = im->height;
1312
1313 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1314 {
1315 rxvt_warn ("Icon image too big, continuing without.\n");
1316 destroy_asimage (&im);
1317 return;
1318 }
1319
1320 ASImage *result = scale_asimage (asv, im,
1321 w, h, ASA_ARGB32,
1322 100, ASIMAGE_QUALITY_DEFAULT);
1323 destroy_asimage (&im);
1324
1325 if (!result)
1326 {
1327 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1328 return;
1329 }
1330
1331 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1332 if (buffer)
1333 {
1334 ARGB32 *asbuf = result->alt.argb32;
1335 buffer [0] = w;
1336 buffer [1] = h;
1337
1338 for (unsigned int i = 0; i < w * h; ++i)
1339 buffer [i + 2] = asbuf [i];
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 destroy_asimage (&result);
1349#endif
1350
1351#ifdef HAVE_PIXBUF
1352 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf)
1354 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n");
1356 return;
1357 }
1358
1359 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1360 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1361
1362 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1363 {
1364 rxvt_warn ("Icon image too big, continuing without.\n");
1365 g_object_unref (pixbuf);
1366 return;
1367 }
1368
1369 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1370 {
1371 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1372 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1373 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1374
1375 buffer [0] = w;
1376 buffer [1] = h;
1377 for (int i = 0; i < h; i++)
1378 {
1379 for (int j = 0; j < w; j++)
1380 {
1381 unsigned char *pixel = row + j * channels;
1382 long value;
1383
1384 if (channels == 4)
1385 value = pixel[3];
1386 else
1387 value = (unsigned char)0x00ff;
1388
1389 value = (value << 8) + pixel[0];
1390 value = (value << 8) + pixel[1];
1391 value = (value << 8) + pixel[2];
1392 buffer[(i * w + j) + 2] = value;
1393 }
1394
1395 row += rowstride;
1396 }
1397
1398 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1399 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1400 free (buffer);
1401 }
1402 else
1403 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1404
1405 g_object_unref (pixbuf);
1406#endif
1407}
1408
1052/*----------------------------------------------------------------------*/ 1409/*----------------------------------------------------------------------*/
1053/* rxvt_Create_Windows () - Open and map the window */ 1410/* Open and map the window */
1054void 1411void
1055rxvt_term::create_windows (int argc, const char *const *argv) 1412rxvt_term::create_windows (int argc, const char *const *argv)
1056{ 1413{
1057 XClassHint classHint; 1414 XClassHint classHint;
1058 XWMHints wmHint; 1415 XWMHints wmHint;
… …
1104 } 1461 }
1105#endif 1462#endif
1106 1463
1107 window_calc (0, 0); 1464 window_calc (0, 0);
1108 1465
1109 /* sub-window placement & size in rxvt_resize_subwindows () */ 1466 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1110 attributes.background_pixel = pix_colors_focused [Color_border]; 1467 attributes.background_pixel = pix_colors_focused [Color_border];
1111 attributes.border_pixel = pix_colors_focused [Color_border]; 1468 attributes.border_pixel = pix_colors_focused [Color_border];
1112 attributes.colormap = cmap; 1469 attributes.colormap = cmap;
1113 1470
1114 top = XCreateWindow (dpy, parent, 1471 top = XCreateWindow (dpy, parent,
… …
1117 ext_bwidth, 1474 ext_bwidth,
1118 depth, InputOutput, visual, 1475 depth, InputOutput, visual,
1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1476 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1120 &attributes); 1477 &attributes);
1121 1478
1122 this->parent[0] = top; 1479 this->parent = top;
1123 1480
1124 old_width = szHint.width; 1481 set_title (rs [Rs_title]);
1125 old_height = szHint.height; 1482 set_icon_name (rs [Rs_iconName]);
1126
1127 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1128 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1129 1483
1130 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
1131 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
1132 1486
1133 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1487 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1136 wmHint.window_group = top; 1490 wmHint.window_group = top;
1137 1491
1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1139 &szHint, &wmHint, &classHint); 1493 &szHint, &wmHint, &classHint);
1140#if ENABLE_EWMH 1494#if ENABLE_EWMH
1141# ifdef HAVE_AFTERIMAGE
1142 /* 1495 /*
1143 * set up icon hint 1496 * set up icon hint
1144 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1497 * rs [Rs_iconfile] is path to icon
1145 */ 1498 */
1499
1146 if (rs [Rs_iconfile] && asv) 1500 if (rs [Rs_iconfile])
1147 {
1148 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1149 if (im)
1150 {
1151 int w = im->width;
1152 int h = im->height;
1153 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1154 ASImage *result = scale_asimage (asv, im,
1155 w, h, ASA_ARGB32,
1156 100, ASIMAGE_QUALITY_DEFAULT);
1157 destroy_asimage (&im);
1158
1159 if (buffer && result)
1160 {
1161 ARGB32 *asbuf = result->alt.argb32;
1162 buffer [0] = w;
1163 buffer [1] = h;
1164
1165 for (unsigned int i = 0; i < w * h; ++i)
1166 buffer [i + 2] = asbuf [i];
1167
1168 destroy_asimage (&result);
1169 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1170 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1171 free (buffer);
1172 }
1173 else
1174 {
1175 if (!buffer)
1176 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1177
1178 if (!result)
1179 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1180 }
1181 }
1182 else
1183 rxvt_warn ("Loading image icon failed, continuing without.\n");
1184 } 1501 {
1185# endif 1502 set_icon (rs [Rs_iconfile]);
1503 }
1186#endif 1504#endif
1187 1505
1188#if ENABLE_FRILLS 1506#if ENABLE_FRILLS
1189 if (mwmhints.flags) 1507 if (mwmhints.flags)
1190 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1196#if ENABLE_EWMH 1514#if ENABLE_EWMH
1197 xa[XA_NET_WM_PING], 1515 xa[XA_NET_WM_PING],
1198#endif 1516#endif
1199 }; 1517 };
1200 1518
1201 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1519 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1202 1520
1203#if ENABLE_FRILLS 1521#if ENABLE_FRILLS
1204 if (rs[Rs_transient_for]) 1522 if (rs[Rs_transient_for])
1205 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1523 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1206#endif 1524#endif
… …
1267 pix_colors = pix_colors_unfocused; 1585 pix_colors = pix_colors_unfocused;
1268#endif 1586#endif
1269 1587
1270 pointer_unblank (); 1588 pointer_unblank ();
1271 scr_recolour (); 1589 scr_recolour ();
1272}
1273
1274/* ------------------------------------------------------------------------- *
1275 * GET TTY CURRENT STATE *
1276 * ------------------------------------------------------------------------- */
1277void
1278rxvt_get_ttymode (struct termios *tio, int erase)
1279{
1280 /*
1281 * standard System V termios interface
1282 */
1283 if (tcgetattr (STDIN_FILENO, tio) < 0)
1284 {
1285 // return error - use system defaults,
1286 // where possible, and zero elsewhere
1287 memset (tio, 0, sizeof (struct termios));
1288
1289 tio->c_cc[VINTR] = CINTR;
1290 tio->c_cc[VQUIT] = CQUIT;
1291 tio->c_cc[VERASE] = CERASE;
1292#ifdef VERASE2
1293 tio->c_cc[VERASE2] = CERASE2;
1294#endif
1295 tio->c_cc[VKILL] = CKILL;
1296 tio->c_cc[VSTART] = CSTART;
1297 tio->c_cc[VSTOP] = CSTOP;
1298 tio->c_cc[VSUSP] = CSUSP;
1299# ifdef VDSUSP
1300 tio->c_cc[VDSUSP] = CDSUSP;
1301# endif
1302# ifdef VREPRINT
1303 tio->c_cc[VREPRINT] = CRPRNT;
1304# endif
1305# ifdef VDISCRD
1306 tio->c_cc[VDISCRD] = CFLUSH;
1307# endif
1308# ifdef VWERSE
1309 tio->c_cc[VWERSE] = CWERASE;
1310# endif
1311# ifdef VLNEXT
1312 tio->c_cc[VLNEXT] = CLNEXT;
1313# endif
1314 }
1315
1316 tio->c_cc[VEOF] = CEOF;
1317 tio->c_cc[VEOL] = VDISABLE;
1318# ifdef VEOL2
1319 tio->c_cc[VEOL2] = VDISABLE;
1320# endif
1321# ifdef VSWTC
1322 tio->c_cc[VSWTC] = VDISABLE;
1323# endif
1324# ifdef VSWTCH
1325 tio->c_cc[VSWTCH] = VDISABLE;
1326# endif
1327# if VMIN != VEOF
1328 tio->c_cc[VMIN] = 1;
1329# endif
1330# if VTIME != VEOL
1331 tio->c_cc[VTIME] = 0;
1332# endif
1333
1334 if (erase != -1)
1335 tio->c_cc[VERASE] = (char)erase;
1336
1337 /* input modes */
1338 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1339# ifdef IMAXBEL
1340 | IMAXBEL
1341# endif
1342 | IXON);
1343
1344 /* output modes */
1345 tio->c_oflag = (OPOST | ONLCR);
1346
1347 /* control modes */
1348 tio->c_cflag = (CS8 | CREAD);
1349
1350 /* line discipline modes */
1351 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1352# if defined (ECHOCTL) && defined (ECHOKE)
1353 | ECHOCTL | ECHOKE
1354# endif
1355 | ECHOE | ECHOK);
1356
1357 /*
1358 * Debugging
1359 */
1360#ifdef DEBUG_TTYMODE
1361 /* c_iflag bits */
1362 fprintf (stderr, "Input flags\n");
1363
1364 /* cpp token stringize doesn't work on all machines <sigh> */
1365# define FOO(flag,name) \
1366 if ((tio->c_iflag) & flag) \
1367 fprintf (stderr, "%s ", name)
1368
1369 /* c_iflag bits */
1370 FOO (IGNBRK, "IGNBRK");
1371 FOO (BRKINT, "BRKINT");
1372 FOO (IGNPAR, "IGNPAR");
1373 FOO (PARMRK, "PARMRK");
1374 FOO (INPCK, "INPCK");
1375 FOO (ISTRIP, "ISTRIP");
1376 FOO (INLCR, "INLCR");
1377 FOO (IGNCR, "IGNCR");
1378 FOO (ICRNL, "ICRNL");
1379 FOO (IXON, "IXON");
1380 FOO (IXOFF, "IXOFF");
1381# ifdef IUCLC
1382 FOO (IUCLC, "IUCLC");
1383# endif
1384# ifdef IXANY
1385 FOO (IXANY, "IXANY");
1386# endif
1387# ifdef IMAXBEL
1388 FOO (IMAXBEL, "IMAXBEL");
1389# endif
1390
1391 fprintf (stderr, "\n");
1392
1393# undef FOO
1394# define FOO(entry, name) \
1395 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1396
1397 FOO (VINTR, "VINTR");
1398 FOO (VQUIT, "VQUIT");
1399 FOO (VERASE, "VERASE");
1400 FOO (VKILL, "VKILL");
1401 FOO (VEOF, "VEOF");
1402 FOO (VEOL, "VEOL");
1403# ifdef VEOL2
1404 FOO (VEOL2, "VEOL2");
1405# endif
1406# ifdef VSWTC
1407 FOO (VSWTC, "VSWTC");
1408# endif
1409# ifdef VSWTCH
1410 FOO (VSWTCH, "VSWTCH");
1411# endif
1412 FOO (VSTART, "VSTART");
1413 FOO (VSTOP, "VSTOP");
1414 FOO (VSUSP, "VSUSP");
1415# ifdef VDSUSP
1416 FOO (VDSUSP, "VDSUSP");
1417# endif
1418# ifdef VREPRINT
1419 FOO (VREPRINT, "VREPRINT");
1420# endif
1421# ifdef VDISCRD
1422 FOO (VDISCRD, "VDISCRD");
1423# endif
1424# ifdef VWERSE
1425 FOO (VWERSE, "VWERSE");
1426# endif
1427# ifdef VLNEXT
1428 FOO (VLNEXT, "VLNEXT");
1429# endif
1430
1431 fprintf (stderr, "\n");
1432# undef FOO
1433#endif /* DEBUG_TTYMODE */
1434} 1590}
1435 1591
1436/*----------------------------------------------------------------------*/ 1592/*----------------------------------------------------------------------*/
1437/* 1593/*
1438 * Run the command in a subprocess and return a file descriptor for the 1594 * Run the command in a subprocess and return a file descriptor for the
… …
1450 if (pty->pty >= 0) 1606 if (pty->pty >= 0)
1451 { 1607 {
1452 if (getfd_hook) 1608 if (getfd_hook)
1453 pty->pty = (*getfd_hook) (pty->pty); 1609 pty->pty = (*getfd_hook) (pty->pty);
1454 1610
1455 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1611 if (pty->pty < 0)
1456 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1457 } 1613 }
1458 } 1614 }
1459 else 1615 else
1460#endif 1616#endif
1461 if (!pty->get ()) 1617 if (!pty->get ())
1462 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1463 1619
1464 int er; 1620 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1621
1622 struct termios tio = def_tio;
1465 1623
1466#ifndef NO_BACKSPACE_KEY 1624#ifndef NO_BACKSPACE_KEY
1467 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1468 er = rs[Rs_backspace_key][0]; 1626 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1469 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1627 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1470 er = '\177'; /* the initial state anyway */ 1628 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1471 else
1472#endif 1629#endif
1473 er = -1;
1474 1630
1475 rxvt_get_ttymode (&tio, er);
1476 /* init terminal attributes */ 1631 /* init terminal attributes */
1477 cfsetospeed (&tio, BAUDRATE); 1632 cfsetospeed (&tio, BAUDRATE);
1478 cfsetispeed (&tio, BAUDRATE); 1633 cfsetispeed (&tio, BAUDRATE);
1479 tcsetattr (pty->tty, TCSANOW, &tio); 1634 tcsetattr (pty->tty, TCSANOW, &tio);
1480 pty->set_utf8_mode (enc_utf8); 1635 pty->set_utf8_mode (enc_utf8);
… …
1520 1675
1521 _exit (EXIT_FAILURE); 1676 _exit (EXIT_FAILURE);
1522 1677
1523 default: 1678 default:
1524 if (!option (Opt_utmpInhibit)) 1679 if (!option (Opt_utmpInhibit))
1680 {
1681#ifdef LOG_ONLY_ON_LOGIN
1682 bool login_shell = option (Opt_loginShell);
1683#else
1684 bool login_shell = true;
1685#endif
1525 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1686 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1687 }
1526 1688
1527 pty->close_tty (); 1689 pty->close_tty ();
1528 1690
1529 child_ev.start (cmd_pid); 1691 child_ev.start (cmd_pid);
1530 1692
… …
1555#elif defined (SRIOCSREDIR) 1717#elif defined (SRIOCSREDIR)
1556 int fd; 1718 int fd;
1557 1719
1558 fd = open (CONSOLE, O_WRONLY, 0); 1720 fd = open (CONSOLE, O_WRONLY, 0);
1559 if (fd >= 0) 1721 if (fd >= 0)
1560 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1722 {
1723 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1561 close (fd); 1724 close (fd);
1725 }
1562#endif /* SRIOCSREDIR */ 1726#endif /* SRIOCSREDIR */
1563 } 1727 }
1564 1728
1565 /* reset signals and spin off the command interpreter */ 1729 /* reset signals and spin off the command interpreter */
1566 signal (SIGINT, SIG_DFL); 1730 signal (SIGINT, SIG_DFL);
1567 signal (SIGQUIT, SIG_DFL); 1731 signal (SIGQUIT, SIG_DFL);
1568 signal (SIGCHLD, SIG_DFL); 1732 signal (SIGCHLD, SIG_DFL);
1569 signal (SIGHUP, SIG_DFL); 1733 signal (SIGHUP, SIG_DFL);
1570 signal (SIGPIPE, SIG_DFL); 1734 signal (SIGPIPE, SIG_DFL);
1571 /* 1735 /*
1572 * mimick login's behavior by disabling the job control signals 1736 * mimic login's behavior by disabling the job control signals
1573 * a shell that wants them can turn them back on 1737 * a shell that wants them can turn them back on
1574 */ 1738 */
1575#ifdef SIGTSTP 1739#ifdef SIGTSTP
1576 signal (SIGTSTP, SIG_IGN); 1740 signal (SIGTSTP, SIG_IGN);
1577 signal (SIGTTIN, SIG_IGN); 1741 signal (SIGTTIN, SIG_IGN);
… …
1596 const char *argv0, *shell; 1760 const char *argv0, *shell;
1597 1761
1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1762 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1599 shell = "/bin/sh"; 1763 shell = "/bin/sh";
1600 1764
1601 argv0 = (const char *)rxvt_basename (shell); 1765 argv0 = rxvt_basename (shell);
1602 1766
1603 if (option (Opt_loginShell)) 1767 if (option (Opt_loginShell))
1604 { 1768 {
1605 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1769 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1606 1770

Diff Legend

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