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.344 by sf-exg, Tue Jun 16 11:58:26 2015 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
47#ifdef HAVE_XMU
48# include <X11/Xmu/CurUtil.h>
49#endif
46 50
47#ifdef HAVE_XSETLOCALE 51#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 52# define X_LOCALE
49# include <X11/Xlocale.h> 53# include <X11/Xlocale.h>
50#else 54#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 55# include <locale.h>
53# endif
54#endif 56#endif
55 57
56#ifdef HAVE_NL_LANGINFO 58#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 59# include <langinfo.h>
60#endif
61
62#ifdef HAVE_STARTUP_NOTIFICATION
63# define SN_API_NOT_YET_FROZEN
64# include <libsn/sn-launchee.h>
58#endif 65#endif
59 66
60#ifdef DISPLAY_IS_IP 67#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 68/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 69#include <sys/types.h>
… …
73#include <netinet/in.h> 80#include <netinet/in.h>
74#include <arpa/inet.h> 81#include <arpa/inet.h>
75#include <net/if.h> 82#include <net/if.h>
76#include <net/if_arp.h> 83#include <net/if_arp.h>
77 84
78static char * 85static char * ecb_cold
79rxvt_network_display (const char *display) 86rxvt_network_display (const char *display)
80{ 87{
81 char buffer[1024], *rval = NULL; 88 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 89 struct ifconf ifc;
83 struct ifreq *ifr; 90 struct ifreq *ifr;
… …
143 150
144 return rval; 151 return rval;
145} 152}
146#endif 153#endif
147 154
148const char *const def_colorName[] = 155static const char *const def_colorName[] =
149 { 156 {
150 COLOR_FOREGROUND, 157 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 158 COLOR_BACKGROUND,
152 /* low-intensity colors */ 159 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 160 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 181 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 182 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 183 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 184 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 185
186#if !USE_256_COLORS
179 // 88 xterm colours 187 // 88 xterm colours
180 "rgb:00/00/00", 188 "rgb:00/00/00",
181 "rgb:00/00/8b", 189 "rgb:00/00/8b",
182 "rgb:00/00/cd", 190 "rgb:00/00/cd",
183 "rgb:00/00/ff", 191 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 255 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 256 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 257 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 258 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 259 "rgb:e7/e7/e7",
260#else
261 // 256 xterm colours
262 "rgb:00/00/00",
263 "rgb:00/00/5f",
264 "rgb:00/00/87",
265 "rgb:00/00/af",
266 "rgb:00/00/d7",
267 "rgb:00/00/ff",
268 "rgb:00/5f/00",
269 "rgb:00/5f/5f",
270 "rgb:00/5f/87",
271 "rgb:00/5f/af",
272 "rgb:00/5f/d7",
273 "rgb:00/5f/ff",
274 "rgb:00/87/00",
275 "rgb:00/87/5f",
276 "rgb:00/87/87",
277 "rgb:00/87/af",
278 "rgb:00/87/d7",
279 "rgb:00/87/ff",
280 "rgb:00/af/00",
281 "rgb:00/af/5f",
282 "rgb:00/af/87",
283 "rgb:00/af/af",
284 "rgb:00/af/d7",
285 "rgb:00/af/ff",
286 "rgb:00/d7/00",
287 "rgb:00/d7/5f",
288 "rgb:00/d7/87",
289 "rgb:00/d7/af",
290 "rgb:00/d7/d7",
291 "rgb:00/d7/ff",
292 "rgb:00/ff/00",
293 "rgb:00/ff/5f",
294 "rgb:00/ff/87",
295 "rgb:00/ff/af",
296 "rgb:00/ff/d7",
297 "rgb:00/ff/ff",
298 "rgb:5f/00/00",
299 "rgb:5f/00/5f",
300 "rgb:5f/00/87",
301 "rgb:5f/00/af",
302 "rgb:5f/00/d7",
303 "rgb:5f/00/ff",
304 "rgb:5f/5f/00",
305 "rgb:5f/5f/5f",
306 "rgb:5f/5f/87",
307 "rgb:5f/5f/af",
308 "rgb:5f/5f/d7",
309 "rgb:5f/5f/ff",
310 "rgb:5f/87/00",
311 "rgb:5f/87/5f",
312 "rgb:5f/87/87",
313 "rgb:5f/87/af",
314 "rgb:5f/87/d7",
315 "rgb:5f/87/ff",
316 "rgb:5f/af/00",
317 "rgb:5f/af/5f",
318 "rgb:5f/af/87",
319 "rgb:5f/af/af",
320 "rgb:5f/af/d7",
321 "rgb:5f/af/ff",
322 "rgb:5f/d7/00",
323 "rgb:5f/d7/5f",
324 "rgb:5f/d7/87",
325 "rgb:5f/d7/af",
326 "rgb:5f/d7/d7",
327 "rgb:5f/d7/ff",
328 "rgb:5f/ff/00",
329 "rgb:5f/ff/5f",
330 "rgb:5f/ff/87",
331 "rgb:5f/ff/af",
332 "rgb:5f/ff/d7",
333 "rgb:5f/ff/ff",
334 "rgb:87/00/00",
335 "rgb:87/00/5f",
336 "rgb:87/00/87",
337 "rgb:87/00/af",
338 "rgb:87/00/d7",
339 "rgb:87/00/ff",
340 "rgb:87/5f/00",
341 "rgb:87/5f/5f",
342 "rgb:87/5f/87",
343 "rgb:87/5f/af",
344 "rgb:87/5f/d7",
345 "rgb:87/5f/ff",
346 "rgb:87/87/00",
347 "rgb:87/87/5f",
348 "rgb:87/87/87",
349 "rgb:87/87/af",
350 "rgb:87/87/d7",
351 "rgb:87/87/ff",
352 "rgb:87/af/00",
353 "rgb:87/af/5f",
354 "rgb:87/af/87",
355 "rgb:87/af/af",
356 "rgb:87/af/d7",
357 "rgb:87/af/ff",
358 "rgb:87/d7/00",
359 "rgb:87/d7/5f",
360 "rgb:87/d7/87",
361 "rgb:87/d7/af",
362 "rgb:87/d7/d7",
363 "rgb:87/d7/ff",
364 "rgb:87/ff/00",
365 "rgb:87/ff/5f",
366 "rgb:87/ff/87",
367 "rgb:87/ff/af",
368 "rgb:87/ff/d7",
369 "rgb:87/ff/ff",
370 "rgb:af/00/00",
371 "rgb:af/00/5f",
372 "rgb:af/00/87",
373 "rgb:af/00/af",
374 "rgb:af/00/d7",
375 "rgb:af/00/ff",
376 "rgb:af/5f/00",
377 "rgb:af/5f/5f",
378 "rgb:af/5f/87",
379 "rgb:af/5f/af",
380 "rgb:af/5f/d7",
381 "rgb:af/5f/ff",
382 "rgb:af/87/00",
383 "rgb:af/87/5f",
384 "rgb:af/87/87",
385 "rgb:af/87/af",
386 "rgb:af/87/d7",
387 "rgb:af/87/ff",
388 "rgb:af/af/00",
389 "rgb:af/af/5f",
390 "rgb:af/af/87",
391 "rgb:af/af/af",
392 "rgb:af/af/d7",
393 "rgb:af/af/ff",
394 "rgb:af/d7/00",
395 "rgb:af/d7/5f",
396 "rgb:af/d7/87",
397 "rgb:af/d7/af",
398 "rgb:af/d7/d7",
399 "rgb:af/d7/ff",
400 "rgb:af/ff/00",
401 "rgb:af/ff/5f",
402 "rgb:af/ff/87",
403 "rgb:af/ff/af",
404 "rgb:af/ff/d7",
405 "rgb:af/ff/ff",
406 "rgb:d7/00/00",
407 "rgb:d7/00/5f",
408 "rgb:d7/00/87",
409 "rgb:d7/00/af",
410 "rgb:d7/00/d7",
411 "rgb:d7/00/ff",
412 "rgb:d7/5f/00",
413 "rgb:d7/5f/5f",
414 "rgb:d7/5f/87",
415 "rgb:d7/5f/af",
416 "rgb:d7/5f/d7",
417 "rgb:d7/5f/ff",
418 "rgb:d7/87/00",
419 "rgb:d7/87/5f",
420 "rgb:d7/87/87",
421 "rgb:d7/87/af",
422 "rgb:d7/87/d7",
423 "rgb:d7/87/ff",
424 "rgb:d7/af/00",
425 "rgb:d7/af/5f",
426 "rgb:d7/af/87",
427 "rgb:d7/af/af",
428 "rgb:d7/af/d7",
429 "rgb:d7/af/ff",
430 "rgb:d7/d7/00",
431 "rgb:d7/d7/5f",
432 "rgb:d7/d7/87",
433 "rgb:d7/d7/af",
434 "rgb:d7/d7/d7",
435 "rgb:d7/d7/ff",
436 "rgb:d7/ff/00",
437 "rgb:d7/ff/5f",
438 "rgb:d7/ff/87",
439 "rgb:d7/ff/af",
440 "rgb:d7/ff/d7",
441 "rgb:d7/ff/ff",
442 "rgb:ff/00/00",
443 "rgb:ff/00/5f",
444 "rgb:ff/00/87",
445 "rgb:ff/00/af",
446 "rgb:ff/00/d7",
447 "rgb:ff/00/ff",
448 "rgb:ff/5f/00",
449 "rgb:ff/5f/5f",
450 "rgb:ff/5f/87",
451 "rgb:ff/5f/af",
452 "rgb:ff/5f/d7",
453 "rgb:ff/5f/ff",
454 "rgb:ff/87/00",
455 "rgb:ff/87/5f",
456 "rgb:ff/87/87",
457 "rgb:ff/87/af",
458 "rgb:ff/87/d7",
459 "rgb:ff/87/ff",
460 "rgb:ff/af/00",
461 "rgb:ff/af/5f",
462 "rgb:ff/af/87",
463 "rgb:ff/af/af",
464 "rgb:ff/af/d7",
465 "rgb:ff/af/ff",
466 "rgb:ff/d7/00",
467 "rgb:ff/d7/5f",
468 "rgb:ff/d7/87",
469 "rgb:ff/d7/af",
470 "rgb:ff/d7/d7",
471 "rgb:ff/d7/ff",
472 "rgb:ff/ff/00",
473 "rgb:ff/ff/5f",
474 "rgb:ff/ff/87",
475 "rgb:ff/ff/af",
476 "rgb:ff/ff/d7",
477 "rgb:ff/ff/ff",
478 "rgb:08/08/08",
479 "rgb:12/12/12",
480 "rgb:1c/1c/1c",
481 "rgb:26/26/26",
482 "rgb:30/30/30",
483 "rgb:3a/3a/3a",
484 "rgb:44/44/44",
485 "rgb:4e/4e/4e",
486 "rgb:58/58/58",
487 "rgb:62/62/62",
488 "rgb:6c/6c/6c",
489 "rgb:76/76/76",
490 "rgb:80/80/80",
491 "rgb:8a/8a/8a",
492 "rgb:94/94/94",
493 "rgb:9e/9e/9e",
494 "rgb:a8/a8/a8",
495 "rgb:b2/b2/b2",
496 "rgb:bc/bc/bc",
497 "rgb:c6/c6/c6",
498 "rgb:d0/d0/d0",
499 "rgb:da/da/da",
500 "rgb:e4/e4/e4",
501 "rgb:ee/ee/ee",
502#endif
252 503
253#ifndef NO_CURSORCOLOR 504#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 505 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 506 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 507#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 517#if ENABLE_FRILLS
267 NULL, // Color_underline 518 NULL, // Color_underline
268#endif 519#endif
269#ifdef OPTION_HC 520#ifdef OPTION_HC
270 NULL, 521 NULL,
522 NULL,
271#endif 523#endif
272#ifdef KEEP_SCROLLCOLOR
273 COLOR_SCROLLBAR, 524 COLOR_SCROLLBAR,
525#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 526 COLOR_SCROLLTROUGH,
275#endif /* KEEP_SCROLLCOLOR */ 527#endif
276#if ENABLE_TRANSPARENCY 528#if BG_IMAGE_FROM_ROOT
277 NULL, 529 NULL,
278#endif 530#endif
279#if OFF_FOCUS_FADING 531#if OFF_FOCUS_FADING
280 "rgb:00/00/00", 532 "rgb:00/00/00",
281#endif 533#endif
… …
293 ncol = 80; 545 ncol = 80;
294 nrow = 24; 546 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 547 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 548 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 549 lineSpace = LINESPACE;
550 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 551 saveLines = SAVELINES;
299 552
300 refresh_type = SLOW_REFRESH; 553 refresh_type = SLOW_REFRESH;
301 554
302 oldcursor.row = oldcursor.col = -1; 555 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 560 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 561 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 562 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 563 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 564 set_option (Opt_intensityStyles);
565 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 566 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 567 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} 568}
333 569
334/*----------------------------------------------------------------------*/ 570/*----------------------------------------------------------------------*/
335const char ** 571const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 572rxvt_term::init_resources (int argc, const char *const *argv)
337{ 573{
338 int i, r_argc; 574 int i;
339 const char **cmd_argv, **r_argv; 575 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 576
369 rs[Rs_name] = rxvt_basename (argv[0]); 577 rs[Rs_name] = rxvt_basename (argv[0]);
370 578
371 /* 579 /*
372 * Open display, get options/resources and create the window 580 * Open display, get options/resources and create the window
373 */ 581 */
374 582
375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 583 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
376 rs[Rs_display_name] = ":0"; 584 rs[Rs_display_name] = ":0";
377 585
378 get_options (r_argc, r_argv); 586 cmd_argv = get_options (argc, argv);
379 587
380 if (!(display = displays.get (rs[Rs_display_name]))) 588 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]); 589 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
385 590
386 // using a local pointer decreases code size a lot 591 // using a local pointer decreases code size a lot
387 xa = display->xa; 592 xa = display->xa;
388 593
389 set (display); 594 set (display);
390 extract_resources (); 595 extract_resources ();
391 596
392#if XFT 597#if ENABLE_FRILLS
393 if (rs[Rs_depth]) 598 if (rs[Rs_visual])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 599 select_visual (strtol (rs[Rs_visual], 0, 0));
600 else if (rs[Rs_depth])
601 select_depth (strtol (rs[Rs_depth], 0, 0));
395#endif 602#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 603
404 for (int i = NUM_RESOURCES; i--; ) 604 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 605 if (rs [i] == resval_undef)
406 rs [i] = 0; 606 rs [i] = 0;
407 607
… …
415 { 615 {
416 rxvt_perl.init (this); 616 rxvt_perl.init (this);
417 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 617 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
418 } 618 }
419#endif 619#endif
620
621 // must be called after initialising the perl interpreter as it
622 // may invoke the `on_register_command' hook
623 extract_keysym_resources ();
420 624
421 /* 625 /*
422 * set any defaults not already set 626 * set any defaults not already set
423 */ 627 */
424 if (cmd_argv && cmd_argv[0]) 628 if (cmd_argv && cmd_argv[0])
425 { 629 {
426 if (!rs[Rs_title]) 630 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 631 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
632
428 if (!rs[Rs_iconName]) 633 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 634 rs[Rs_iconName] = rs[Rs_title];
430 } 635 }
431 else 636 else
432 { 637 {
433 if (!rs[Rs_title]) 638 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 639 rs[Rs_title] = rs[Rs_name];
640
435 if (!rs[Rs_iconName]) 641 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 642 rs[Rs_iconName] = rs[Rs_name];
437 } 643 }
438 644
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 645 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 652 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 653 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 654
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 655 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 656 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
657
658 if (rs[Rs_letterSpace])
659 letterSpace = atoi (rs[Rs_letterSpace]);
451#endif 660#endif
452 661
453#ifdef POINTER_BLANK 662#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 663 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 664 pointerBlankDelay = i;
456 else 665 else
457 pointerBlankDelay = 2; 666 pointerBlankDelay = 2;
458#endif 667#endif
459 668
669 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
670 multiClickTime = i;
671 else
672 multiClickTime = 500;
673
674 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
675
460 /* no point having a scrollbar without having any scrollback! */ 676 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 677 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 678 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 679
469 if (!rs[Rs_cutchars]) 680 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 681 rs[Rs_cutchars] = CUTCHARS;
471 682
472#ifndef NO_BACKSPACE_KEY 683#ifndef NO_BACKSPACE_KEY
… …
485# else 696# else
486 rs[Rs_delete_key] = "\033[3~"; 697 rs[Rs_delete_key] = "\033[3~";
487# endif 698# endif
488#endif 699#endif
489 700
490#ifdef HAVE_SCROLLBARS 701 scrollBar.setup (this);
491 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
492#endif
493 702
494#ifdef XTERM_REVERSE_VIDEO 703#ifdef XTERM_REVERSE_VIDEO
495 /* this is how xterm implements reverseVideo */ 704 /* this is how xterm implements reverseVideo */
496 if (option (Opt_reverseVideo)) 705 if (option (Opt_reverseVideo))
497 { 706 {
… …
535 return cmd_argv; 744 return cmd_argv;
536} 745}
537 746
538/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
539void 748void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 749rxvt_term::init (stringvec *argv, stringvec *envv)
541{ 750{
751 argv->push_back (0);
752 envv->push_back (0);
753
754 this->argv = argv;
542 this->envv = envv; 755 this->envv = envv;
543 756
757 env = new char *[this->envv->size ()];
758 for (int i = 0; i < this->envv->size (); i++)
759 env[i] = this->envv->at (i);
760
761 init2 (argv->size () - 1, argv->begin ());
762}
763
764void
765rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
766{
767#if ENABLE_PERL
768 // perl might want to access the stringvecs later, so we need to copy them
769 stringvec *args = new stringvec;
770 for (int i = 0; i < argc; i++)
771 args->push_back (strdup (argv [i]));
772
773 stringvec *envs = new stringvec;
774 for (const char *const *var = envv; *var; var++)
775 envs->push_back (strdup (*var));
776
777 init (args, envs);
778#else
779 init2 (argc, argv);
780#endif
781}
782
783void
784rxvt_term::init2 (int argc, const char *const *argv)
785{
544 SET_R (this); 786 SET_R (this);
545 set_locale (""); 787 set_locale ("");
546 set_environ (envv); // few things in X do not call setlocale :( 788 set_environ (env); // a few things in X do not call setlocale :(
547 789
548 init_vars (); 790 init_vars ();
549
550 init_secondary ();
551 791
552 const char **cmd_argv = init_resources (argc, argv); 792 const char **cmd_argv = init_resources (argc, argv);
553 793
554#ifdef KEYSYM_RESOURCE 794#ifdef KEYSYM_RESOURCE
555 keyboard->register_done (); 795 keyboard->register_done ();
556#endif 796#endif
557 797
558#ifdef HAVE_SCROLLBARS 798 if (const char *path = rs[Rs_chdir])
799 if (*path) // ignored if empty
800 {
801 if (*path != '/')
802 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
803
804 if (chdir (path))
805 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
806 }
807
559 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
560 scrollBar.setIdle (); /* set existence for size calculations */ 809 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
561#endif
562 810
563 pty = ptytty::create (); 811 pty = ptytty::create ();
564 812
565 create_windows (argc, argv); 813 create_windows (argc, argv);
566 814
567 init_xlocale (); 815 init_xlocale ();
568 816
569 scr_reset (); // initialize screen 817 scr_poweron (); // initialize screen
570 818
571#if 0 819#if 0
572 XSynchronize (dpy, True); 820 XSynchronize (dpy, True);
573#endif 821#endif
574 822
575#ifdef HAVE_SCROLLBARS
576 if (option (Opt_scrollBar)) 823 if (option (Opt_scrollBar))
577 resize_scrollbar (); /* create and map scrollbar */ 824 scrollBar.resize (); /* create and map scrollbar */
578#endif 825
579#ifdef HAVE_BG_PIXMAP 826#ifdef HAVE_BG_PIXMAP
580 { 827 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 828#endif
625 829
626#if ENABLE_PERL 830#if ENABLE_PERL
627 rootwin_ev.start (display, display->root); 831 rootwin_ev.start (display, display->root);
628#endif 832#endif
629 833
630 set_colorfgbg (); 834 init_done = 1;
631 835
632 init_command (cmd_argv); 836 init_command (cmd_argv);
633
634 free (cmd_argv);
635 837
636 if (pty->pty >= 0) 838 if (pty->pty >= 0)
637 pty_ev.start (pty->pty, ev::READ); 839 pty_ev.start (pty->pty, ev::READ);
638 840
639 HOOK_INVOKE ((this, HOOK_START, DT_END)); 841 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
641#if ENABLE_XEMBED 843#if ENABLE_XEMBED
642 if (rs[Rs_embed]) 844 if (rs[Rs_embed])
643 { 845 {
644 long info[2] = { 0, XEMBED_MAPPED }; 846 long info[2] = { 0, XEMBED_MAPPED };
645 847
646 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 848 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
647 32, PropModeReplace, (unsigned char *)&info, 2); 849 32, PropModeReplace, (unsigned char *)&info, 2);
648 } 850 }
649#endif 851#endif
650 852
853#if HAVE_STARTUP_NOTIFICATION
854 SnDisplay *snDisplay;
855 SnLauncheeContext *snContext;
856
857 snDisplay = sn_display_new (dpy, NULL, NULL);
858 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
859
860 /* Tell the window manager that this window is part of the startup context */
861 if (snContext)
862 sn_launchee_context_setup_window (snContext, parent);
863#endif
864
651 XMapWindow (dpy, vt); 865 XMapWindow (dpy, vt);
652 XMapWindow (dpy, parent[0]); 866 XMapWindow (dpy, parent);
867
868#if HAVE_STARTUP_NOTIFICATION
869 if (snContext)
870 {
871 /* Mark the startup process as complete */
872 sn_launchee_context_complete (snContext);
873
874 sn_launchee_context_unref (snContext);
875 }
876
877 sn_display_unref (snDisplay);
878#endif
653 879
654 refresh_check (); 880 refresh_check ();
655} 881}
656 882
657/*----------------------------------------------------------------------*/ 883/*----------------------------------------------------------------------*/
658void 884void
659rxvt_term::init_env () 885rxvt_term::init_env ()
660{ 886{
661 int i;
662 char *val; 887 char *val;
888 char *env_display;
889 char *env_windowid;
890 char *env_colorfgbg;
891 char *env_term;
663 892
664#ifdef DISPLAY_IS_IP 893#ifdef DISPLAY_IS_IP
665 /* Fixup display_name for export over pty to any interested terminal 894 /* 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 895 * 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 896 * (for the first non-loopback interface) that we get from
… …
680 val = XDisplayString (dpy); 909 val = XDisplayString (dpy);
681 910
682 if (rs[Rs_display_name] == NULL) 911 if (rs[Rs_display_name] == NULL)
683 rs[Rs_display_name] = val; /* use broken `:0' value */ 912 rs[Rs_display_name] = val; /* use broken `:0' value */
684 913
685 i = strlen (val);
686 env_display = (char *)rxvt_malloc (i + 9); 914 env_display = (char *)rxvt_malloc (strlen (val) + 9);
687 915
688 sprintf (env_display, "DISPLAY=%s", val); 916 sprintf (env_display, "DISPLAY=%s", val);
689 917
918 env_windowid = (char *)rxvt_malloc (21);
690 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
691 920
692 /* add entries to the environment: 921 /* add entries to the environment:
693 * @ DISPLAY: in case we started with -display 922 * @ DISPLAY: in case we started with -display
694 * @ WINDOWID: X window id number of the window 923 * @ WINDOWID: X window id number of the window
695 * @ COLORTERM: terminal sub-name and also indicates its color 924 * @ COLORTERM: terminal sub-name and also indicates its color
… …
698 * @ COLORFGBG: fg;bg color codes 927 * @ COLORFGBG: fg;bg color codes
699 */ 928 */
700 putenv (env_display); 929 putenv (env_display);
701 putenv (env_windowid); 930 putenv (env_windowid);
702 931
703 if (env_colorfgbg) 932 env_colorfgbg = get_colorfgbg ();
704 putenv (env_colorfgbg); 933 putenv (env_colorfgbg);
705 934
706#ifdef RXVT_TERMINFO 935#ifdef RXVT_TERMINFO
707 putenv ("TERMINFO=" RXVT_TERMINFO); 936 putenv ("TERMINFO=" RXVT_TERMINFO);
708#endif 937#endif
709 938
… …
728 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
729#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
730} 959}
731 960
732/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
733/*
734 * This is more or less stolen straight from XFree86 xterm.
735 * This should support all European type languages.
736 */
737void 962void
738rxvt_term::set_locale (const char *locale) 963rxvt_term::set_locale (const char *locale)
739{ 964{
740 set_environ (envv); 965 set_environ (env);
741 966
742#if HAVE_XSETLOCALE || HAVE_SETLOCALE
743 free (this->locale); 967 free (this->locale);
744 this->locale = setlocale (LC_CTYPE, locale); 968 this->locale = setlocale (LC_CTYPE, locale);
745 969
746 if (!this->locale) 970 if (!this->locale)
747 { 971 {
… …
758 982
759 983
760 this->locale = strdup (this->locale); 984 this->locale = strdup (this->locale);
761 SET_LOCALE (this->locale); 985 SET_LOCALE (this->locale);
762 mbstate.reset (); 986 mbstate.reset ();
763#endif
764 987
765#if HAVE_NL_LANGINFO 988#if HAVE_NL_LANGINFO
766 char *codeset = strdup (nl_langinfo (CODESET)); 989 char *codeset = nl_langinfo (CODESET);
767 // /^UTF.?8/i 990 // /^UTF.?8/i
768 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 991 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
769 && (codeset[1] == 'T' || codeset[1] == 't') 992 && (codeset[1] == 'T' || codeset[1] == 't')
770 && (codeset[2] == 'F' || codeset[2] == 'f') 993 && (codeset[2] == 'F' || codeset[2] == 'f')
771 && (codeset[3] == '8' || codeset[4] == '8'); 994 && (codeset[3] == '8' || codeset[4] == '8');
772 free (codeset);
773#else 995#else
774 enc_utf8 = 0; 996 enc_utf8 = 0;
775#endif 997#endif
776} 998}
777 999
778void 1000void
779rxvt_term::init_xlocale () 1001rxvt_term::init_xlocale ()
780{ 1002{
781 set_environ (envv); 1003 set_environ (env);
782 1004
783#ifdef USE_XIM 1005#if USE_XIM
784 if (!locale) 1006 if (!locale)
785 rxvt_warn ("setting locale failed, working without locale support.\n"); 1007 rxvt_warn ("setting locale failed, continuing without locale support.\n");
786 else 1008 else
787 { 1009 {
788 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
789 1011
790 if (!XSupportsLocale ()) 1012 if (!XSupportsLocale ())
791 { 1013 {
792 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1014 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
793 return; 1015 return;
794 } 1016 }
795 1017
796 im_ev.start (display); 1018 im_ev.start (display);
797 1019
… …
838 run_command (argv); 1060 run_command (argv);
839} 1061}
840 1062
841/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
842void 1064void
843rxvt_term::Get_Colours () 1065rxvt_term::get_colors ()
844{ 1066{
845 int i; 1067 int i;
846 1068
847#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
848 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
849#endif 1071#endif
850 1072
851 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < NRS_COLORS; i++)
852 {
853 const char *name = rs[Rs_color + i]; 1074 if (const char *name = rs[Rs_color + i])
854
855 if (!name)
856 continue;
857
858 rxvt_color xcol;
859
860 if (!set_color (xcol, name)) 1075 set_color (pix_colors [i], name);
861 {
862#ifndef XTERM_REVERSE_VIDEO
863 if (i < 2 && option (Opt_reverseVideo))
864 name = def_colorName [1 - i];
865 else
866#endif
867 name = def_colorName [i];
868
869 if (!name)
870 continue;
871
872 if (!set_color (xcol, name))
873 {
874 switch (i)
875 {
876 case Color_fg:
877 case Color_bg:
878 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
879 name = "";
880 break;
881#ifndef NO_CURSORCOLOR
882 case Color_cursor2:
883#endif
884 case Color_pointer_fg:
885 name = rs[Rs_color + Color_fg];
886 xcol.set (this, name);
887 break;
888 default:
889 name = rs[Rs_color + Color_bg];
890 xcol.set (this, name);
891 break;
892 }
893 }
894 }
895
896 pix_colors[i] = xcol;
897 rs[Rs_color + i] = name;
898 }
899
900 if (depth <= 2)
901 {
902 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
903 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
904 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
905 }
906 1076
907 /* 1077 /*
908 * get scrollBar shadow colors 1078 * get scrollBar shadow colors
909 * 1079 *
910 * The calculations of topShadow/bottomShadow values are adapted 1080 * The calculations of topShadow/bottomShadow values are adapted
911 * from the fvwm window manager. 1081 * from the fvwm window manager.
912 */ 1082 */
913#ifdef KEEP_SCROLLCOLOR 1083#ifdef RXVT_SCROLLBAR
914 if (depth <= 2)
915 {
916 /* Monochrome */
917 alias_color (Color_scroll, Color_fg);
918 alias_color (Color_topShadow, Color_bg);
919 alias_color (Color_bottomShadow, Color_bg);
920 }
921 else
922 {
923 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1084 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
924 1085
925 rgba cscroll; 1086 rgba cscroll;
926 pix_colors [Color_scroll].get (cscroll); 1087 pix_colors [Color_scroll].get (cscroll);
927 1088
928 /* topShadowColor */ 1089 /* topShadowColor */
929 if (!pix_colors[Color_topShadow].set (this, 1090 if (!pix_colors[Color_topShadow].set (this,
930 rgba ( 1091 rgba (
931 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1092 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
932 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1093 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
933 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1094 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
934 cscroll.a) 1095 cscroll.a)
935 )) 1096 ))
936 alias_color (Color_topShadow, Color_White); 1097 alias_color (Color_topShadow, Color_White);
937 } 1098#endif
938#endif /* KEEP_SCROLLCOLOR */
939 1099
940#ifdef OFF_FOCUS_FADING 1100#ifdef OFF_FOCUS_FADING
941 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < NRS_COLORS; i++)
942 update_fade_color (i); 1102 update_fade_color (i, true);
943#endif 1103#endif
944} 1104}
945 1105
946/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
947/* color aliases, fg/bg bright-bold */ 1107/* color aliases, fg/bg bright-bold */
948void 1108void
949rxvt_term::color_aliases (int idx) 1109rxvt_term::color_aliases (int idx)
950{ 1110{
951 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1111 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
952 { 1112 {
953 int i = atoi (rs[Rs_color + idx]); 1113 int i = atoi (rs[Rs_color + idx]);
954 1114
955 if (i >= 8 && i <= 15) 1115 if (i >= 8 && i <= 15)
956 /* bright colors */ 1116 /* bright colors */
… …
996 for (j = map->max_keypermod; j--; k++) 1156 for (j = map->max_keypermod; j--; k++)
997 { 1157 {
998 if (kc[k] == 0) 1158 if (kc[k] == 0)
999 break; 1159 break;
1000 1160
1001 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1161 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1002 { 1162 {
1003 case XK_Num_Lock: 1163 case XK_Num_Lock:
1004 ModNumLockMask = modmasks[i - 1]; 1164 ModNumLockMask = modmasks[i - 1];
1005 continue; 1165 continue;
1006 1166
… …
1048 1208
1049 if (i) 1209 if (i)
1050 ModMetaMask = modmasks[i - 1]; 1210 ModMetaMask = modmasks[i - 1];
1051} 1211}
1052 1212
1213void
1214rxvt_term::set_icon (const char *file)
1215{
1216#if HAVE_PIXBUF && ENABLE_EWMH
1217 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1218 if (!pixbuf)
1219 {
1220 rxvt_warn ("Loading image icon failed, continuing without.\n");
1221 return;
1222 }
1223
1224 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1225 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1226
1227 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1228 {
1229 rxvt_warn ("Icon image too big, continuing without.\n");
1230 g_object_unref (pixbuf);
1231 return;
1232 }
1233
1234 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1235 {
1236 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1237 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1238 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1239
1240 buffer [0] = w;
1241 buffer [1] = h;
1242 for (int i = 0; i < h; i++)
1243 {
1244 for (int j = 0; j < w; j++)
1245 {
1246 unsigned char *pixel = row + j * channels;
1247 long value;
1248
1249 if (channels == 4)
1250 value = pixel[3];
1251 else
1252 value = (unsigned char)0x00ff;
1253
1254 value = (value << 8) + pixel[0];
1255 value = (value << 8) + pixel[1];
1256 value = (value << 8) + pixel[2];
1257 buffer[(i * w + j) + 2] = value;
1258 }
1259
1260 row += rowstride;
1261 }
1262
1263 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1264 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1265 free (buffer);
1266 }
1267 else
1268 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1269
1270 g_object_unref (pixbuf);
1271#endif
1272}
1273
1053/*----------------------------------------------------------------------*/ 1274/*----------------------------------------------------------------------*/
1054/* rxvt_Create_Windows () - Open and map the window */ 1275/* Open and map the window */
1055void 1276void
1056rxvt_term::create_windows (int argc, const char *const *argv) 1277rxvt_term::create_windows (int argc, const char *const *argv)
1057{ 1278{
1058 XClassHint classHint; 1279 XClassHint classHint;
1059 XWMHints wmHint; 1280 XWMHints wmHint;
… …
1065 Window top, parent; 1286 Window top, parent;
1066 1287
1067 dLocal (Display *, dpy); 1288 dLocal (Display *, dpy);
1068 1289
1069 /* grab colors before netscape does */ 1290 /* grab colors before netscape does */
1070 Get_Colours (); 1291 get_colors ();
1071 1292
1072 if (!set_fonts ()) 1293 if (!set_fonts ())
1073 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1294 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1074 1295
1075 parent = display->root; 1296 parent = display->root;
… …
1105 } 1326 }
1106#endif 1327#endif
1107 1328
1108 window_calc (0, 0); 1329 window_calc (0, 0);
1109 1330
1110 /* sub-window placement & size in rxvt_resize_subwindows () */ 1331 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1111 attributes.background_pixel = pix_colors_focused [Color_border]; 1332 attributes.background_pixel = pix_colors_focused [Color_border];
1112 attributes.border_pixel = pix_colors_focused [Color_border]; 1333 attributes.border_pixel = pix_colors_focused [Color_border];
1113 attributes.colormap = cmap; 1334 attributes.colormap = cmap;
1114 1335
1115 top = XCreateWindow (dpy, parent, 1336 top = XCreateWindow (dpy, parent,
… …
1118 ext_bwidth, 1339 ext_bwidth,
1119 depth, InputOutput, visual, 1340 depth, InputOutput, visual,
1120 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1341 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1121 &attributes); 1342 &attributes);
1122 1343
1123 this->parent[0] = top; 1344 this->parent = top;
1124 1345
1125 old_width = szHint.width; 1346 set_title (rs [Rs_title]);
1126 old_height = szHint.height; 1347 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 1348
1131 classHint.res_name = (char *)rs[Rs_name]; 1349 classHint.res_name = (char *)rs[Rs_name];
1132 classHint.res_class = (char *)RESCLASS; 1350 classHint.res_class = (char *)RESCLASS;
1133 1351
1134 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1352 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1135 wmHint.input = True; 1353 wmHint.input = True;
1136 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1354 wmHint.initial_state = option (Opt_iconic) ? IconicState
1355 : option (Opt_dockapp) ? WithdrawnState
1356 : NormalState;
1137 wmHint.window_group = top; 1357 wmHint.window_group = top;
1138 1358
1139 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1359 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1140 &szHint, &wmHint, &classHint); 1360 &szHint, &wmHint, &classHint);
1361#if ENABLE_EWMH
1362 /*
1363 * set up icon hint
1364 * rs [Rs_iconfile] is path to icon
1365 */
1366
1367 if (rs [Rs_iconfile])
1368 set_icon (rs [Rs_iconfile]);
1369#endif
1141 1370
1142#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
1143 if (mwmhints.flags) 1372 if (mwmhints.flags)
1144 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1373 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1145 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1374 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1150#if ENABLE_EWMH 1379#if ENABLE_EWMH
1151 xa[XA_NET_WM_PING], 1380 xa[XA_NET_WM_PING],
1152#endif 1381#endif
1153 }; 1382 };
1154 1383
1155 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1384 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1156 1385
1157#if ENABLE_FRILLS 1386#if ENABLE_FRILLS
1158 if (rs[Rs_transient_for]) 1387 if (rs[Rs_transient_for])
1159 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1388 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1160#endif 1389#endif
… …
1178 | ExposureMask | StructureNotifyMask); 1407 | ExposureMask | StructureNotifyMask);
1179 1408
1180 termwin_ev.start (display, top); 1409 termwin_ev.start (display, top);
1181 1410
1182 /* vt cursor: Black-on-White is standard, but this is more popular */ 1411 /* vt cursor: Black-on-White is standard, but this is more popular */
1412 unsigned int shape = XC_xterm;
1413
1414#ifdef HAVE_XMU
1415 if (rs[Rs_pointerShape])
1416 {
1417 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1418 if (stmp >= 0)
1419 shape = stmp;
1420 }
1421#endif
1422
1183 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1423 TermWin_cursor = XCreateFontCursor (dpy, shape);
1184 1424
1185 /* the vt window */ 1425 /* the vt window */
1186 vt = XCreateSimpleWindow (dpy, top, 1426 vt = XCreateSimpleWindow (dpy, top,
1187 window_vt_x, window_vt_y, 1427 window_vt_x, window_vt_y,
1188 width, height, 1428 vt_width, vt_height,
1189 0, 1429 0,
1190 pix_colors_focused[Color_fg], 1430 pix_colors_focused[Color_fg],
1191 pix_colors_focused[Color_bg]); 1431 pix_colors_focused[Color_bg]);
1192 1432
1193 attributes.bit_gravity = NorthWestGravity; 1433 attributes.bit_gravity = NorthWestGravity;
… …
1220 if (rs[Rs_fade]) 1460 if (rs[Rs_fade])
1221 pix_colors = pix_colors_unfocused; 1461 pix_colors = pix_colors_unfocused;
1222#endif 1462#endif
1223 1463
1224 pointer_unblank (); 1464 pointer_unblank ();
1225 scr_recolour (); 1465 scr_recolor ();
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} 1466}
1389 1467
1390/*----------------------------------------------------------------------*/ 1468/*----------------------------------------------------------------------*/
1391/* 1469/*
1392 * Run the command in a subprocess and return a file descriptor for the 1470 * Run the command in a subprocess and return a file descriptor for the
… …
1404 if (pty->pty >= 0) 1482 if (pty->pty >= 0)
1405 { 1483 {
1406 if (getfd_hook) 1484 if (getfd_hook)
1407 pty->pty = (*getfd_hook) (pty->pty); 1485 pty->pty = (*getfd_hook) (pty->pty);
1408 1486
1409 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1487 if (pty->pty < 0)
1410 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1488 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1411 } 1489 }
1412 } 1490 }
1413 else 1491 else
1414#endif 1492#endif
1415 if (!pty->get ()) 1493 if (!pty->get ())
1416 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1494 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1417 1495
1418 int er; 1496 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1497
1498 struct termios tio = def_tio;
1419 1499
1420#ifndef NO_BACKSPACE_KEY 1500#ifndef NO_BACKSPACE_KEY
1421 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1501 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1422 er = rs[Rs_backspace_key][0]; 1502 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1423 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1503 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1424 er = '\177'; /* the initial state anyway */ 1504 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1425 else
1426#endif 1505#endif
1427 er = -1;
1428 1506
1429 rxvt_get_ttymode (&tio, er);
1430 /* init terminal attributes */ 1507 /* init terminal attributes */
1431 cfsetospeed (&tio, BAUDRATE); 1508 cfsetospeed (&tio, BAUDRATE);
1432 cfsetispeed (&tio, BAUDRATE); 1509 cfsetispeed (&tio, BAUDRATE);
1433 tcsetattr (pty->tty, TCSANOW, &tio); 1510 tcsetattr (pty->tty, TCSANOW, &tio);
1434 pty->set_utf8_mode (enc_utf8); 1511 pty->set_utf8_mode (enc_utf8);
… …
1474 1551
1475 _exit (EXIT_FAILURE); 1552 _exit (EXIT_FAILURE);
1476 1553
1477 default: 1554 default:
1478 if (!option (Opt_utmpInhibit)) 1555 if (!option (Opt_utmpInhibit))
1556 {
1557#ifdef LOG_ONLY_ON_LOGIN
1558 bool login_shell = option (Opt_loginShell);
1559#else
1560 bool login_shell = true;
1561#endif
1479 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1562 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1563 }
1480 1564
1481 pty->close_tty (); 1565 pty->close_tty ();
1482 1566
1483 child_ev.start (cmd_pid); 1567 child_ev.start (cmd_pid);
1484 1568
… …
1509#elif defined (SRIOCSREDIR) 1593#elif defined (SRIOCSREDIR)
1510 int fd; 1594 int fd;
1511 1595
1512 fd = open (CONSOLE, O_WRONLY, 0); 1596 fd = open (CONSOLE, O_WRONLY, 0);
1513 if (fd >= 0) 1597 if (fd >= 0)
1514 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1598 {
1599 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1515 close (fd); 1600 close (fd);
1601 }
1516#endif /* SRIOCSREDIR */ 1602#endif /* SRIOCSREDIR */
1517 } 1603 }
1518 1604
1519 /* reset signals and spin off the command interpreter */ 1605 /* reset signals and spin off the command interpreter */
1520 signal (SIGINT, SIG_DFL); 1606 signal (SIGINT, SIG_DFL);
1521 signal (SIGQUIT, SIG_DFL); 1607 signal (SIGQUIT, SIG_DFL);
1522 signal (SIGCHLD, SIG_DFL); 1608 signal (SIGCHLD, SIG_DFL);
1523 signal (SIGHUP, SIG_DFL); 1609 signal (SIGHUP, SIG_DFL);
1524 signal (SIGPIPE, SIG_DFL); 1610 signal (SIGPIPE, SIG_DFL);
1525 /* 1611 /*
1526 * mimick login's behavior by disabling the job control signals 1612 * mimic login's behavior by disabling the job control signals
1527 * a shell that wants them can turn them back on 1613 * a shell that wants them can turn them back on
1528 */ 1614 */
1529#ifdef SIGTSTP 1615#ifdef SIGTSTP
1530 signal (SIGTSTP, SIG_IGN); 1616 signal (SIGTSTP, SIG_IGN);
1531 signal (SIGTTIN, SIG_IGN); 1617 signal (SIGTTIN, SIG_IGN);
1532 signal (SIGTTOU, SIG_IGN); 1618 signal (SIGTTOU, SIG_IGN);
1533#endif /* SIGTSTP */ 1619#endif /* SIGTSTP */
1534 1620
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 */ 1621 /* command interpreter path */
1541 if (argv) 1622 if (argv)
1542 { 1623 {
1543# ifdef DEBUG_CMD 1624# ifdef DEBUG_CMD
1544 int i; 1625 int i;
… …
1555 const char *argv0, *shell; 1636 const char *argv0, *shell;
1556 1637
1557 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1638 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1558 shell = "/bin/sh"; 1639 shell = "/bin/sh";
1559 1640
1560 argv0 = (const char *)rxvt_basename (shell); 1641 argv0 = rxvt_basename (shell);
1561 1642
1562 if (option (Opt_loginShell)) 1643 if (option (Opt_loginShell))
1563 { 1644 {
1564 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1645 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1565 1646

Diff Legend

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