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.239 by ayin, Sat Jan 19 13:00:07 2008 UTC vs.
Revision 1.315 by sf-exg, Mon Jan 9 15:34:56 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.
… …
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#ifdef KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 525#endif
276#if ENABLE_TRANSPARENCY 526#if ENABLE_TRANSPARENCY
277 NULL, 527 NULL,
278#endif 528#endif
279#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 530 "rgb:00/00/00",
… …
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} 565 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} 566}
348 567
349/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
350const char ** 569const char **
351rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
352{ 571{
353 int i, r_argc; 572 int i;
354 const char **cmd_argv, **r_argv; 573 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 574
384 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
385 576
386 /* 577 /*
387 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
388 */ 579 */
389 580
390 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
391 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
392 583
393 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
394 585
395 if (!(display = displays.get (rs[Rs_display_name]))) 586 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]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
399 }
400 588
401 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
402 xa = display->xa; 590 xa = display->xa;
403 591
404 set (display); 592 set (display);
… …
407#if XFT 595#if XFT
408 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
409 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
410#endif 598#endif
411 599
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
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
423#if ENABLE_PERL 604#if ENABLE_PERL
… …
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
555rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
556{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
557 this->envv = envv; 744 this->envv = envv;
558 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{
559 SET_R (this); 771 SET_R (this);
560 set_locale (""); 772 set_locale ("");
561 set_environ (envv); // few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
562 774
563 init_vars (); 775 init_vars ();
564
565 init_secondary ();
566 776
567 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
568 778
569#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
570 keyboard->register_done (); 780 keyboard->register_done ();
571#endif 781#endif
572 782
573#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
574 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
575 scrollBar.setIdle (); /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
576#endif
577 795
578 pty = ptytty::create (); 796 pty = ptytty::create ();
579 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
580 create_windows (argc, argv); 808 create_windows (argc, argv);
581 809
582 init_xlocale (); 810 init_xlocale ();
583 811
584 scr_reset (); // initialize screen 812 scr_poweron (); // initialize screen
585 813
586#if 0 814#if 0
587 XSynchronize (dpy, True); 815 XSynchronize (dpy, True);
588#endif 816#endif
589 817
590#ifdef HAVE_SCROLLBARS
591 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
592 resize_scrollbar (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
593#endif
594#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
595 { 821 {
596 bgPixmap.set_target (this); 822 bg_init ();
597 bgPixmap.invalidate ();
598 823
599#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
600 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
601 { 826 {
602 bgPixmap.set_transparent (); 827 bg_set_transparent ();
603 828
604#ifdef HAVE_AFTERIMAGE
605 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
606 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
607#endif 831
608 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
609 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
610 834
611 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
612 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
613 837
614 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
615 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
616 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
617 } 841 }
618#endif 842#endif
619 843
620#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
621 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
622 {
623 const char *p = rs[Rs_backgroundPixmap];
624
625 if ((p = strchr (p, ';')) != 0)
626 {
627 p++;
628 bgPixmap.set_geometry (p);
629 }
630 else
631 bgPixmap.set_defaultGeometry ();
632
633 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
634 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
635 update_background (); 848 update_background ();
636 }
637#endif 849#endif
638 } 850 }
639#endif 851#endif
640 852
641#if ENABLE_PERL 853#if ENABLE_PERL
642 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
643#endif 855#endif
644 856
645 set_colorfgbg (); 857 set_colorfgbg ();
858 init_done = 1;
646 859
647 init_command (cmd_argv); 860 init_command (cmd_argv);
648
649 free (cmd_argv);
650 861
651 if (pty->pty >= 0) 862 if (pty->pty >= 0)
652 pty_ev.start (pty->pty, ev::READ); 863 pty_ev.start (pty->pty, ev::READ);
653 864
654 HOOK_INVOKE ((this, HOOK_START, DT_END)); 865 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
656#if ENABLE_XEMBED 867#if ENABLE_XEMBED
657 if (rs[Rs_embed]) 868 if (rs[Rs_embed])
658 { 869 {
659 long info[2] = { 0, XEMBED_MAPPED }; 870 long info[2] = { 0, XEMBED_MAPPED };
660 871
661 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 872 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
662 32, PropModeReplace, (unsigned char *)&info, 2); 873 32, PropModeReplace, (unsigned char *)&info, 2);
663 } 874 }
664#endif 875#endif
665 876
877#if HAVE_STARTUP_NOTIFICATION
878 SnDisplay *snDisplay;
879 SnLauncheeContext *snContext;
880
881 snDisplay = sn_display_new (dpy, NULL, NULL);
882 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
883
884 /* Tell the window manager that this window is part of the startup context */
885 if (snContext)
886 sn_launchee_context_setup_window (snContext, parent);
887#endif
888
666 XMapWindow (dpy, vt); 889 XMapWindow (dpy, vt);
667 XMapWindow (dpy, parent[0]); 890 XMapWindow (dpy, parent);
891
892#if HAVE_STARTUP_NOTIFICATION
893 if (snContext)
894 {
895 /* Mark the startup process as complete */
896 sn_launchee_context_complete (snContext);
897
898 sn_launchee_context_unref (snContext);
899 }
900
901 sn_display_unref (snDisplay);
902#endif
668 903
669 refresh_check (); 904 refresh_check ();
670} 905}
671 906
672/*----------------------------------------------------------------------*/ 907/*----------------------------------------------------------------------*/
673void 908void
674rxvt_term::init_env () 909rxvt_term::init_env ()
675{ 910{
676 int i;
677 char *val; 911 char *val;
912 char *env_display;
913 char *env_term;
678 914
679#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
680 /* Fixup display_name for export over pty to any interested terminal 916 /* Fixup display_name for export over pty to any interested terminal
681 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
682 * (for the first non-loopback interface) that we get from 918 * (for the first non-loopback interface) that we get from
… …
695 val = XDisplayString (dpy); 931 val = XDisplayString (dpy);
696 932
697 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
698 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
699 935
700 i = strlen (val);
701 env_display = (char *)rxvt_malloc (i + 9); 936 env_display = (char *)rxvt_malloc (strlen (val) + 9);
702 937
703 sprintf (env_display, "DISPLAY=%s", val); 938 sprintf (env_display, "DISPLAY=%s", val);
704 939
705 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
706 941
707 /* add entries to the environment: 942 /* add entries to the environment:
708 * @ DISPLAY: in case we started with -display 943 * @ DISPLAY: in case we started with -display
709 * @ WINDOWID: X window id number of the window 944 * @ WINDOWID: X window id number of the window
710 * @ COLORTERM: terminal sub-name and also indicates its color 945 * @ COLORTERM: terminal sub-name and also indicates its color
… …
743 unsetenv ("TERMCAP"); /* terminfo should be okay */ 978 unsetenv ("TERMCAP"); /* terminfo should be okay */
744#endif /* HAVE_UNSETENV */ 979#endif /* HAVE_UNSETENV */
745} 980}
746 981
747/*----------------------------------------------------------------------*/ 982/*----------------------------------------------------------------------*/
748/*
749 * This is more or less stolen straight from XFree86 xterm.
750 * This should support all European type languages.
751 */
752void 983void
753rxvt_term::set_locale (const char *locale) 984rxvt_term::set_locale (const char *locale)
754{ 985{
755 set_environ (envv); 986 set_environ (envv);
756 987
… …
776 SET_LOCALE (this->locale); 1007 SET_LOCALE (this->locale);
777 mbstate.reset (); 1008 mbstate.reset ();
778#endif 1009#endif
779 1010
780#if HAVE_NL_LANGINFO 1011#if HAVE_NL_LANGINFO
781 char *codeset = strdup (nl_langinfo (CODESET)); 1012 char *codeset = nl_langinfo (CODESET);
782 // /^UTF.?8/i 1013 // /^UTF.?8/i
783 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1014 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
784 && (codeset[1] == 'T' || codeset[1] == 't') 1015 && (codeset[1] == 'T' || codeset[1] == 't')
785 && (codeset[2] == 'F' || codeset[2] == 'f') 1016 && (codeset[2] == 'F' || codeset[2] == 'f')
786 && (codeset[3] == '8' || codeset[4] == '8'); 1017 && (codeset[3] == '8' || codeset[4] == '8');
787 free (codeset);
788#else 1018#else
789 enc_utf8 = 0; 1019 enc_utf8 = 0;
790#endif 1020#endif
791} 1021}
792 1022
… …
795{ 1025{
796 set_environ (envv); 1026 set_environ (envv);
797 1027
798#ifdef USE_XIM 1028#ifdef USE_XIM
799 if (!locale) 1029 if (!locale)
800 rxvt_warn ("setting locale failed, working without locale support.\n"); 1030 rxvt_warn ("setting locale failed, continuing without locale support.\n");
801 else 1031 else
802 { 1032 {
803 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1033 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
804 1034
805 if (!XSupportsLocale ()) 1035 if (!XSupportsLocale ())
806 { 1036 {
807 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1037 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
808 return; 1038 return;
809 } 1039 }
810 1040
811 im_ev.start (display); 1041 im_ev.start (display);
812 1042
… …
853 run_command (argv); 1083 run_command (argv);
854} 1084}
855 1085
856/*----------------------------------------------------------------------*/ 1086/*----------------------------------------------------------------------*/
857void 1087void
858rxvt_term::Get_Colours () 1088rxvt_term::get_colours ()
859{ 1089{
860 int i; 1090 int i;
861 1091
862#ifdef OFF_FOCUS_FADING 1092#ifdef OFF_FOCUS_FADING
863 pix_colors = pix_colors_focused; 1093 pix_colors = pix_colors_focused;
… …
923 * get scrollBar shadow colors 1153 * get scrollBar shadow colors
924 * 1154 *
925 * The calculations of topShadow/bottomShadow values are adapted 1155 * The calculations of topShadow/bottomShadow values are adapted
926 * from the fvwm window manager. 1156 * from the fvwm window manager.
927 */ 1157 */
928#ifdef KEEP_SCROLLCOLOR 1158#ifdef RXVT_SCROLLBAR
929 if (depth <= 2) 1159 if (depth <= 2)
930 { 1160 {
931 /* Monochrome */ 1161 /* Monochrome */
932 alias_color (Color_scroll, Color_fg); 1162 alias_color (Color_scroll, Color_fg);
933 alias_color (Color_topShadow, Color_bg); 1163 alias_color (Color_topShadow, Color_bg);
… …
948 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1178 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
949 cscroll.a) 1179 cscroll.a)
950 )) 1180 ))
951 alias_color (Color_topShadow, Color_White); 1181 alias_color (Color_topShadow, Color_White);
952 } 1182 }
953#endif /* KEEP_SCROLLCOLOR */ 1183#endif
954 1184
955#ifdef OFF_FOCUS_FADING 1185#ifdef OFF_FOCUS_FADING
956 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1186 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
957 update_fade_color (i); 1187 update_fade_color (i);
958#endif 1188#endif
… …
1063 1293
1064 if (i) 1294 if (i)
1065 ModMetaMask = modmasks[i - 1]; 1295 ModMetaMask = modmasks[i - 1];
1066} 1296}
1067 1297
1298void
1299rxvt_term::set_icon (const char *file)
1300{
1301#ifdef HAVE_AFTERIMAGE
1302 init_asv ();
1303
1304 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1305 if (!im)
1306 {
1307 rxvt_warn ("Loading image icon failed, continuing without.\n");
1308 return;
1309 }
1310
1311 unsigned int w = im->width;
1312 unsigned int h = im->height;
1313
1314 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1315 {
1316 rxvt_warn ("Icon image too big, continuing without.\n");
1317 destroy_asimage (&im);
1318 return;
1319 }
1320
1321 ASImage *result = scale_asimage (asv, im,
1322 w, h, ASA_ARGB32,
1323 100, ASIMAGE_QUALITY_DEFAULT);
1324 destroy_asimage (&im);
1325
1326 if (!result)
1327 {
1328 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1329 return;
1330 }
1331
1332 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1333 if (buffer)
1334 {
1335 ARGB32 *asbuf = result->alt.argb32;
1336 buffer [0] = w;
1337 buffer [1] = h;
1338
1339 for (unsigned int i = 0; i < w * h; ++i)
1340 buffer [i + 2] = asbuf [i];
1341
1342 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1343 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1344 free (buffer);
1345 }
1346 else
1347 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1348
1349 destroy_asimage (&result);
1350#endif
1351
1352#ifdef HAVE_PIXBUF
1353 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1354 if (!pixbuf)
1355 {
1356 rxvt_warn ("Loading image icon failed, continuing without.\n");
1357 return;
1358 }
1359
1360 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1361 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1362
1363 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1364 {
1365 rxvt_warn ("Icon image too big, continuing without.\n");
1366 g_object_unref (pixbuf);
1367 return;
1368 }
1369
1370 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1371 {
1372 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1373 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1374 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1375
1376 buffer [0] = w;
1377 buffer [1] = h;
1378 for (int i = 0; i < h; i++)
1379 {
1380 for (int j = 0; j < w; j++)
1381 {
1382 unsigned char *pixel = row + j * channels;
1383 long value;
1384
1385 if (channels == 4)
1386 value = pixel[3];
1387 else
1388 value = (unsigned char)0x00ff;
1389
1390 value = (value << 8) + pixel[0];
1391 value = (value << 8) + pixel[1];
1392 value = (value << 8) + pixel[2];
1393 buffer[(i * w + j) + 2] = value;
1394 }
1395
1396 row += rowstride;
1397 }
1398
1399 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1400 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1401 free (buffer);
1402 }
1403 else
1404 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1405
1406 g_object_unref (pixbuf);
1407#endif
1408}
1409
1068/*----------------------------------------------------------------------*/ 1410/*----------------------------------------------------------------------*/
1069/* rxvt_Create_Windows () - Open and map the window */ 1411/* Open and map the window */
1070void 1412void
1071rxvt_term::create_windows (int argc, const char *const *argv) 1413rxvt_term::create_windows (int argc, const char *const *argv)
1072{ 1414{
1073 XClassHint classHint; 1415 XClassHint classHint;
1074 XWMHints wmHint; 1416 XWMHints wmHint;
… …
1080 Window top, parent; 1422 Window top, parent;
1081 1423
1082 dLocal (Display *, dpy); 1424 dLocal (Display *, dpy);
1083 1425
1084 /* grab colors before netscape does */ 1426 /* grab colors before netscape does */
1085 Get_Colours (); 1427 get_colours ();
1086 1428
1087 if (!set_fonts ()) 1429 if (!set_fonts ())
1088 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1430 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1089 1431
1090 parent = display->root; 1432 parent = display->root;
… …
1120 } 1462 }
1121#endif 1463#endif
1122 1464
1123 window_calc (0, 0); 1465 window_calc (0, 0);
1124 1466
1125 /* sub-window placement & size in rxvt_resize_subwindows () */ 1467 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1126 attributes.background_pixel = pix_colors_focused [Color_border]; 1468 attributes.background_pixel = pix_colors_focused [Color_border];
1127 attributes.border_pixel = pix_colors_focused [Color_border]; 1469 attributes.border_pixel = pix_colors_focused [Color_border];
1128 attributes.colormap = cmap; 1470 attributes.colormap = cmap;
1129 1471
1130 top = XCreateWindow (dpy, parent, 1472 top = XCreateWindow (dpy, parent,
… …
1133 ext_bwidth, 1475 ext_bwidth,
1134 depth, InputOutput, visual, 1476 depth, InputOutput, visual,
1135 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1477 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1136 &attributes); 1478 &attributes);
1137 1479
1138 this->parent[0] = top; 1480 this->parent = top;
1139 1481
1140 old_width = szHint.width; 1482 set_title (rs [Rs_title]);
1141 old_height = szHint.height; 1483 set_icon_name (rs [Rs_iconName]);
1142
1143 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1144 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1145 1484
1146 classHint.res_name = (char *)rs[Rs_name]; 1485 classHint.res_name = (char *)rs[Rs_name];
1147 classHint.res_class = (char *)RESCLASS; 1486 classHint.res_class = (char *)RESCLASS;
1148 1487
1149 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1488 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1151 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1490 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1152 wmHint.window_group = top; 1491 wmHint.window_group = top;
1153 1492
1154 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1155 &szHint, &wmHint, &classHint); 1494 &szHint, &wmHint, &classHint);
1495#if ENABLE_EWMH
1496 /*
1497 * set up icon hint
1498 * rs [Rs_iconfile] is path to icon
1499 */
1500
1501 if (rs [Rs_iconfile])
1502 {
1503 set_icon (rs [Rs_iconfile]);
1504 }
1505#endif
1156 1506
1157#if ENABLE_FRILLS 1507#if ENABLE_FRILLS
1158 if (mwmhints.flags) 1508 if (mwmhints.flags)
1159 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1509 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1160 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1510 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1165#if ENABLE_EWMH 1515#if ENABLE_EWMH
1166 xa[XA_NET_WM_PING], 1516 xa[XA_NET_WM_PING],
1167#endif 1517#endif
1168 }; 1518 };
1169 1519
1170 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1520 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1171 1521
1172#if ENABLE_FRILLS 1522#if ENABLE_FRILLS
1173 if (rs[Rs_transient_for]) 1523 if (rs[Rs_transient_for])
1174 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1524 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1175#endif 1525#endif
… …
1236 pix_colors = pix_colors_unfocused; 1586 pix_colors = pix_colors_unfocused;
1237#endif 1587#endif
1238 1588
1239 pointer_unblank (); 1589 pointer_unblank ();
1240 scr_recolour (); 1590 scr_recolour ();
1241}
1242
1243/* ------------------------------------------------------------------------- *
1244 * GET TTY CURRENT STATE *
1245 * ------------------------------------------------------------------------- */
1246void
1247rxvt_get_ttymode (struct termios *tio, int erase)
1248{
1249 /*
1250 * standard System V termios interface
1251 */
1252 if (tcgetattr (STDIN_FILENO, tio) < 0)
1253 {
1254 // return error - use system defaults,
1255 // where possible, and zero elsewhere
1256 memset (tio, 0, sizeof (struct termios));
1257
1258 tio->c_cc[VINTR] = CINTR;
1259 tio->c_cc[VQUIT] = CQUIT;
1260 tio->c_cc[VERASE] = CERASE;
1261#ifdef VERASE2
1262 tio->c_cc[VERASE2] = CERASE2;
1263#endif
1264 tio->c_cc[VKILL] = CKILL;
1265 tio->c_cc[VSTART] = CSTART;
1266 tio->c_cc[VSTOP] = CSTOP;
1267 tio->c_cc[VSUSP] = CSUSP;
1268# ifdef VDSUSP
1269 tio->c_cc[VDSUSP] = CDSUSP;
1270# endif
1271# ifdef VREPRINT
1272 tio->c_cc[VREPRINT] = CRPRNT;
1273# endif
1274# ifdef VDISCRD
1275 tio->c_cc[VDISCRD] = CFLUSH;
1276# endif
1277# ifdef VWERSE
1278 tio->c_cc[VWERSE] = CWERASE;
1279# endif
1280# ifdef VLNEXT
1281 tio->c_cc[VLNEXT] = CLNEXT;
1282# endif
1283 }
1284
1285 tio->c_cc[VEOF] = CEOF;
1286 tio->c_cc[VEOL] = VDISABLE;
1287# ifdef VEOL2
1288 tio->c_cc[VEOL2] = VDISABLE;
1289# endif
1290# ifdef VSWTC
1291 tio->c_cc[VSWTC] = VDISABLE;
1292# endif
1293# ifdef VSWTCH
1294 tio->c_cc[VSWTCH] = VDISABLE;
1295# endif
1296# if VMIN != VEOF
1297 tio->c_cc[VMIN] = 1;
1298# endif
1299# if VTIME != VEOL
1300 tio->c_cc[VTIME] = 0;
1301# endif
1302
1303 if (erase != -1)
1304 tio->c_cc[VERASE] = (char)erase;
1305
1306 /* input modes */
1307 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1308# ifdef IMAXBEL
1309 | IMAXBEL
1310# endif
1311 | IXON);
1312
1313 /* output modes */
1314 tio->c_oflag = (OPOST | ONLCR);
1315
1316 /* control modes */
1317 tio->c_cflag = (CS8 | CREAD);
1318
1319 /* line discipline modes */
1320 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1321# if defined (ECHOCTL) && defined (ECHOKE)
1322 | ECHOCTL | ECHOKE
1323# endif
1324 | ECHOE | ECHOK);
1325
1326 /*
1327 * Debugging
1328 */
1329#ifdef DEBUG_TTYMODE
1330 /* c_iflag bits */
1331 fprintf (stderr, "Input flags\n");
1332
1333 /* cpp token stringize doesn't work on all machines <sigh> */
1334# define FOO(flag,name) \
1335 if ((tio->c_iflag) & flag) \
1336 fprintf (stderr, "%s ", name)
1337
1338 /* c_iflag bits */
1339 FOO (IGNBRK, "IGNBRK");
1340 FOO (BRKINT, "BRKINT");
1341 FOO (IGNPAR, "IGNPAR");
1342 FOO (PARMRK, "PARMRK");
1343 FOO (INPCK, "INPCK");
1344 FOO (ISTRIP, "ISTRIP");
1345 FOO (INLCR, "INLCR");
1346 FOO (IGNCR, "IGNCR");
1347 FOO (ICRNL, "ICRNL");
1348 FOO (IXON, "IXON");
1349 FOO (IXOFF, "IXOFF");
1350# ifdef IUCLC
1351 FOO (IUCLC, "IUCLC");
1352# endif
1353# ifdef IXANY
1354 FOO (IXANY, "IXANY");
1355# endif
1356# ifdef IMAXBEL
1357 FOO (IMAXBEL, "IMAXBEL");
1358# endif
1359
1360 fprintf (stderr, "\n");
1361
1362# undef FOO
1363# define FOO(entry, name) \
1364 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1365
1366 FOO (VINTR, "VINTR");
1367 FOO (VQUIT, "VQUIT");
1368 FOO (VERASE, "VERASE");
1369 FOO (VKILL, "VKILL");
1370 FOO (VEOF, "VEOF");
1371 FOO (VEOL, "VEOL");
1372# ifdef VEOL2
1373 FOO (VEOL2, "VEOL2");
1374# endif
1375# ifdef VSWTC
1376 FOO (VSWTC, "VSWTC");
1377# endif
1378# ifdef VSWTCH
1379 FOO (VSWTCH, "VSWTCH");
1380# endif
1381 FOO (VSTART, "VSTART");
1382 FOO (VSTOP, "VSTOP");
1383 FOO (VSUSP, "VSUSP");
1384# ifdef VDSUSP
1385 FOO (VDSUSP, "VDSUSP");
1386# endif
1387# ifdef VREPRINT
1388 FOO (VREPRINT, "VREPRINT");
1389# endif
1390# ifdef VDISCRD
1391 FOO (VDISCRD, "VDISCRD");
1392# endif
1393# ifdef VWERSE
1394 FOO (VWERSE, "VWERSE");
1395# endif
1396# ifdef VLNEXT
1397 FOO (VLNEXT, "VLNEXT");
1398# endif
1399
1400 fprintf (stderr, "\n");
1401# undef FOO
1402#endif /* DEBUG_TTYMODE */
1403} 1591}
1404 1592
1405/*----------------------------------------------------------------------*/ 1593/*----------------------------------------------------------------------*/
1406/* 1594/*
1407 * Run the command in a subprocess and return a file descriptor for the 1595 * Run the command in a subprocess and return a file descriptor for the
… …
1419 if (pty->pty >= 0) 1607 if (pty->pty >= 0)
1420 { 1608 {
1421 if (getfd_hook) 1609 if (getfd_hook)
1422 pty->pty = (*getfd_hook) (pty->pty); 1610 pty->pty = (*getfd_hook) (pty->pty);
1423 1611
1424 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1612 if (pty->pty < 0)
1425 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426 } 1614 }
1427 } 1615 }
1428 else 1616 else
1429#endif 1617#endif
1430 if (!pty->get ()) 1618 if (!pty->get ())
1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1619 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1432 1620
1433 int er; 1621 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1622
1623 struct termios tio = def_tio;
1434 1624
1435#ifndef NO_BACKSPACE_KEY 1625#ifndef NO_BACKSPACE_KEY
1436 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1626 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1437 er = rs[Rs_backspace_key][0]; 1627 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1438 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1628 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1439 er = '\177'; /* the initial state anyway */ 1629 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1440 else
1441#endif 1630#endif
1442 er = -1;
1443 1631
1444 rxvt_get_ttymode (&tio, er);
1445 /* init terminal attributes */ 1632 /* init terminal attributes */
1446 cfsetospeed (&tio, BAUDRATE); 1633 cfsetospeed (&tio, BAUDRATE);
1447 cfsetispeed (&tio, BAUDRATE); 1634 cfsetispeed (&tio, BAUDRATE);
1448 tcsetattr (pty->tty, TCSANOW, &tio); 1635 tcsetattr (pty->tty, TCSANOW, &tio);
1449 pty->set_utf8_mode (enc_utf8); 1636 pty->set_utf8_mode (enc_utf8);
… …
1489 1676
1490 _exit (EXIT_FAILURE); 1677 _exit (EXIT_FAILURE);
1491 1678
1492 default: 1679 default:
1493 if (!option (Opt_utmpInhibit)) 1680 if (!option (Opt_utmpInhibit))
1681 {
1682#ifdef LOG_ONLY_ON_LOGIN
1683 bool login_shell = option (Opt_loginShell);
1684#else
1685 bool login_shell = true;
1686#endif
1494 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1687 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1688 }
1495 1689
1496 pty->close_tty (); 1690 pty->close_tty ();
1497 1691
1498 child_ev.start (cmd_pid); 1692 child_ev.start (cmd_pid);
1499 1693
… …
1524#elif defined (SRIOCSREDIR) 1718#elif defined (SRIOCSREDIR)
1525 int fd; 1719 int fd;
1526 1720
1527 fd = open (CONSOLE, O_WRONLY, 0); 1721 fd = open (CONSOLE, O_WRONLY, 0);
1528 if (fd >= 0) 1722 if (fd >= 0)
1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1723 {
1724 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1530 close (fd); 1725 close (fd);
1726 }
1531#endif /* SRIOCSREDIR */ 1727#endif /* SRIOCSREDIR */
1532 } 1728 }
1533 1729
1534 /* reset signals and spin off the command interpreter */ 1730 /* reset signals and spin off the command interpreter */
1535 signal (SIGINT, SIG_DFL); 1731 signal (SIGINT, SIG_DFL);
1536 signal (SIGQUIT, SIG_DFL); 1732 signal (SIGQUIT, SIG_DFL);
1537 signal (SIGCHLD, SIG_DFL); 1733 signal (SIGCHLD, SIG_DFL);
1538 signal (SIGHUP, SIG_DFL); 1734 signal (SIGHUP, SIG_DFL);
1539 signal (SIGPIPE, SIG_DFL); 1735 signal (SIGPIPE, SIG_DFL);
1540 /* 1736 /*
1541 * mimick login's behavior by disabling the job control signals 1737 * mimic login's behavior by disabling the job control signals
1542 * a shell that wants them can turn them back on 1738 * a shell that wants them can turn them back on
1543 */ 1739 */
1544#ifdef SIGTSTP 1740#ifdef SIGTSTP
1545 signal (SIGTSTP, SIG_IGN); 1741 signal (SIGTSTP, SIG_IGN);
1546 signal (SIGTTIN, SIG_IGN); 1742 signal (SIGTTIN, SIG_IGN);
1547 signal (SIGTTOU, SIG_IGN); 1743 signal (SIGTTOU, SIG_IGN);
1548#endif /* SIGTSTP */ 1744#endif /* SIGTSTP */
1549 1745
1550 // unblock signals (signals are blocked by iom.C
1551 sigset_t ss;
1552 sigemptyset (&ss);
1553 sigprocmask (SIG_SETMASK, &ss, 0);
1554
1555 /* command interpreter path */ 1746 /* command interpreter path */
1556 if (argv) 1747 if (argv)
1557 { 1748 {
1558# ifdef DEBUG_CMD 1749# ifdef DEBUG_CMD
1559 int i; 1750 int i;
… …
1570 const char *argv0, *shell; 1761 const char *argv0, *shell;
1571 1762
1572 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1763 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1573 shell = "/bin/sh"; 1764 shell = "/bin/sh";
1574 1765
1575 argv0 = (const char *)rxvt_basename (shell); 1766 argv0 = rxvt_basename (shell);
1576 1767
1577 if (option (Opt_loginShell)) 1768 if (option (Opt_loginShell))
1578 { 1769 {
1579 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1770 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1580 1771

Diff Legend

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