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.244 by ayin, Sat Jan 26 14:24:43 2008 UTC vs.
Revision 1.335 by sf-exg, Thu Aug 21 15:58:29 2014 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 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 523#endif
276#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
277 NULL, 525 NULL,
278#endif 526#endif
279#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 528 "rgb:00/00/00",
281#endif 529#endif
… …
293 ncol = 80; 541 ncol = 80;
294 nrow = 24; 542 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 547 saveLines = SAVELINES;
299 548
300 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
301 550
302 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 563 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} 564}
333 565
334/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
335const char ** 567const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
337{ 569{
338 int i, r_argc; 570 int i;
339 const char **cmd_argv, **r_argv; 571 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 572
369 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
370 574
371 /* 575 /*
372 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
373 */ 577 */
374 578
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
377 581
378 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
379 583
380 if (!(display = displays.get (rs[Rs_display_name]))) 584 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]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 586
386 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
387 xa = display->xa; 588 xa = display->xa;
388 589
389 set (display); 590 set (display);
390 extract_resources (); 591 extract_resources ();
391 592
392#if XFT 593#if ENABLE_FRILLS
393 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
394 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));
395#endif 598#endif
396
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 599
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
… …
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;
456 else 661 else
457 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
458#endif 663#endif
459 664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
669
670 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
671
460 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 673 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 675
469 if (!rs[Rs_cutchars]) 676 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 677 rs[Rs_cutchars] = CUTCHARS;
471 678
472#ifndef NO_BACKSPACE_KEY 679#ifndef NO_BACKSPACE_KEY
… …
485# else 692# else
486 rs[Rs_delete_key] = "\033[3~"; 693 rs[Rs_delete_key] = "\033[3~";
487# endif 694# endif
488#endif 695#endif
489 696
490#ifdef HAVE_SCROLLBARS 697 scrollBar.setup (this);
491 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
492#endif
493 698
494#ifdef XTERM_REVERSE_VIDEO 699#ifdef XTERM_REVERSE_VIDEO
495 /* this is how xterm implements reverseVideo */ 700 /* this is how xterm implements reverseVideo */
496 if (option (Opt_reverseVideo)) 701 if (option (Opt_reverseVideo))
497 { 702 {
… …
535 return cmd_argv; 740 return cmd_argv;
536} 741}
537 742
538/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
539void 744void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
541{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
542 this->envv = envv; 751 this->envv = envv;
543 752
753 init2 (argv->size () - 1, argv->begin ());
754}
755
756void
757rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
758{
759#if ENABLE_PERL
760 // perl might want to access the stringvecs later, so we need to copy them
761 stringvec *args = new stringvec;
762 for (int i = 0; i < argc; i++)
763 args->push_back (strdup (argv [i]));
764
765 stringvec *envs = new stringvec;
766 for (const char *const *var = envv; *var; var++)
767 envs->push_back (strdup (*var));
768
769 init (args, envs);
770#else
771 init2 (argc, argv);
772#endif
773}
774
775void
776rxvt_term::init2 (int argc, const char *const *argv)
777{
544 SET_R (this); 778 SET_R (this);
545 set_locale (""); 779 set_locale ("");
546 set_environ (envv); // few things in X do not call setlocale :( 780 set_environ (envv); // a few things in X do not call setlocale :(
547 781
548 init_vars (); 782 init_vars ();
549
550 init_secondary ();
551 783
552 const char **cmd_argv = init_resources (argc, argv); 784 const char **cmd_argv = init_resources (argc, argv);
553 785
554#ifdef KEYSYM_RESOURCE 786#ifdef KEYSYM_RESOURCE
555 keyboard->register_done (); 787 keyboard->register_done ();
556#endif 788#endif
557 789
558#ifdef HAVE_SCROLLBARS 790 if (const char *path = rs[Rs_chdir])
791 if (*path) // ignored if empty
792 {
793 if (*path != '/')
794 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
795
796 if (chdir (path))
797 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
798 }
799
559 if (option (Opt_scrollBar)) 800 if (option (Opt_scrollBar))
560 scrollBar.setIdle (); /* set existence for size calculations */ 801 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
561#endif
562 802
563 pty = ptytty::create (); 803 pty = ptytty::create ();
564 804
565 create_windows (argc, argv); 805 create_windows (argc, argv);
566 806
567 init_xlocale (); 807 init_xlocale ();
568 808
569 scr_reset (); // initialize screen 809 scr_poweron (); // initialize screen
570 810
571#if 0 811#if 0
572 XSynchronize (dpy, True); 812 XSynchronize (dpy, True);
573#endif 813#endif
574 814
575#ifdef HAVE_SCROLLBARS
576 if (option (Opt_scrollBar)) 815 if (option (Opt_scrollBar))
577 resize_scrollbar (); /* create and map scrollbar */ 816 scrollBar.resize (); /* create and map scrollbar */
578#endif 817
579#ifdef HAVE_BG_PIXMAP 818#ifdef HAVE_BG_PIXMAP
580 { 819 bg_init ();
581 bgPixmap.set_target (this);
582 bgPixmap.invalidate ();
583
584#ifdef ENABLE_TRANSPARENCY
585 if (option (Opt_transparent))
586 {
587 bgPixmap.set_transparent ();
588
589#ifdef HAVE_AFTERIMAGE
590 if (rs [Rs_blurradius])
591 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
592#endif
593 if (ISSET_PIXCOLOR (Color_tint))
594 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
595
596 if (rs [Rs_shade])
597 bgPixmap.set_shade (rs [Rs_shade]);
598
599 bgPixmap.set_root_pixmap ();
600 XSelectInput (dpy, display->root, PropertyChangeMask);
601 rootwin_ev.start (display, display->root);
602 }
603#endif
604
605#ifdef BG_IMAGE_FROM_FILE
606 if (rs[Rs_backgroundPixmap])
607 {
608 const char *p = rs[Rs_backgroundPixmap];
609
610 if ((p = strchr (p, ';')) != 0)
611 {
612 p++;
613 bgPixmap.set_geometry (p);
614 }
615 else
616 bgPixmap.set_defaultGeometry ();
617
618 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
619 if (!bgPixmap.window_position_sensitive ())
620 update_background ();
621 }
622#endif
623 }
624#endif 820#endif
625 821
626#if ENABLE_PERL 822#if ENABLE_PERL
627 rootwin_ev.start (display, display->root); 823 rootwin_ev.start (display, display->root);
628#endif 824#endif
629 825
630 set_colorfgbg (); 826 init_done = 1;
631 827
632 init_command (cmd_argv); 828 init_command (cmd_argv);
633
634 free (cmd_argv);
635 829
636 if (pty->pty >= 0) 830 if (pty->pty >= 0)
637 pty_ev.start (pty->pty, ev::READ); 831 pty_ev.start (pty->pty, ev::READ);
638 832
639 HOOK_INVOKE ((this, HOOK_START, DT_END)); 833 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
641#if ENABLE_XEMBED 835#if ENABLE_XEMBED
642 if (rs[Rs_embed]) 836 if (rs[Rs_embed])
643 { 837 {
644 long info[2] = { 0, XEMBED_MAPPED }; 838 long info[2] = { 0, XEMBED_MAPPED };
645 839
646 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 840 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
647 32, PropModeReplace, (unsigned char *)&info, 2); 841 32, PropModeReplace, (unsigned char *)&info, 2);
648 } 842 }
649#endif 843#endif
650 844
845#if HAVE_STARTUP_NOTIFICATION
846 SnDisplay *snDisplay;
847 SnLauncheeContext *snContext;
848
849 snDisplay = sn_display_new (dpy, NULL, NULL);
850 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
851
852 /* Tell the window manager that this window is part of the startup context */
853 if (snContext)
854 sn_launchee_context_setup_window (snContext, parent);
855#endif
856
651 XMapWindow (dpy, vt); 857 XMapWindow (dpy, vt);
652 XMapWindow (dpy, parent[0]); 858 XMapWindow (dpy, parent);
859
860#if HAVE_STARTUP_NOTIFICATION
861 if (snContext)
862 {
863 /* Mark the startup process as complete */
864 sn_launchee_context_complete (snContext);
865
866 sn_launchee_context_unref (snContext);
867 }
868
869 sn_display_unref (snDisplay);
870#endif
653 871
654 refresh_check (); 872 refresh_check ();
655} 873}
656 874
657/*----------------------------------------------------------------------*/ 875/*----------------------------------------------------------------------*/
658void 876void
659rxvt_term::init_env () 877rxvt_term::init_env ()
660{ 878{
661 int i;
662 char *val; 879 char *val;
880 char *env_display;
881 char *env_windowid;
882 char *env_colorfgbg;
883 char *env_term;
663 884
664#ifdef DISPLAY_IS_IP 885#ifdef DISPLAY_IS_IP
665 /* Fixup display_name for export over pty to any interested terminal 886 /* Fixup display_name for export over pty to any interested terminal
666 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 887 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
667 * (for the first non-loopback interface) that we get from 888 * (for the first non-loopback interface) that we get from
… …
680 val = XDisplayString (dpy); 901 val = XDisplayString (dpy);
681 902
682 if (rs[Rs_display_name] == NULL) 903 if (rs[Rs_display_name] == NULL)
683 rs[Rs_display_name] = val; /* use broken `:0' value */ 904 rs[Rs_display_name] = val; /* use broken `:0' value */
684 905
685 i = strlen (val);
686 env_display = (char *)rxvt_malloc (i + 9); 906 env_display = (char *)rxvt_malloc (strlen (val) + 9);
687 907
688 sprintf (env_display, "DISPLAY=%s", val); 908 sprintf (env_display, "DISPLAY=%s", val);
689 909
910 env_windowid = (char *)rxvt_malloc (21);
690 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 911 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
691 912
692 /* add entries to the environment: 913 /* add entries to the environment:
693 * @ DISPLAY: in case we started with -display 914 * @ DISPLAY: in case we started with -display
694 * @ WINDOWID: X window id number of the window 915 * @ WINDOWID: X window id number of the window
695 * @ COLORTERM: terminal sub-name and also indicates its color 916 * @ COLORTERM: terminal sub-name and also indicates its color
… …
698 * @ COLORFGBG: fg;bg color codes 919 * @ COLORFGBG: fg;bg color codes
699 */ 920 */
700 putenv (env_display); 921 putenv (env_display);
701 putenv (env_windowid); 922 putenv (env_windowid);
702 923
703 if (env_colorfgbg) 924 env_colorfgbg = get_colorfgbg ();
704 putenv (env_colorfgbg); 925 putenv (env_colorfgbg);
705 926
706#ifdef RXVT_TERMINFO 927#ifdef RXVT_TERMINFO
707 putenv ("TERMINFO=" RXVT_TERMINFO); 928 putenv ("TERMINFO=" RXVT_TERMINFO);
708#endif 929#endif
709 930
… …
728 unsetenv ("TERMCAP"); /* terminfo should be okay */ 949 unsetenv ("TERMCAP"); /* terminfo should be okay */
729#endif /* HAVE_UNSETENV */ 950#endif /* HAVE_UNSETENV */
730} 951}
731 952
732/*----------------------------------------------------------------------*/ 953/*----------------------------------------------------------------------*/
733/*
734 * This is more or less stolen straight from XFree86 xterm.
735 * This should support all European type languages.
736 */
737void 954void
738rxvt_term::set_locale (const char *locale) 955rxvt_term::set_locale (const char *locale)
739{ 956{
740 set_environ (envv); 957 set_environ (envv);
741 958
742#if HAVE_XSETLOCALE || HAVE_SETLOCALE
743 free (this->locale); 959 free (this->locale);
744 this->locale = setlocale (LC_CTYPE, locale); 960 this->locale = setlocale (LC_CTYPE, locale);
745 961
746 if (!this->locale) 962 if (!this->locale)
747 { 963 {
… …
758 974
759 975
760 this->locale = strdup (this->locale); 976 this->locale = strdup (this->locale);
761 SET_LOCALE (this->locale); 977 SET_LOCALE (this->locale);
762 mbstate.reset (); 978 mbstate.reset ();
763#endif
764 979
765#if HAVE_NL_LANGINFO 980#if HAVE_NL_LANGINFO
766 char *codeset = strdup (nl_langinfo (CODESET)); 981 char *codeset = nl_langinfo (CODESET);
767 // /^UTF.?8/i 982 // /^UTF.?8/i
768 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 983 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
769 && (codeset[1] == 'T' || codeset[1] == 't') 984 && (codeset[1] == 'T' || codeset[1] == 't')
770 && (codeset[2] == 'F' || codeset[2] == 'f') 985 && (codeset[2] == 'F' || codeset[2] == 'f')
771 && (codeset[3] == '8' || codeset[4] == '8'); 986 && (codeset[3] == '8' || codeset[4] == '8');
772 free (codeset);
773#else 987#else
774 enc_utf8 = 0; 988 enc_utf8 = 0;
775#endif 989#endif
776} 990}
777 991
778void 992void
779rxvt_term::init_xlocale () 993rxvt_term::init_xlocale ()
780{ 994{
781 set_environ (envv); 995 set_environ (envv);
782 996
783#ifdef USE_XIM 997#if USE_XIM
784 if (!locale) 998 if (!locale)
785 rxvt_warn ("setting locale failed, working without locale support.\n"); 999 rxvt_warn ("setting locale failed, continuing without locale support.\n");
786 else 1000 else
787 { 1001 {
788 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1002 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
789 1003
790 if (!XSupportsLocale ()) 1004 if (!XSupportsLocale ())
791 { 1005 {
792 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1006 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
793 return; 1007 return;
794 } 1008 }
795 1009
796 im_ev.start (display); 1010 im_ev.start (display);
797 1011
… …
838 run_command (argv); 1052 run_command (argv);
839} 1053}
840 1054
841/*----------------------------------------------------------------------*/ 1055/*----------------------------------------------------------------------*/
842void 1056void
843rxvt_term::Get_Colours () 1057rxvt_term::get_colours ()
844{ 1058{
845 int i; 1059 int i;
846 1060
847#ifdef OFF_FOCUS_FADING 1061#ifdef OFF_FOCUS_FADING
848 pix_colors = pix_colors_focused; 1062 pix_colors = pix_colors_focused;
… …
908 * get scrollBar shadow colors 1122 * get scrollBar shadow colors
909 * 1123 *
910 * The calculations of topShadow/bottomShadow values are adapted 1124 * The calculations of topShadow/bottomShadow values are adapted
911 * from the fvwm window manager. 1125 * from the fvwm window manager.
912 */ 1126 */
913#ifdef KEEP_SCROLLCOLOR 1127#ifdef RXVT_SCROLLBAR
914 if (depth <= 2) 1128 if (depth <= 2)
915 { 1129 {
916 /* Monochrome */ 1130 /* Monochrome */
917 alias_color (Color_scroll, Color_fg); 1131 alias_color (Color_scroll, Color_fg);
918 alias_color (Color_topShadow, Color_bg); 1132 alias_color (Color_topShadow, Color_bg);
… …
933 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1147 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
934 cscroll.a) 1148 cscroll.a)
935 )) 1149 ))
936 alias_color (Color_topShadow, Color_White); 1150 alias_color (Color_topShadow, Color_White);
937 } 1151 }
938#endif /* KEEP_SCROLLCOLOR */ 1152#endif
939 1153
940#ifdef OFF_FOCUS_FADING 1154#ifdef OFF_FOCUS_FADING
941 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1155 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
942 update_fade_color (i); 1156 update_fade_color (i);
943#endif 1157#endif
… …
946/*----------------------------------------------------------------------*/ 1160/*----------------------------------------------------------------------*/
947/* color aliases, fg/bg bright-bold */ 1161/* color aliases, fg/bg bright-bold */
948void 1162void
949rxvt_term::color_aliases (int idx) 1163rxvt_term::color_aliases (int idx)
950{ 1164{
951 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1165 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
952 { 1166 {
953 int i = atoi (rs[Rs_color + idx]); 1167 int i = atoi (rs[Rs_color + idx]);
954 1168
955 if (i >= 8 && i <= 15) 1169 if (i >= 8 && i <= 15)
956 /* bright colors */ 1170 /* bright colors */
… …
1048 1262
1049 if (i) 1263 if (i)
1050 ModMetaMask = modmasks[i - 1]; 1264 ModMetaMask = modmasks[i - 1];
1051} 1265}
1052 1266
1267void
1268rxvt_term::set_icon (const char *file)
1269{
1270#if HAVE_PIXBUF
1271 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1272 if (!pixbuf)
1273 {
1274 rxvt_warn ("Loading image icon failed, continuing without.\n");
1275 return;
1276 }
1277
1278 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1279 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1280
1281 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1282 {
1283 rxvt_warn ("Icon image too big, continuing without.\n");
1284 g_object_unref (pixbuf);
1285 return;
1286 }
1287
1288 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1289 {
1290 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1291 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1292 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1293
1294 buffer [0] = w;
1295 buffer [1] = h;
1296 for (int i = 0; i < h; i++)
1297 {
1298 for (int j = 0; j < w; j++)
1299 {
1300 unsigned char *pixel = row + j * channels;
1301 long value;
1302
1303 if (channels == 4)
1304 value = pixel[3];
1305 else
1306 value = (unsigned char)0x00ff;
1307
1308 value = (value << 8) + pixel[0];
1309 value = (value << 8) + pixel[1];
1310 value = (value << 8) + pixel[2];
1311 buffer[(i * w + j) + 2] = value;
1312 }
1313
1314 row += rowstride;
1315 }
1316
1317 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1318 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1319 free (buffer);
1320 }
1321 else
1322 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1323
1324 g_object_unref (pixbuf);
1325#endif
1326}
1327
1053/*----------------------------------------------------------------------*/ 1328/*----------------------------------------------------------------------*/
1054/* rxvt_Create_Windows () - Open and map the window */ 1329/* Open and map the window */
1055void 1330void
1056rxvt_term::create_windows (int argc, const char *const *argv) 1331rxvt_term::create_windows (int argc, const char *const *argv)
1057{ 1332{
1058 XClassHint classHint; 1333 XClassHint classHint;
1059 XWMHints wmHint; 1334 XWMHints wmHint;
… …
1065 Window top, parent; 1340 Window top, parent;
1066 1341
1067 dLocal (Display *, dpy); 1342 dLocal (Display *, dpy);
1068 1343
1069 /* grab colors before netscape does */ 1344 /* grab colors before netscape does */
1070 Get_Colours (); 1345 get_colours ();
1071 1346
1072 if (!set_fonts ()) 1347 if (!set_fonts ())
1073 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1348 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1074 1349
1075 parent = display->root; 1350 parent = display->root;
… …
1105 } 1380 }
1106#endif 1381#endif
1107 1382
1108 window_calc (0, 0); 1383 window_calc (0, 0);
1109 1384
1110 /* sub-window placement & size in rxvt_resize_subwindows () */ 1385 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1111 attributes.background_pixel = pix_colors_focused [Color_border]; 1386 attributes.background_pixel = pix_colors_focused [Color_border];
1112 attributes.border_pixel = pix_colors_focused [Color_border]; 1387 attributes.border_pixel = pix_colors_focused [Color_border];
1113 attributes.colormap = cmap; 1388 attributes.colormap = cmap;
1114 1389
1115 top = XCreateWindow (dpy, parent, 1390 top = XCreateWindow (dpy, parent,
… …
1118 ext_bwidth, 1393 ext_bwidth,
1119 depth, InputOutput, visual, 1394 depth, InputOutput, visual,
1120 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1395 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1121 &attributes); 1396 &attributes);
1122 1397
1123 this->parent[0] = top; 1398 this->parent = top;
1124 1399
1125 old_width = szHint.width; 1400 set_title (rs [Rs_title]);
1126 old_height = szHint.height; 1401 set_icon_name (rs [Rs_iconName]);
1127
1128 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1129 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1130 1402
1131 classHint.res_name = (char *)rs[Rs_name]; 1403 classHint.res_name = (char *)rs[Rs_name];
1132 classHint.res_class = (char *)RESCLASS; 1404 classHint.res_class = (char *)RESCLASS;
1133 1405
1134 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1406 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1135 wmHint.input = True; 1407 wmHint.input = True;
1136 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1408 wmHint.initial_state = option (Opt_iconic) ? IconicState
1409 : option (Opt_dockapp) ? WithdrawnState
1410 : NormalState;
1137 wmHint.window_group = top; 1411 wmHint.window_group = top;
1138 1412
1139 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1413 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1140 &szHint, &wmHint, &classHint); 1414 &szHint, &wmHint, &classHint);
1415#if ENABLE_EWMH
1416 /*
1417 * set up icon hint
1418 * rs [Rs_iconfile] is path to icon
1419 */
1420
1421 if (rs [Rs_iconfile])
1422 set_icon (rs [Rs_iconfile]);
1423#endif
1141 1424
1142#if ENABLE_FRILLS 1425#if ENABLE_FRILLS
1143 if (mwmhints.flags) 1426 if (mwmhints.flags)
1144 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1427 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1145 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1428 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1150#if ENABLE_EWMH 1433#if ENABLE_EWMH
1151 xa[XA_NET_WM_PING], 1434 xa[XA_NET_WM_PING],
1152#endif 1435#endif
1153 }; 1436 };
1154 1437
1155 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1438 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1156 1439
1157#if ENABLE_FRILLS 1440#if ENABLE_FRILLS
1158 if (rs[Rs_transient_for]) 1441 if (rs[Rs_transient_for])
1159 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1442 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1160#endif 1443#endif
… …
1183 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1466 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1184 1467
1185 /* the vt window */ 1468 /* the vt window */
1186 vt = XCreateSimpleWindow (dpy, top, 1469 vt = XCreateSimpleWindow (dpy, top,
1187 window_vt_x, window_vt_y, 1470 window_vt_x, window_vt_y,
1188 width, height, 1471 vt_width, vt_height,
1189 0, 1472 0,
1190 pix_colors_focused[Color_fg], 1473 pix_colors_focused[Color_fg],
1191 pix_colors_focused[Color_bg]); 1474 pix_colors_focused[Color_bg]);
1192 1475
1193 attributes.bit_gravity = NorthWestGravity; 1476 attributes.bit_gravity = NorthWestGravity;
… …
1221 pix_colors = pix_colors_unfocused; 1504 pix_colors = pix_colors_unfocused;
1222#endif 1505#endif
1223 1506
1224 pointer_unblank (); 1507 pointer_unblank ();
1225 scr_recolour (); 1508 scr_recolour ();
1226}
1227
1228/* ------------------------------------------------------------------------- *
1229 * GET TTY CURRENT STATE *
1230 * ------------------------------------------------------------------------- */
1231void
1232rxvt_get_ttymode (struct termios *tio, int erase)
1233{
1234 /*
1235 * standard System V termios interface
1236 */
1237 if (tcgetattr (STDIN_FILENO, tio) < 0)
1238 {
1239 // return error - use system defaults,
1240 // where possible, and zero elsewhere
1241 memset (tio, 0, sizeof (struct termios));
1242
1243 tio->c_cc[VINTR] = CINTR;
1244 tio->c_cc[VQUIT] = CQUIT;
1245 tio->c_cc[VERASE] = CERASE;
1246#ifdef VERASE2
1247 tio->c_cc[VERASE2] = CERASE2;
1248#endif
1249 tio->c_cc[VKILL] = CKILL;
1250 tio->c_cc[VSTART] = CSTART;
1251 tio->c_cc[VSTOP] = CSTOP;
1252 tio->c_cc[VSUSP] = CSUSP;
1253# ifdef VDSUSP
1254 tio->c_cc[VDSUSP] = CDSUSP;
1255# endif
1256# ifdef VREPRINT
1257 tio->c_cc[VREPRINT] = CRPRNT;
1258# endif
1259# ifdef VDISCRD
1260 tio->c_cc[VDISCRD] = CFLUSH;
1261# endif
1262# ifdef VWERSE
1263 tio->c_cc[VWERSE] = CWERASE;
1264# endif
1265# ifdef VLNEXT
1266 tio->c_cc[VLNEXT] = CLNEXT;
1267# endif
1268 }
1269
1270 tio->c_cc[VEOF] = CEOF;
1271 tio->c_cc[VEOL] = VDISABLE;
1272# ifdef VEOL2
1273 tio->c_cc[VEOL2] = VDISABLE;
1274# endif
1275# ifdef VSWTC
1276 tio->c_cc[VSWTC] = VDISABLE;
1277# endif
1278# ifdef VSWTCH
1279 tio->c_cc[VSWTCH] = VDISABLE;
1280# endif
1281# if VMIN != VEOF
1282 tio->c_cc[VMIN] = 1;
1283# endif
1284# if VTIME != VEOL
1285 tio->c_cc[VTIME] = 0;
1286# endif
1287
1288 if (erase != -1)
1289 tio->c_cc[VERASE] = (char)erase;
1290
1291 /* input modes */
1292 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1293# ifdef IMAXBEL
1294 | IMAXBEL
1295# endif
1296 | IXON);
1297
1298 /* output modes */
1299 tio->c_oflag = (OPOST | ONLCR);
1300
1301 /* control modes */
1302 tio->c_cflag = (CS8 | CREAD);
1303
1304 /* line discipline modes */
1305 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1306# if defined (ECHOCTL) && defined (ECHOKE)
1307 | ECHOCTL | ECHOKE
1308# endif
1309 | ECHOE | ECHOK);
1310
1311 /*
1312 * Debugging
1313 */
1314#ifdef DEBUG_TTYMODE
1315 /* c_iflag bits */
1316 fprintf (stderr, "Input flags\n");
1317
1318 /* cpp token stringize doesn't work on all machines <sigh> */
1319# define FOO(flag,name) \
1320 if ((tio->c_iflag) & flag) \
1321 fprintf (stderr, "%s ", name)
1322
1323 /* c_iflag bits */
1324 FOO (IGNBRK, "IGNBRK");
1325 FOO (BRKINT, "BRKINT");
1326 FOO (IGNPAR, "IGNPAR");
1327 FOO (PARMRK, "PARMRK");
1328 FOO (INPCK, "INPCK");
1329 FOO (ISTRIP, "ISTRIP");
1330 FOO (INLCR, "INLCR");
1331 FOO (IGNCR, "IGNCR");
1332 FOO (ICRNL, "ICRNL");
1333 FOO (IXON, "IXON");
1334 FOO (IXOFF, "IXOFF");
1335# ifdef IUCLC
1336 FOO (IUCLC, "IUCLC");
1337# endif
1338# ifdef IXANY
1339 FOO (IXANY, "IXANY");
1340# endif
1341# ifdef IMAXBEL
1342 FOO (IMAXBEL, "IMAXBEL");
1343# endif
1344
1345 fprintf (stderr, "\n");
1346
1347# undef FOO
1348# define FOO(entry, name) \
1349 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1350
1351 FOO (VINTR, "VINTR");
1352 FOO (VQUIT, "VQUIT");
1353 FOO (VERASE, "VERASE");
1354 FOO (VKILL, "VKILL");
1355 FOO (VEOF, "VEOF");
1356 FOO (VEOL, "VEOL");
1357# ifdef VEOL2
1358 FOO (VEOL2, "VEOL2");
1359# endif
1360# ifdef VSWTC
1361 FOO (VSWTC, "VSWTC");
1362# endif
1363# ifdef VSWTCH
1364 FOO (VSWTCH, "VSWTCH");
1365# endif
1366 FOO (VSTART, "VSTART");
1367 FOO (VSTOP, "VSTOP");
1368 FOO (VSUSP, "VSUSP");
1369# ifdef VDSUSP
1370 FOO (VDSUSP, "VDSUSP");
1371# endif
1372# ifdef VREPRINT
1373 FOO (VREPRINT, "VREPRINT");
1374# endif
1375# ifdef VDISCRD
1376 FOO (VDISCRD, "VDISCRD");
1377# endif
1378# ifdef VWERSE
1379 FOO (VWERSE, "VWERSE");
1380# endif
1381# ifdef VLNEXT
1382 FOO (VLNEXT, "VLNEXT");
1383# endif
1384
1385 fprintf (stderr, "\n");
1386# undef FOO
1387#endif /* DEBUG_TTYMODE */
1388} 1509}
1389 1510
1390/*----------------------------------------------------------------------*/ 1511/*----------------------------------------------------------------------*/
1391/* 1512/*
1392 * Run the command in a subprocess and return a file descriptor for the 1513 * Run the command in a subprocess and return a file descriptor for the
… …
1404 if (pty->pty >= 0) 1525 if (pty->pty >= 0)
1405 { 1526 {
1406 if (getfd_hook) 1527 if (getfd_hook)
1407 pty->pty = (*getfd_hook) (pty->pty); 1528 pty->pty = (*getfd_hook) (pty->pty);
1408 1529
1409 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1530 if (pty->pty < 0)
1410 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1531 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1411 } 1532 }
1412 } 1533 }
1413 else 1534 else
1414#endif 1535#endif
1415 if (!pty->get ()) 1536 if (!pty->get ())
1416 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1537 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1417 1538
1418 int er; 1539 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1540
1541 struct termios tio = def_tio;
1419 1542
1420#ifndef NO_BACKSPACE_KEY 1543#ifndef NO_BACKSPACE_KEY
1421 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1544 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1422 er = rs[Rs_backspace_key][0]; 1545 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1423 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1546 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1424 er = '\177'; /* the initial state anyway */ 1547 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1425 else
1426#endif 1548#endif
1427 er = -1;
1428 1549
1429 rxvt_get_ttymode (&tio, er);
1430 /* init terminal attributes */ 1550 /* init terminal attributes */
1431 cfsetospeed (&tio, BAUDRATE); 1551 cfsetospeed (&tio, BAUDRATE);
1432 cfsetispeed (&tio, BAUDRATE); 1552 cfsetispeed (&tio, BAUDRATE);
1433 tcsetattr (pty->tty, TCSANOW, &tio); 1553 tcsetattr (pty->tty, TCSANOW, &tio);
1434 pty->set_utf8_mode (enc_utf8); 1554 pty->set_utf8_mode (enc_utf8);
… …
1474 1594
1475 _exit (EXIT_FAILURE); 1595 _exit (EXIT_FAILURE);
1476 1596
1477 default: 1597 default:
1478 if (!option (Opt_utmpInhibit)) 1598 if (!option (Opt_utmpInhibit))
1599 {
1600#ifdef LOG_ONLY_ON_LOGIN
1601 bool login_shell = option (Opt_loginShell);
1602#else
1603 bool login_shell = true;
1604#endif
1479 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1605 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1606 }
1480 1607
1481 pty->close_tty (); 1608 pty->close_tty ();
1482 1609
1483 child_ev.start (cmd_pid); 1610 child_ev.start (cmd_pid);
1484 1611
… …
1509#elif defined (SRIOCSREDIR) 1636#elif defined (SRIOCSREDIR)
1510 int fd; 1637 int fd;
1511 1638
1512 fd = open (CONSOLE, O_WRONLY, 0); 1639 fd = open (CONSOLE, O_WRONLY, 0);
1513 if (fd >= 0) 1640 if (fd >= 0)
1514 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1641 {
1642 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1515 close (fd); 1643 close (fd);
1644 }
1516#endif /* SRIOCSREDIR */ 1645#endif /* SRIOCSREDIR */
1517 } 1646 }
1518 1647
1519 /* reset signals and spin off the command interpreter */ 1648 /* reset signals and spin off the command interpreter */
1520 signal (SIGINT, SIG_DFL); 1649 signal (SIGINT, SIG_DFL);
1521 signal (SIGQUIT, SIG_DFL); 1650 signal (SIGQUIT, SIG_DFL);
1522 signal (SIGCHLD, SIG_DFL); 1651 signal (SIGCHLD, SIG_DFL);
1523 signal (SIGHUP, SIG_DFL); 1652 signal (SIGHUP, SIG_DFL);
1524 signal (SIGPIPE, SIG_DFL); 1653 signal (SIGPIPE, SIG_DFL);
1525 /* 1654 /*
1526 * mimick login's behavior by disabling the job control signals 1655 * mimic login's behavior by disabling the job control signals
1527 * a shell that wants them can turn them back on 1656 * a shell that wants them can turn them back on
1528 */ 1657 */
1529#ifdef SIGTSTP 1658#ifdef SIGTSTP
1530 signal (SIGTSTP, SIG_IGN); 1659 signal (SIGTSTP, SIG_IGN);
1531 signal (SIGTTIN, SIG_IGN); 1660 signal (SIGTTIN, SIG_IGN);
1532 signal (SIGTTOU, SIG_IGN); 1661 signal (SIGTTOU, SIG_IGN);
1533#endif /* SIGTSTP */ 1662#endif /* SIGTSTP */
1534 1663
1535 // unblock signals (signals are blocked by iom.C
1536 sigset_t ss;
1537 sigemptyset (&ss);
1538 sigprocmask (SIG_SETMASK, &ss, 0);
1539
1540 /* command interpreter path */ 1664 /* command interpreter path */
1541 if (argv) 1665 if (argv)
1542 { 1666 {
1543# ifdef DEBUG_CMD 1667# ifdef DEBUG_CMD
1544 int i; 1668 int i;
… …
1555 const char *argv0, *shell; 1679 const char *argv0, *shell;
1556 1680
1557 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1681 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1558 shell = "/bin/sh"; 1682 shell = "/bin/sh";
1559 1683
1560 argv0 = (const char *)rxvt_basename (shell); 1684 argv0 = rxvt_basename (shell);
1561 1685
1562 if (option (Opt_loginShell)) 1686 if (option (Opt_loginShell))
1563 { 1687 {
1564 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1688 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1565 1689

Diff Legend

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