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.242 by ayin, Mon Jan 21 14:52:44 2008 UTC vs.
Revision 1.340 by root, Sat Dec 13 12:24:32 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-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 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} 563 set_option (Opt_buffered);
314
315static void
316init_secondary ()
317{
318 int i;
319
320 if ((i = open ("/dev/null", O_RDONLY)) < 0)
321 {
322 dup2 (STDERR_FILENO, STDIN_FILENO);
323 }
324 else if (i != STDIN_FILENO)
325 {
326 dup2 (i, STDIN_FILENO);
327 close (i);
328 }
329
330 dup2 (STDERR_FILENO, STDOUT_FILENO);
331} 564}
332 565
333/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
334const char ** 567const char **
335rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
336{ 569{
337 int i, r_argc; 570 int i;
338 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
339
340 /*
341 * Look for -e option. Find => split and make cmd_argv[] of command args
342 */
343 for (r_argc = 0; r_argc < argc; r_argc++)
344 if (!strcmp (argv[r_argc], "-e"))
345 break;
346
347 if (r_argc == argc)
348 cmd_argv = NULL;
349 else if (!argv[r_argc + 1])
350 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
351 else
352 {
353 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
354
355 for (i = 0; i < argc - r_argc - 1; i++)
356 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
357
358 cmd_argv[i] = NULL;
359 }
360
361 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
362
363 for (i = 0; i < r_argc; i++)
364 r_argv[i] = (const char *)argv[i];
365
366 r_argv[i] = NULL;
367 572
368 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
369 574
370 /* 575 /*
371 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
372 */ 577 */
373 578
374 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
375 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
376 581
377 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
378 583
379 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
380 {
381 free (r_argv);
382 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]);
383 }
384 586
385 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
386 xa = display->xa; 588 xa = display->xa;
387 589
388 set (display); 590 set (display);
389 extract_resources (); 591 extract_resources ();
390 592
391#if XFT 593#if ENABLE_FRILLS
392 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
393 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));
394#endif 598#endif
395
396#ifdef HAVE_AFTERIMAGE
397 set_application_name ((char*)rs[Rs_name]);
398 set_output_threshold (OUTPUT_LEVEL_WARNING);
399 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
400#endif
401 free (r_argv);
402 599
403 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
404 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
405 rs [i] = 0; 602 rs [i] = 0;
406 603
… …
414 { 611 {
415 rxvt_perl.init (this); 612 rxvt_perl.init (this);
416 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
417 } 614 }
418#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 ();
419 620
420 /* 621 /*
421 * set any defaults not already set 622 * set any defaults not already set
422 */ 623 */
423 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
424 { 625 {
425 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
426 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
427 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
428 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
429 } 631 }
430 else 632 else
431 { 633 {
432 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
433 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
434 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
435 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
436 } 639 }
437 640
438 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
445 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)
446 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
447 650
448 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
449 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]);
450#endif 656#endif
451 657
452#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
453 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
454 pointerBlankDelay = i; 660 pointerBlankDelay = i;
455 else 661 else
456 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
457#endif 663#endif
458 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
459 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
460 if (!saveLines) 673 if (!saveLines)
461 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
462
463#ifdef PRINTPIPE
464 if (!rs[Rs_print_pipe])
465 rs[Rs_print_pipe] = PRINTPIPE;
466#endif
467 675
468 if (!rs[Rs_cutchars]) 676 if (!rs[Rs_cutchars])
469 rs[Rs_cutchars] = CUTCHARS; 677 rs[Rs_cutchars] = CUTCHARS;
470 678
471#ifndef NO_BACKSPACE_KEY 679#ifndef NO_BACKSPACE_KEY
… …
484# else 692# else
485 rs[Rs_delete_key] = "\033[3~"; 693 rs[Rs_delete_key] = "\033[3~";
486# endif 694# endif
487#endif 695#endif
488 696
489#ifdef HAVE_SCROLLBARS 697 scrollBar.setup (this);
490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
491#endif
492 698
493#ifdef XTERM_REVERSE_VIDEO 699#ifdef XTERM_REVERSE_VIDEO
494 /* this is how xterm implements reverseVideo */ 700 /* this is how xterm implements reverseVideo */
495 if (option (Opt_reverseVideo)) 701 if (option (Opt_reverseVideo))
496 { 702 {
… …
534 return cmd_argv; 740 return cmd_argv;
535} 741}
536 742
537/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
538void 744void
539rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
540{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
541 this->envv = envv; 751 this->envv = envv;
542 752
753 env = new char *[this->envv->size ()];
754 for (int i = 0; i < this->envv->size (); i++)
755 env[i] = this->envv->at (i);
756
757 init2 (argv->size () - 1, argv->begin ());
758}
759
760void
761rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
762{
763#if ENABLE_PERL
764 // perl might want to access the stringvecs later, so we need to copy them
765 stringvec *args = new stringvec;
766 for (int i = 0; i < argc; i++)
767 args->push_back (strdup (argv [i]));
768
769 stringvec *envs = new stringvec;
770 for (const char *const *var = envv; *var; var++)
771 envs->push_back (strdup (*var));
772
773 init (args, envs);
774#else
775 init2 (argc, argv);
776#endif
777}
778
779void
780rxvt_term::init2 (int argc, const char *const *argv)
781{
543 SET_R (this); 782 SET_R (this);
544 set_locale (""); 783 set_locale ("");
545 set_environ (envv); // few things in X do not call setlocale :( 784 set_environ (env); // a few things in X do not call setlocale :(
546 785
547 init_vars (); 786 init_vars ();
548
549 init_secondary ();
550 787
551 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
552 789
553#ifdef KEYSYM_RESOURCE 790#ifdef KEYSYM_RESOURCE
554 keyboard->register_done (); 791 keyboard->register_done ();
555#endif 792#endif
556 793
557#ifdef HAVE_SCROLLBARS 794 if (const char *path = rs[Rs_chdir])
795 if (*path) // ignored if empty
796 {
797 if (*path != '/')
798 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
799
800 if (chdir (path))
801 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
802 }
803
558 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
559 scrollBar.setIdle (); /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
560#endif
561 806
562 pty = ptytty::create (); 807 pty = ptytty::create ();
563 808
564 create_windows (argc, argv); 809 create_windows (argc, argv);
565 810
566 init_xlocale (); 811 init_xlocale ();
567 812
568 scr_reset (); // initialize screen 813 scr_poweron (); // initialize screen
569 814
570#if 0 815#if 0
571 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
572#endif 817#endif
573 818
574#ifdef HAVE_SCROLLBARS
575 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
576 resize_scrollbar (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
577#endif 821
578#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
579 { 823 bg_init ();
580 bgPixmap.set_target (this);
581 bgPixmap.invalidate ();
582
583#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent))
585 {
586 bgPixmap.set_transparent ();
587
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
591#endif
592 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
594
595 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]);
597
598 bgPixmap.set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root);
601 }
602#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 }
623#endif 824#endif
624 825
625#if ENABLE_PERL 826#if ENABLE_PERL
626 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
627#endif 828#endif
628 829
629 set_colorfgbg (); 830 init_done = 1;
630 831
631 init_command (cmd_argv); 832 init_command (cmd_argv);
632
633 free (cmd_argv);
634 833
635 if (pty->pty >= 0) 834 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
637 836
638 HOOK_INVOKE ((this, HOOK_START, DT_END)); 837 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
640#if ENABLE_XEMBED 839#if ENABLE_XEMBED
641 if (rs[Rs_embed]) 840 if (rs[Rs_embed])
642 { 841 {
643 long info[2] = { 0, XEMBED_MAPPED }; 842 long info[2] = { 0, XEMBED_MAPPED };
644 843
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 844 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2); 845 32, PropModeReplace, (unsigned char *)&info, 2);
647 } 846 }
648#endif 847#endif
649 848
849#if HAVE_STARTUP_NOTIFICATION
850 SnDisplay *snDisplay;
851 SnLauncheeContext *snContext;
852
853 snDisplay = sn_display_new (dpy, NULL, NULL);
854 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
855
856 /* Tell the window manager that this window is part of the startup context */
857 if (snContext)
858 sn_launchee_context_setup_window (snContext, parent);
859#endif
860
650 XMapWindow (dpy, vt); 861 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]); 862 XMapWindow (dpy, parent);
863
864#if HAVE_STARTUP_NOTIFICATION
865 if (snContext)
866 {
867 /* Mark the startup process as complete */
868 sn_launchee_context_complete (snContext);
869
870 sn_launchee_context_unref (snContext);
871 }
872
873 sn_display_unref (snDisplay);
874#endif
652 875
653 refresh_check (); 876 refresh_check ();
654} 877}
655 878
656/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
657void 880void
658rxvt_term::init_env () 881rxvt_term::init_env ()
659{ 882{
660 int i;
661 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
662 888
663#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
664 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 891 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
666 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
679 val = XDisplayString (dpy); 905 val = XDisplayString (dpy);
680 906
681 if (rs[Rs_display_name] == NULL) 907 if (rs[Rs_display_name] == NULL)
682 rs[Rs_display_name] = val; /* use broken `:0' value */ 908 rs[Rs_display_name] = val; /* use broken `:0' value */
683 909
684 i = strlen (val);
685 env_display = (char *)rxvt_malloc (i + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
686 911
687 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
688 913
914 env_windowid = (char *)rxvt_malloc (21);
689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
690 916
691 /* add entries to the environment: 917 /* add entries to the environment:
692 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
693 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
694 * @ COLORTERM: terminal sub-name and also indicates its color 920 * @ COLORTERM: terminal sub-name and also indicates its color
… …
697 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
698 */ 924 */
699 putenv (env_display); 925 putenv (env_display);
700 putenv (env_windowid); 926 putenv (env_windowid);
701 927
702 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
703 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
704 930
705#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
706 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
707#endif 933#endif
708 934
… …
727 unsetenv ("TERMCAP"); /* terminfo should be okay */ 953 unsetenv ("TERMCAP"); /* terminfo should be okay */
728#endif /* HAVE_UNSETENV */ 954#endif /* HAVE_UNSETENV */
729} 955}
730 956
731/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
732/*
733 * This is more or less stolen straight from XFree86 xterm.
734 * This should support all European type languages.
735 */
736void 958void
737rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
738{ 960{
739 set_environ (envv); 961 set_environ (env);
740 962
741#if HAVE_XSETLOCALE || HAVE_SETLOCALE
742 free (this->locale); 963 free (this->locale);
743 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
744 965
745 if (!this->locale) 966 if (!this->locale)
746 { 967 {
… …
757 978
758 979
759 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
760 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
761 mbstate.reset (); 982 mbstate.reset ();
762#endif
763 983
764#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
765 char *codeset = strdup (nl_langinfo (CODESET)); 985 char *codeset = nl_langinfo (CODESET);
766 // /^UTF.?8/i 986 // /^UTF.?8/i
767 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
768 && (codeset[1] == 'T' || codeset[1] == 't') 988 && (codeset[1] == 'T' || codeset[1] == 't')
769 && (codeset[2] == 'F' || codeset[2] == 'f') 989 && (codeset[2] == 'F' || codeset[2] == 'f')
770 && (codeset[3] == '8' || codeset[4] == '8'); 990 && (codeset[3] == '8' || codeset[4] == '8');
771 free (codeset);
772#else 991#else
773 enc_utf8 = 0; 992 enc_utf8 = 0;
774#endif 993#endif
775} 994}
776 995
777void 996void
778rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
779{ 998{
780 set_environ (envv); 999 set_environ (env);
781 1000
782#ifdef USE_XIM 1001#if USE_XIM
783 if (!locale) 1002 if (!locale)
784 rxvt_warn ("setting locale failed, working without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
785 else 1004 else
786 { 1005 {
787 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
788 1007
789 if (!XSupportsLocale ()) 1008 if (!XSupportsLocale ())
790 { 1009 {
791 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1010 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
792 return; 1011 return;
793 } 1012 }
794 1013
795 im_ev.start (display); 1014 im_ev.start (display);
796 1015
… …
837 run_command (argv); 1056 run_command (argv);
838} 1057}
839 1058
840/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
841void 1060void
842rxvt_term::Get_Colours () 1061rxvt_term::get_colors ()
843{ 1062{
844 int i; 1063 int i;
845 1064
846#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
847 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
848#endif 1067#endif
849 1068
850 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
851 { 1070 {
852 const char *name = rs[Rs_color + i]; 1071 const char *name = rs[Rs_color + i];
853 1072
854 if (!name) 1073 if (!name)
855 continue; 1074 continue;
… …
865#endif 1084#endif
866 name = def_colorName [i]; 1085 name = def_colorName [i];
867 1086
868 if (!name) 1087 if (!name)
869 continue; 1088 continue;
1089
1090 xcol.free (this);
870 1091
871 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
872 { 1093 {
873 switch (i) 1094 switch (i)
874 { 1095 {
… …
894 1115
895 pix_colors[i] = xcol; 1116 pix_colors[i] = xcol;
896 rs[Rs_color + i] = name; 1117 rs[Rs_color + i] = name;
897 } 1118 }
898 1119
899 if (depth <= 2)
900 {
901 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
902 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
903 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
904 }
905
906 /* 1120 /*
907 * get scrollBar shadow colors 1121 * get scrollBar shadow colors
908 * 1122 *
909 * The calculations of topShadow/bottomShadow values are adapted 1123 * The calculations of topShadow/bottomShadow values are adapted
910 * from the fvwm window manager. 1124 * from the fvwm window manager.
911 */ 1125 */
912#ifdef KEEP_SCROLLCOLOR 1126#ifdef RXVT_SCROLLBAR
913 if (depth <= 2)
914 {
915 /* Monochrome */
916 alias_color (Color_scroll, Color_fg);
917 alias_color (Color_topShadow, Color_bg);
918 alias_color (Color_bottomShadow, Color_bg);
919 }
920 else
921 {
922 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1127 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
923 1128
924 rgba cscroll; 1129 rgba cscroll;
925 pix_colors [Color_scroll].get (cscroll); 1130 pix_colors [Color_scroll].get (cscroll);
926 1131
927 /* topShadowColor */ 1132 /* topShadowColor */
928 if (!pix_colors[Color_topShadow].set (this, 1133 if (!pix_colors[Color_topShadow].set (this,
929 rgba ( 1134 rgba (
930 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1135 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
931 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1136 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
933 cscroll.a) 1138 cscroll.a)
934 )) 1139 ))
935 alias_color (Color_topShadow, Color_White); 1140 alias_color (Color_topShadow, Color_White);
936 } 1141#endif
937#endif /* KEEP_SCROLLCOLOR */
938 1142
939#ifdef OFF_FOCUS_FADING 1143#ifdef OFF_FOCUS_FADING
940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1144 for (i = 0; i < NRS_COLORS; i++)
941 update_fade_color (i); 1145 update_fade_color (i, true);
942#endif 1146#endif
943} 1147}
944 1148
945/*----------------------------------------------------------------------*/ 1149/*----------------------------------------------------------------------*/
946/* color aliases, fg/bg bright-bold */ 1150/* color aliases, fg/bg bright-bold */
947void 1151void
948rxvt_term::color_aliases (int idx) 1152rxvt_term::color_aliases (int idx)
949{ 1153{
950 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1154 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
951 { 1155 {
952 int i = atoi (rs[Rs_color + idx]); 1156 int i = atoi (rs[Rs_color + idx]);
953 1157
954 if (i >= 8 && i <= 15) 1158 if (i >= 8 && i <= 15)
955 /* bright colors */ 1159 /* bright colors */
… …
995 for (j = map->max_keypermod; j--; k++) 1199 for (j = map->max_keypermod; j--; k++)
996 { 1200 {
997 if (kc[k] == 0) 1201 if (kc[k] == 0)
998 break; 1202 break;
999 1203
1000 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1204 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1001 { 1205 {
1002 case XK_Num_Lock: 1206 case XK_Num_Lock:
1003 ModNumLockMask = modmasks[i - 1]; 1207 ModNumLockMask = modmasks[i - 1];
1004 continue; 1208 continue;
1005 1209
… …
1047 1251
1048 if (i) 1252 if (i)
1049 ModMetaMask = modmasks[i - 1]; 1253 ModMetaMask = modmasks[i - 1];
1050} 1254}
1051 1255
1256void
1257rxvt_term::set_icon (const char *file)
1258{
1259#if HAVE_PIXBUF
1260 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1261 if (!pixbuf)
1262 {
1263 rxvt_warn ("Loading image icon failed, continuing without.\n");
1264 return;
1265 }
1266
1267 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1268 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1269
1270 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1271 {
1272 rxvt_warn ("Icon image too big, continuing without.\n");
1273 g_object_unref (pixbuf);
1274 return;
1275 }
1276
1277 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1278 {
1279 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1280 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1281 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1282
1283 buffer [0] = w;
1284 buffer [1] = h;
1285 for (int i = 0; i < h; i++)
1286 {
1287 for (int j = 0; j < w; j++)
1288 {
1289 unsigned char *pixel = row + j * channels;
1290 long value;
1291
1292 if (channels == 4)
1293 value = pixel[3];
1294 else
1295 value = (unsigned char)0x00ff;
1296
1297 value = (value << 8) + pixel[0];
1298 value = (value << 8) + pixel[1];
1299 value = (value << 8) + pixel[2];
1300 buffer[(i * w + j) + 2] = value;
1301 }
1302
1303 row += rowstride;
1304 }
1305
1306 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1307 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1308 free (buffer);
1309 }
1310 else
1311 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1312
1313 g_object_unref (pixbuf);
1314#endif
1315}
1316
1052/*----------------------------------------------------------------------*/ 1317/*----------------------------------------------------------------------*/
1053/* rxvt_Create_Windows () - Open and map the window */ 1318/* Open and map the window */
1054void 1319void
1055rxvt_term::create_windows (int argc, const char *const *argv) 1320rxvt_term::create_windows (int argc, const char *const *argv)
1056{ 1321{
1057 XClassHint classHint; 1322 XClassHint classHint;
1058 XWMHints wmHint; 1323 XWMHints wmHint;
… …
1064 Window top, parent; 1329 Window top, parent;
1065 1330
1066 dLocal (Display *, dpy); 1331 dLocal (Display *, dpy);
1067 1332
1068 /* grab colors before netscape does */ 1333 /* grab colors before netscape does */
1069 Get_Colours (); 1334 get_colors ();
1070 1335
1071 if (!set_fonts ()) 1336 if (!set_fonts ())
1072 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1337 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1073 1338
1074 parent = display->root; 1339 parent = display->root;
… …
1104 } 1369 }
1105#endif 1370#endif
1106 1371
1107 window_calc (0, 0); 1372 window_calc (0, 0);
1108 1373
1109 /* sub-window placement & size in rxvt_resize_subwindows () */ 1374 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1110 attributes.background_pixel = pix_colors_focused [Color_border]; 1375 attributes.background_pixel = pix_colors_focused [Color_border];
1111 attributes.border_pixel = pix_colors_focused [Color_border]; 1376 attributes.border_pixel = pix_colors_focused [Color_border];
1112 attributes.colormap = cmap; 1377 attributes.colormap = cmap;
1113 1378
1114 top = XCreateWindow (dpy, parent, 1379 top = XCreateWindow (dpy, parent,
… …
1117 ext_bwidth, 1382 ext_bwidth,
1118 depth, InputOutput, visual, 1383 depth, InputOutput, visual,
1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1384 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1120 &attributes); 1385 &attributes);
1121 1386
1122 this->parent[0] = top; 1387 this->parent = top;
1123 1388
1124 old_width = szHint.width; 1389 set_title (rs [Rs_title]);
1125 old_height = szHint.height; 1390 set_icon_name (rs [Rs_iconName]);
1126
1127 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1128 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1129 1391
1130 classHint.res_name = (char *)rs[Rs_name]; 1392 classHint.res_name = (char *)rs[Rs_name];
1131 classHint.res_class = (char *)RESCLASS; 1393 classHint.res_class = (char *)RESCLASS;
1132 1394
1133 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1395 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1134 wmHint.input = True; 1396 wmHint.input = True;
1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1397 wmHint.initial_state = option (Opt_iconic) ? IconicState
1398 : option (Opt_dockapp) ? WithdrawnState
1399 : NormalState;
1136 wmHint.window_group = top; 1400 wmHint.window_group = top;
1137 1401
1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1402 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1139 &szHint, &wmHint, &classHint); 1403 &szHint, &wmHint, &classHint);
1404#if ENABLE_EWMH
1405 /*
1406 * set up icon hint
1407 * rs [Rs_iconfile] is path to icon
1408 */
1409
1410 if (rs [Rs_iconfile])
1411 set_icon (rs [Rs_iconfile]);
1412#endif
1140 1413
1141#if ENABLE_FRILLS 1414#if ENABLE_FRILLS
1142 if (mwmhints.flags) 1415 if (mwmhints.flags)
1143 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1416 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1144 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1417 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1149#if ENABLE_EWMH 1422#if ENABLE_EWMH
1150 xa[XA_NET_WM_PING], 1423 xa[XA_NET_WM_PING],
1151#endif 1424#endif
1152 }; 1425 };
1153 1426
1154 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1427 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1155 1428
1156#if ENABLE_FRILLS 1429#if ENABLE_FRILLS
1157 if (rs[Rs_transient_for]) 1430 if (rs[Rs_transient_for])
1158 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1431 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1159#endif 1432#endif
… …
1182 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1455 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1183 1456
1184 /* the vt window */ 1457 /* the vt window */
1185 vt = XCreateSimpleWindow (dpy, top, 1458 vt = XCreateSimpleWindow (dpy, top,
1186 window_vt_x, window_vt_y, 1459 window_vt_x, window_vt_y,
1187 width, height, 1460 vt_width, vt_height,
1188 0, 1461 0,
1189 pix_colors_focused[Color_fg], 1462 pix_colors_focused[Color_fg],
1190 pix_colors_focused[Color_bg]); 1463 pix_colors_focused[Color_bg]);
1191 1464
1192 attributes.bit_gravity = NorthWestGravity; 1465 attributes.bit_gravity = NorthWestGravity;
… …
1219 if (rs[Rs_fade]) 1492 if (rs[Rs_fade])
1220 pix_colors = pix_colors_unfocused; 1493 pix_colors = pix_colors_unfocused;
1221#endif 1494#endif
1222 1495
1223 pointer_unblank (); 1496 pointer_unblank ();
1224 scr_recolour (); 1497 scr_recolor ();
1225}
1226
1227/* ------------------------------------------------------------------------- *
1228 * GET TTY CURRENT STATE *
1229 * ------------------------------------------------------------------------- */
1230void
1231rxvt_get_ttymode (struct termios *tio, int erase)
1232{
1233 /*
1234 * standard System V termios interface
1235 */
1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1237 {
1238 // return error - use system defaults,
1239 // where possible, and zero elsewhere
1240 memset (tio, 0, sizeof (struct termios));
1241
1242 tio->c_cc[VINTR] = CINTR;
1243 tio->c_cc[VQUIT] = CQUIT;
1244 tio->c_cc[VERASE] = CERASE;
1245#ifdef VERASE2
1246 tio->c_cc[VERASE2] = CERASE2;
1247#endif
1248 tio->c_cc[VKILL] = CKILL;
1249 tio->c_cc[VSTART] = CSTART;
1250 tio->c_cc[VSTOP] = CSTOP;
1251 tio->c_cc[VSUSP] = CSUSP;
1252# ifdef VDSUSP
1253 tio->c_cc[VDSUSP] = CDSUSP;
1254# endif
1255# ifdef VREPRINT
1256 tio->c_cc[VREPRINT] = CRPRNT;
1257# endif
1258# ifdef VDISCRD
1259 tio->c_cc[VDISCRD] = CFLUSH;
1260# endif
1261# ifdef VWERSE
1262 tio->c_cc[VWERSE] = CWERASE;
1263# endif
1264# ifdef VLNEXT
1265 tio->c_cc[VLNEXT] = CLNEXT;
1266# endif
1267 }
1268
1269 tio->c_cc[VEOF] = CEOF;
1270 tio->c_cc[VEOL] = VDISABLE;
1271# ifdef VEOL2
1272 tio->c_cc[VEOL2] = VDISABLE;
1273# endif
1274# ifdef VSWTC
1275 tio->c_cc[VSWTC] = VDISABLE;
1276# endif
1277# ifdef VSWTCH
1278 tio->c_cc[VSWTCH] = VDISABLE;
1279# endif
1280# if VMIN != VEOF
1281 tio->c_cc[VMIN] = 1;
1282# endif
1283# if VTIME != VEOL
1284 tio->c_cc[VTIME] = 0;
1285# endif
1286
1287 if (erase != -1)
1288 tio->c_cc[VERASE] = (char)erase;
1289
1290 /* input modes */
1291 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1292# ifdef IMAXBEL
1293 | IMAXBEL
1294# endif
1295 | IXON);
1296
1297 /* output modes */
1298 tio->c_oflag = (OPOST | ONLCR);
1299
1300 /* control modes */
1301 tio->c_cflag = (CS8 | CREAD);
1302
1303 /* line discipline modes */
1304 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1305# if defined (ECHOCTL) && defined (ECHOKE)
1306 | ECHOCTL | ECHOKE
1307# endif
1308 | ECHOE | ECHOK);
1309
1310 /*
1311 * Debugging
1312 */
1313#ifdef DEBUG_TTYMODE
1314 /* c_iflag bits */
1315 fprintf (stderr, "Input flags\n");
1316
1317 /* cpp token stringize doesn't work on all machines <sigh> */
1318# define FOO(flag,name) \
1319 if ((tio->c_iflag) & flag) \
1320 fprintf (stderr, "%s ", name)
1321
1322 /* c_iflag bits */
1323 FOO (IGNBRK, "IGNBRK");
1324 FOO (BRKINT, "BRKINT");
1325 FOO (IGNPAR, "IGNPAR");
1326 FOO (PARMRK, "PARMRK");
1327 FOO (INPCK, "INPCK");
1328 FOO (ISTRIP, "ISTRIP");
1329 FOO (INLCR, "INLCR");
1330 FOO (IGNCR, "IGNCR");
1331 FOO (ICRNL, "ICRNL");
1332 FOO (IXON, "IXON");
1333 FOO (IXOFF, "IXOFF");
1334# ifdef IUCLC
1335 FOO (IUCLC, "IUCLC");
1336# endif
1337# ifdef IXANY
1338 FOO (IXANY, "IXANY");
1339# endif
1340# ifdef IMAXBEL
1341 FOO (IMAXBEL, "IMAXBEL");
1342# endif
1343
1344 fprintf (stderr, "\n");
1345
1346# undef FOO
1347# define FOO(entry, name) \
1348 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1349
1350 FOO (VINTR, "VINTR");
1351 FOO (VQUIT, "VQUIT");
1352 FOO (VERASE, "VERASE");
1353 FOO (VKILL, "VKILL");
1354 FOO (VEOF, "VEOF");
1355 FOO (VEOL, "VEOL");
1356# ifdef VEOL2
1357 FOO (VEOL2, "VEOL2");
1358# endif
1359# ifdef VSWTC
1360 FOO (VSWTC, "VSWTC");
1361# endif
1362# ifdef VSWTCH
1363 FOO (VSWTCH, "VSWTCH");
1364# endif
1365 FOO (VSTART, "VSTART");
1366 FOO (VSTOP, "VSTOP");
1367 FOO (VSUSP, "VSUSP");
1368# ifdef VDSUSP
1369 FOO (VDSUSP, "VDSUSP");
1370# endif
1371# ifdef VREPRINT
1372 FOO (VREPRINT, "VREPRINT");
1373# endif
1374# ifdef VDISCRD
1375 FOO (VDISCRD, "VDISCRD");
1376# endif
1377# ifdef VWERSE
1378 FOO (VWERSE, "VWERSE");
1379# endif
1380# ifdef VLNEXT
1381 FOO (VLNEXT, "VLNEXT");
1382# endif
1383
1384 fprintf (stderr, "\n");
1385# undef FOO
1386#endif /* DEBUG_TTYMODE */
1387} 1498}
1388 1499
1389/*----------------------------------------------------------------------*/ 1500/*----------------------------------------------------------------------*/
1390/* 1501/*
1391 * Run the command in a subprocess and return a file descriptor for the 1502 * Run the command in a subprocess and return a file descriptor for the
… …
1403 if (pty->pty >= 0) 1514 if (pty->pty >= 0)
1404 { 1515 {
1405 if (getfd_hook) 1516 if (getfd_hook)
1406 pty->pty = (*getfd_hook) (pty->pty); 1517 pty->pty = (*getfd_hook) (pty->pty);
1407 1518
1408 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1519 if (pty->pty < 0)
1409 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1520 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1410 } 1521 }
1411 } 1522 }
1412 else 1523 else
1413#endif 1524#endif
1414 if (!pty->get ()) 1525 if (!pty->get ())
1415 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1526 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1416 1527
1417 int er; 1528 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1529
1530 struct termios tio = def_tio;
1418 1531
1419#ifndef NO_BACKSPACE_KEY 1532#ifndef NO_BACKSPACE_KEY
1420 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1533 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1421 er = rs[Rs_backspace_key][0]; 1534 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1422 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1535 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1423 er = '\177'; /* the initial state anyway */ 1536 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1424 else
1425#endif 1537#endif
1426 er = -1;
1427 1538
1428 rxvt_get_ttymode (&tio, er);
1429 /* init terminal attributes */ 1539 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE); 1540 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE); 1541 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio); 1542 tcsetattr (pty->tty, TCSANOW, &tio);
1433 pty->set_utf8_mode (enc_utf8); 1543 pty->set_utf8_mode (enc_utf8);
… …
1473 1583
1474 _exit (EXIT_FAILURE); 1584 _exit (EXIT_FAILURE);
1475 1585
1476 default: 1586 default:
1477 if (!option (Opt_utmpInhibit)) 1587 if (!option (Opt_utmpInhibit))
1588 {
1589#ifdef LOG_ONLY_ON_LOGIN
1590 bool login_shell = option (Opt_loginShell);
1591#else
1592 bool login_shell = true;
1593#endif
1478 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1594 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1595 }
1479 1596
1480 pty->close_tty (); 1597 pty->close_tty ();
1481 1598
1482 child_ev.start (cmd_pid); 1599 child_ev.start (cmd_pid);
1483 1600
… …
1508#elif defined (SRIOCSREDIR) 1625#elif defined (SRIOCSREDIR)
1509 int fd; 1626 int fd;
1510 1627
1511 fd = open (CONSOLE, O_WRONLY, 0); 1628 fd = open (CONSOLE, O_WRONLY, 0);
1512 if (fd >= 0) 1629 if (fd >= 0)
1513 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1630 {
1631 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1514 close (fd); 1632 close (fd);
1633 }
1515#endif /* SRIOCSREDIR */ 1634#endif /* SRIOCSREDIR */
1516 } 1635 }
1517 1636
1518 /* reset signals and spin off the command interpreter */ 1637 /* reset signals and spin off the command interpreter */
1519 signal (SIGINT, SIG_DFL); 1638 signal (SIGINT, SIG_DFL);
1520 signal (SIGQUIT, SIG_DFL); 1639 signal (SIGQUIT, SIG_DFL);
1521 signal (SIGCHLD, SIG_DFL); 1640 signal (SIGCHLD, SIG_DFL);
1522 signal (SIGHUP, SIG_DFL); 1641 signal (SIGHUP, SIG_DFL);
1523 signal (SIGPIPE, SIG_DFL); 1642 signal (SIGPIPE, SIG_DFL);
1524 /* 1643 /*
1525 * mimick login's behavior by disabling the job control signals 1644 * mimic login's behavior by disabling the job control signals
1526 * a shell that wants them can turn them back on 1645 * a shell that wants them can turn them back on
1527 */ 1646 */
1528#ifdef SIGTSTP 1647#ifdef SIGTSTP
1529 signal (SIGTSTP, SIG_IGN); 1648 signal (SIGTSTP, SIG_IGN);
1530 signal (SIGTTIN, SIG_IGN); 1649 signal (SIGTTIN, SIG_IGN);
1531 signal (SIGTTOU, SIG_IGN); 1650 signal (SIGTTOU, SIG_IGN);
1532#endif /* SIGTSTP */ 1651#endif /* SIGTSTP */
1533 1652
1534 // unblock signals (signals are blocked by iom.C
1535 sigset_t ss;
1536 sigemptyset (&ss);
1537 sigprocmask (SIG_SETMASK, &ss, 0);
1538
1539 /* command interpreter path */ 1653 /* command interpreter path */
1540 if (argv) 1654 if (argv)
1541 { 1655 {
1542# ifdef DEBUG_CMD 1656# ifdef DEBUG_CMD
1543 int i; 1657 int i;
… …
1554 const char *argv0, *shell; 1668 const char *argv0, *shell;
1555 1669
1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1670 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1557 shell = "/bin/sh"; 1671 shell = "/bin/sh";
1558 1672
1559 argv0 = (const char *)rxvt_basename (shell); 1673 argv0 = rxvt_basename (shell);
1560 1674
1561 if (option (Opt_loginShell)) 1675 if (option (Opt_loginShell))
1562 { 1676 {
1563 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1677 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1564 1678

Diff Legend

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