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.245 by ayin, Sun Jan 27 16:52:13 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 HAVE_SCROLLBARS
273 COLOR_SCROLLBAR, 524 COLOR_SCROLLBAR,
274#endif
275#ifdef RXVT_SCROLLBAR 525#ifdef RXVT_SCROLLBAR
276 COLOR_SCROLLTROUGH, 526 COLOR_SCROLLTROUGH,
277#endif 527#endif
278#if ENABLE_TRANSPARENCY 528#if BG_IMAGE_FROM_ROOT
279 NULL, 529 NULL,
280#endif 530#endif
281#if OFF_FOCUS_FADING 531#if OFF_FOCUS_FADING
282 "rgb:00/00/00", 532 "rgb:00/00/00",
283#endif 533#endif
… …
295 ncol = 80; 545 ncol = 80;
296 nrow = 24; 546 nrow = 24;
297 int_bwidth = INTERNALBORDERWIDTH; 547 int_bwidth = INTERNALBORDERWIDTH;
298 ext_bwidth = EXTERNALBORDERWIDTH; 548 ext_bwidth = EXTERNALBORDERWIDTH;
299 lineSpace = LINESPACE; 549 lineSpace = LINESPACE;
550 letterSpace = LETTERSPACE;
300 saveLines = SAVELINES; 551 saveLines = SAVELINES;
301 552
302 refresh_type = SLOW_REFRESH; 553 refresh_type = SLOW_REFRESH;
303 554
304 oldcursor.row = oldcursor.col = -1; 555 oldcursor.row = oldcursor.col = -1;
… …
309 set_option (Opt_skipScroll); 560 set_option (Opt_skipScroll);
310 set_option (Opt_secondaryScreen); 561 set_option (Opt_secondaryScreen);
311 set_option (Opt_secondaryScroll); 562 set_option (Opt_secondaryScroll);
312 set_option (Opt_pastableTabs); 563 set_option (Opt_pastableTabs);
313 set_option (Opt_intensityStyles); 564 set_option (Opt_intensityStyles);
565 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 566 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 567 set_option (Opt_buffered);
316}
317
318static void
319init_secondary ()
320{
321 int i;
322
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 dup2 (STDERR_FILENO, STDIN_FILENO);
326 }
327 else if (i != STDIN_FILENO)
328 {
329 dup2 (i, STDIN_FILENO);
330 close (i);
331 }
332
333 dup2 (STDERR_FILENO, STDOUT_FILENO);
334} 568}
335 569
336/*----------------------------------------------------------------------*/ 570/*----------------------------------------------------------------------*/
337const char ** 571const char **
338rxvt_term::init_resources (int argc, const char *const *argv) 572rxvt_term::init_resources (int argc, const char *const *argv)
339{ 573{
340 int i, r_argc; 574 int i;
341 const char **cmd_argv, **r_argv; 575 const char **cmd_argv;
342
343 /*
344 * Look for -e option. Find => split and make cmd_argv[] of command args
345 */
346 for (r_argc = 0; r_argc < argc; r_argc++)
347 if (!strcmp (argv[r_argc], "-e"))
348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
363
364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
365
366 for (i = 0; i < r_argc; i++)
367 r_argv[i] = (const char *)argv[i];
368
369 r_argv[i] = NULL;
370 576
371 rs[Rs_name] = rxvt_basename (argv[0]); 577 rs[Rs_name] = rxvt_basename (argv[0]);
372 578
373 /* 579 /*
374 * Open display, get options/resources and create the window 580 * Open display, get options/resources and create the window
375 */ 581 */
376 582
377 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 583 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
378 rs[Rs_display_name] = ":0"; 584 rs[Rs_display_name] = ":0";
379 585
380 get_options (r_argc, r_argv); 586 cmd_argv = get_options (argc, argv);
381 587
382 if (!(display = displays.get (rs[Rs_display_name]))) 588 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
385 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]);
386 }
387 590
388 // using a local pointer decreases code size a lot 591 // using a local pointer decreases code size a lot
389 xa = display->xa; 592 xa = display->xa;
390 593
391 set (display); 594 set (display);
392 extract_resources (); 595 extract_resources ();
393 596
394#if XFT 597#if ENABLE_FRILLS
395 if (rs[Rs_depth]) 598 if (rs[Rs_visual])
396 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));
397#endif 602#endif
398
399#ifdef HAVE_AFTERIMAGE
400 set_application_name ((char*)rs[Rs_name]);
401 set_output_threshold (OUTPUT_LEVEL_WARNING);
402 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
403#endif
404 free (r_argv);
405 603
406 for (int i = NUM_RESOURCES; i--; ) 604 for (int i = NUM_RESOURCES; i--; )
407 if (rs [i] == resval_undef) 605 if (rs [i] == resval_undef)
408 rs [i] = 0; 606 rs [i] = 0;
409 607
… …
417 { 615 {
418 rxvt_perl.init (this); 616 rxvt_perl.init (this);
419 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 617 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
420 } 618 }
421#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 ();
422 624
423 /* 625 /*
424 * set any defaults not already set 626 * set any defaults not already set
425 */ 627 */
426 if (cmd_argv && cmd_argv[0]) 628 if (cmd_argv && cmd_argv[0])
427 { 629 {
428 if (!rs[Rs_title]) 630 if (!rs[Rs_title])
429 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 631 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
632
430 if (!rs[Rs_iconName]) 633 if (!rs[Rs_iconName])
431 rs[Rs_iconName] = rs[Rs_title]; 634 rs[Rs_iconName] = rs[Rs_title];
432 } 635 }
433 else 636 else
434 { 637 {
435 if (!rs[Rs_title]) 638 if (!rs[Rs_title])
436 rs[Rs_title] = rs[Rs_name]; 639 rs[Rs_title] = rs[Rs_name];
640
437 if (!rs[Rs_iconName]) 641 if (!rs[Rs_iconName])
438 rs[Rs_iconName] = rs[Rs_name]; 642 rs[Rs_iconName] = rs[Rs_name];
439 } 643 }
440 644
441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 645 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
448 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)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 653 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 654
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 655 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 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]);
453#endif 660#endif
454 661
455#ifdef POINTER_BLANK 662#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 663 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 664 pointerBlankDelay = i;
458 else 665 else
459 pointerBlankDelay = 2; 666 pointerBlankDelay = 2;
460#endif 667#endif
461 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
462 /* no point having a scrollbar without having any scrollback! */ 676 /* no point having a scrollbar without having any scrollback! */
463 if (!saveLines) 677 if (!saveLines)
464 set_option (Opt_scrollBar, 0); 678 set_option (Opt_scrollBar, 0);
465
466#ifdef PRINTPIPE
467 if (!rs[Rs_print_pipe])
468 rs[Rs_print_pipe] = PRINTPIPE;
469#endif
470 679
471 if (!rs[Rs_cutchars]) 680 if (!rs[Rs_cutchars])
472 rs[Rs_cutchars] = CUTCHARS; 681 rs[Rs_cutchars] = CUTCHARS;
473 682
474#ifndef NO_BACKSPACE_KEY 683#ifndef NO_BACKSPACE_KEY
… …
487# else 696# else
488 rs[Rs_delete_key] = "\033[3~"; 697 rs[Rs_delete_key] = "\033[3~";
489# endif 698# endif
490#endif 699#endif
491 700
492#ifdef HAVE_SCROLLBARS 701 scrollBar.setup (this);
493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
494#endif
495 702
496#ifdef XTERM_REVERSE_VIDEO 703#ifdef XTERM_REVERSE_VIDEO
497 /* this is how xterm implements reverseVideo */ 704 /* this is how xterm implements reverseVideo */
498 if (option (Opt_reverseVideo)) 705 if (option (Opt_reverseVideo))
499 { 706 {
… …
537 return cmd_argv; 744 return cmd_argv;
538} 745}
539 746
540/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
541void 748void
542rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 749rxvt_term::init (stringvec *argv, stringvec *envv)
543{ 750{
751 argv->push_back (0);
752 envv->push_back (0);
753
754 this->argv = argv;
544 this->envv = envv; 755 this->envv = envv;
545 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{
546 SET_R (this); 786 SET_R (this);
547 set_locale (""); 787 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :( 788 set_environ (env); // a few things in X do not call setlocale :(
549 789
550 init_vars (); 790 init_vars ();
551
552 init_secondary ();
553 791
554 const char **cmd_argv = init_resources (argc, argv); 792 const char **cmd_argv = init_resources (argc, argv);
555 793
556#ifdef KEYSYM_RESOURCE 794#ifdef KEYSYM_RESOURCE
557 keyboard->register_done (); 795 keyboard->register_done ();
558#endif 796#endif
559 797
560#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
561 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */ 809 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
563#endif
564 810
565 pty = ptytty::create (); 811 pty = ptytty::create ();
566 812
567 create_windows (argc, argv); 813 create_windows (argc, argv);
568 814
569 init_xlocale (); 815 init_xlocale ();
570 816
571 scr_reset (); // initialize screen 817 scr_poweron (); // initialize screen
572 818
573#if 0 819#if 0
574 XSynchronize (dpy, True); 820 XSynchronize (dpy, True);
575#endif 821#endif
576 822
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar)) 823 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */ 824 scrollBar.resize (); /* create and map scrollbar */
580#endif 825
581#ifdef HAVE_BG_PIXMAP 826#ifdef HAVE_BG_PIXMAP
582 { 827 bg_init ();
583 bgPixmap.set_target (this);
584 bgPixmap.invalidate ();
585
586#ifdef ENABLE_TRANSPARENCY
587 if (option (Opt_transparent))
588 {
589 bgPixmap.set_transparent ();
590
591#ifdef HAVE_AFTERIMAGE
592 if (rs [Rs_blurradius])
593 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
594#endif
595 if (ISSET_PIXCOLOR (Color_tint))
596 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
597
598 if (rs [Rs_shade])
599 bgPixmap.set_shade (rs [Rs_shade]);
600
601 bgPixmap.set_root_pixmap ();
602 XSelectInput (dpy, display->root, PropertyChangeMask);
603 rootwin_ev.start (display, display->root);
604 }
605#endif
606
607#ifdef BG_IMAGE_FROM_FILE
608 if (rs[Rs_backgroundPixmap])
609 {
610 const char *p = rs[Rs_backgroundPixmap];
611
612 if ((p = strchr (p, ';')) != 0)
613 {
614 p++;
615 bgPixmap.set_geometry (p);
616 }
617 else
618 bgPixmap.set_defaultGeometry ();
619
620 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
621 if (!bgPixmap.window_position_sensitive ())
622 update_background ();
623 }
624#endif
625 }
626#endif 828#endif
627 829
628#if ENABLE_PERL 830#if ENABLE_PERL
629 rootwin_ev.start (display, display->root); 831 rootwin_ev.start (display, display->root);
630#endif 832#endif
631 833
632 set_colorfgbg (); 834 init_done = 1;
633 835
634 init_command (cmd_argv); 836 init_command (cmd_argv);
635
636 free (cmd_argv);
637 837
638 if (pty->pty >= 0) 838 if (pty->pty >= 0)
639 pty_ev.start (pty->pty, ev::READ); 839 pty_ev.start (pty->pty, ev::READ);
640 840
641 HOOK_INVOKE ((this, HOOK_START, DT_END)); 841 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
643#if ENABLE_XEMBED 843#if ENABLE_XEMBED
644 if (rs[Rs_embed]) 844 if (rs[Rs_embed])
645 { 845 {
646 long info[2] = { 0, XEMBED_MAPPED }; 846 long info[2] = { 0, XEMBED_MAPPED };
647 847
648 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 848 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
649 32, PropModeReplace, (unsigned char *)&info, 2); 849 32, PropModeReplace, (unsigned char *)&info, 2);
650 } 850 }
651#endif 851#endif
652 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
653 XMapWindow (dpy, vt); 865 XMapWindow (dpy, vt);
654 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
655 879
656 refresh_check (); 880 refresh_check ();
657} 881}
658 882
659/*----------------------------------------------------------------------*/ 883/*----------------------------------------------------------------------*/
660void 884void
661rxvt_term::init_env () 885rxvt_term::init_env ()
662{ 886{
663 int i;
664 char *val; 887 char *val;
888 char *env_display;
889 char *env_windowid;
890 char *env_colorfgbg;
891 char *env_term;
665 892
666#ifdef DISPLAY_IS_IP 893#ifdef DISPLAY_IS_IP
667 /* Fixup display_name for export over pty to any interested terminal 894 /* Fixup display_name for export over pty to any interested terminal
668 * 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
669 * (for the first non-loopback interface) that we get from 896 * (for the first non-loopback interface) that we get from
… …
682 val = XDisplayString (dpy); 909 val = XDisplayString (dpy);
683 910
684 if (rs[Rs_display_name] == NULL) 911 if (rs[Rs_display_name] == NULL)
685 rs[Rs_display_name] = val; /* use broken `:0' value */ 912 rs[Rs_display_name] = val; /* use broken `:0' value */
686 913
687 i = strlen (val);
688 env_display = (char *)rxvt_malloc (i + 9); 914 env_display = (char *)rxvt_malloc (strlen (val) + 9);
689 915
690 sprintf (env_display, "DISPLAY=%s", val); 916 sprintf (env_display, "DISPLAY=%s", val);
691 917
918 env_windowid = (char *)rxvt_malloc (21);
692 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
693 920
694 /* add entries to the environment: 921 /* add entries to the environment:
695 * @ DISPLAY: in case we started with -display 922 * @ DISPLAY: in case we started with -display
696 * @ WINDOWID: X window id number of the window 923 * @ WINDOWID: X window id number of the window
697 * @ COLORTERM: terminal sub-name and also indicates its color 924 * @ COLORTERM: terminal sub-name and also indicates its color
… …
700 * @ COLORFGBG: fg;bg color codes 927 * @ COLORFGBG: fg;bg color codes
701 */ 928 */
702 putenv (env_display); 929 putenv (env_display);
703 putenv (env_windowid); 930 putenv (env_windowid);
704 931
705 if (env_colorfgbg) 932 env_colorfgbg = get_colorfgbg ();
706 putenv (env_colorfgbg); 933 putenv (env_colorfgbg);
707 934
708#ifdef RXVT_TERMINFO 935#ifdef RXVT_TERMINFO
709 putenv ("TERMINFO=" RXVT_TERMINFO); 936 putenv ("TERMINFO=" RXVT_TERMINFO);
710#endif 937#endif
711 938
… …
730 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
731#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
732} 959}
733 960
734/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
735/*
736 * This is more or less stolen straight from XFree86 xterm.
737 * This should support all European type languages.
738 */
739void 962void
740rxvt_term::set_locale (const char *locale) 963rxvt_term::set_locale (const char *locale)
741{ 964{
742 set_environ (envv); 965 set_environ (env);
743 966
744#if HAVE_XSETLOCALE || HAVE_SETLOCALE
745 free (this->locale); 967 free (this->locale);
746 this->locale = setlocale (LC_CTYPE, locale); 968 this->locale = setlocale (LC_CTYPE, locale);
747 969
748 if (!this->locale) 970 if (!this->locale)
749 { 971 {
… …
760 982
761 983
762 this->locale = strdup (this->locale); 984 this->locale = strdup (this->locale);
763 SET_LOCALE (this->locale); 985 SET_LOCALE (this->locale);
764 mbstate.reset (); 986 mbstate.reset ();
765#endif
766 987
767#if HAVE_NL_LANGINFO 988#if HAVE_NL_LANGINFO
768 char *codeset = strdup (nl_langinfo (CODESET)); 989 char *codeset = nl_langinfo (CODESET);
769 // /^UTF.?8/i 990 // /^UTF.?8/i
770 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 991 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
771 && (codeset[1] == 'T' || codeset[1] == 't') 992 && (codeset[1] == 'T' || codeset[1] == 't')
772 && (codeset[2] == 'F' || codeset[2] == 'f') 993 && (codeset[2] == 'F' || codeset[2] == 'f')
773 && (codeset[3] == '8' || codeset[4] == '8'); 994 && (codeset[3] == '8' || codeset[4] == '8');
774 free (codeset);
775#else 995#else
776 enc_utf8 = 0; 996 enc_utf8 = 0;
777#endif 997#endif
778} 998}
779 999
780void 1000void
781rxvt_term::init_xlocale () 1001rxvt_term::init_xlocale ()
782{ 1002{
783 set_environ (envv); 1003 set_environ (env);
784 1004
785#ifdef USE_XIM 1005#if USE_XIM
786 if (!locale) 1006 if (!locale)
787 rxvt_warn ("setting locale failed, working without locale support.\n"); 1007 rxvt_warn ("setting locale failed, continuing without locale support.\n");
788 else 1008 else
789 { 1009 {
790 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
791 1011
792 if (!XSupportsLocale ()) 1012 if (!XSupportsLocale ())
793 { 1013 {
794 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");
795 return; 1015 return;
796 } 1016 }
797 1017
798 im_ev.start (display); 1018 im_ev.start (display);
799 1019
… …
840 run_command (argv); 1060 run_command (argv);
841} 1061}
842 1062
843/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
844void 1064void
845rxvt_term::Get_Colours () 1065rxvt_term::get_colors ()
846{ 1066{
847 int i; 1067 int i;
848 1068
849#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
850 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
851#endif 1071#endif
852 1072
853 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < NRS_COLORS; i++)
854 {
855 const char *name = rs[Rs_color + i]; 1074 if (const char *name = rs[Rs_color + i])
856
857 if (!name)
858 continue;
859
860 rxvt_color xcol;
861
862 if (!set_color (xcol, name)) 1075 set_color (pix_colors [i], name);
863 {
864#ifndef XTERM_REVERSE_VIDEO
865 if (i < 2 && option (Opt_reverseVideo))
866 name = def_colorName [1 - i];
867 else
868#endif
869 name = def_colorName [i];
870
871 if (!name)
872 continue;
873
874 if (!set_color (xcol, name))
875 {
876 switch (i)
877 {
878 case Color_fg:
879 case Color_bg:
880 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
881 name = "";
882 break;
883#ifndef NO_CURSORCOLOR
884 case Color_cursor2:
885#endif
886 case Color_pointer_fg:
887 name = rs[Rs_color + Color_fg];
888 xcol.set (this, name);
889 break;
890 default:
891 name = rs[Rs_color + Color_bg];
892 xcol.set (this, name);
893 break;
894 }
895 }
896 }
897
898 pix_colors[i] = xcol;
899 rs[Rs_color + i] = name;
900 }
901
902 if (depth <= 2)
903 {
904 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
905 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
906 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
907 }
908 1076
909 /* 1077 /*
910 * get scrollBar shadow colors 1078 * get scrollBar shadow colors
911 * 1079 *
912 * The calculations of topShadow/bottomShadow values are adapted 1080 * The calculations of topShadow/bottomShadow values are adapted
913 * from the fvwm window manager. 1081 * from the fvwm window manager.
914 */ 1082 */
915#ifdef RXVT_SCROLLBAR 1083#ifdef RXVT_SCROLLBAR
916 if (depth <= 2)
917 {
918 /* Monochrome */
919 alias_color (Color_scroll, Color_fg);
920 alias_color (Color_topShadow, Color_bg);
921 alias_color (Color_bottomShadow, Color_bg);
922 }
923 else
924 {
925 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1084 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
926 1085
927 rgba cscroll; 1086 rgba cscroll;
928 pix_colors [Color_scroll].get (cscroll); 1087 pix_colors [Color_scroll].get (cscroll);
929 1088
930 /* topShadowColor */ 1089 /* topShadowColor */
931 if (!pix_colors[Color_topShadow].set (this, 1090 if (!pix_colors[Color_topShadow].set (this,
932 rgba ( 1091 rgba (
933 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),
934 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),
935 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),
936 cscroll.a) 1095 cscroll.a)
937 )) 1096 ))
938 alias_color (Color_topShadow, Color_White); 1097 alias_color (Color_topShadow, Color_White);
939 }
940#endif 1098#endif
941 1099
942#ifdef OFF_FOCUS_FADING 1100#ifdef OFF_FOCUS_FADING
943 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < NRS_COLORS; i++)
944 update_fade_color (i); 1102 update_fade_color (i, true);
945#endif 1103#endif
946} 1104}
947 1105
948/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
949/* color aliases, fg/bg bright-bold */ 1107/* color aliases, fg/bg bright-bold */
950void 1108void
951rxvt_term::color_aliases (int idx) 1109rxvt_term::color_aliases (int idx)
952{ 1110{
953 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1111 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
954 { 1112 {
955 int i = atoi (rs[Rs_color + idx]); 1113 int i = atoi (rs[Rs_color + idx]);
956 1114
957 if (i >= 8 && i <= 15) 1115 if (i >= 8 && i <= 15)
958 /* bright colors */ 1116 /* bright colors */
… …
998 for (j = map->max_keypermod; j--; k++) 1156 for (j = map->max_keypermod; j--; k++)
999 { 1157 {
1000 if (kc[k] == 0) 1158 if (kc[k] == 0)
1001 break; 1159 break;
1002 1160
1003 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1161 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1004 { 1162 {
1005 case XK_Num_Lock: 1163 case XK_Num_Lock:
1006 ModNumLockMask = modmasks[i - 1]; 1164 ModNumLockMask = modmasks[i - 1];
1007 continue; 1165 continue;
1008 1166
… …
1050 1208
1051 if (i) 1209 if (i)
1052 ModMetaMask = modmasks[i - 1]; 1210 ModMetaMask = modmasks[i - 1];
1053} 1211}
1054 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
1055/*----------------------------------------------------------------------*/ 1274/*----------------------------------------------------------------------*/
1056/* rxvt_Create_Windows () - Open and map the window */ 1275/* Open and map the window */
1057void 1276void
1058rxvt_term::create_windows (int argc, const char *const *argv) 1277rxvt_term::create_windows (int argc, const char *const *argv)
1059{ 1278{
1060 XClassHint classHint; 1279 XClassHint classHint;
1061 XWMHints wmHint; 1280 XWMHints wmHint;
… …
1067 Window top, parent; 1286 Window top, parent;
1068 1287
1069 dLocal (Display *, dpy); 1288 dLocal (Display *, dpy);
1070 1289
1071 /* grab colors before netscape does */ 1290 /* grab colors before netscape does */
1072 Get_Colours (); 1291 get_colors ();
1073 1292
1074 if (!set_fonts ()) 1293 if (!set_fonts ())
1075 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");
1076 1295
1077 parent = display->root; 1296 parent = display->root;
… …
1107 } 1326 }
1108#endif 1327#endif
1109 1328
1110 window_calc (0, 0); 1329 window_calc (0, 0);
1111 1330
1112 /* sub-window placement & size in rxvt_resize_subwindows () */ 1331 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1113 attributes.background_pixel = pix_colors_focused [Color_border]; 1332 attributes.background_pixel = pix_colors_focused [Color_border];
1114 attributes.border_pixel = pix_colors_focused [Color_border]; 1333 attributes.border_pixel = pix_colors_focused [Color_border];
1115 attributes.colormap = cmap; 1334 attributes.colormap = cmap;
1116 1335
1117 top = XCreateWindow (dpy, parent, 1336 top = XCreateWindow (dpy, parent,
… …
1120 ext_bwidth, 1339 ext_bwidth,
1121 depth, InputOutput, visual, 1340 depth, InputOutput, visual,
1122 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1341 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1123 &attributes); 1342 &attributes);
1124 1343
1125 this->parent[0] = top; 1344 this->parent = top;
1126 1345
1127 old_width = szHint.width; 1346 set_title (rs [Rs_title]);
1128 old_height = szHint.height; 1347 set_icon_name (rs [Rs_iconName]);
1129
1130 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1131 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1132 1348
1133 classHint.res_name = (char *)rs[Rs_name]; 1349 classHint.res_name = (char *)rs[Rs_name];
1134 classHint.res_class = (char *)RESCLASS; 1350 classHint.res_class = (char *)RESCLASS;
1135 1351
1136 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1352 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1137 wmHint.input = True; 1353 wmHint.input = True;
1138 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1354 wmHint.initial_state = option (Opt_iconic) ? IconicState
1355 : option (Opt_dockapp) ? WithdrawnState
1356 : NormalState;
1139 wmHint.window_group = top; 1357 wmHint.window_group = top;
1140 1358
1141 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1359 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1142 &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
1143 1370
1144#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
1145 if (mwmhints.flags) 1372 if (mwmhints.flags)
1146 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,
1147 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1374 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1152#if ENABLE_EWMH 1379#if ENABLE_EWMH
1153 xa[XA_NET_WM_PING], 1380 xa[XA_NET_WM_PING],
1154#endif 1381#endif
1155 }; 1382 };
1156 1383
1157 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1384 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1158 1385
1159#if ENABLE_FRILLS 1386#if ENABLE_FRILLS
1160 if (rs[Rs_transient_for]) 1387 if (rs[Rs_transient_for])
1161 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1388 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1162#endif 1389#endif
… …
1180 | ExposureMask | StructureNotifyMask); 1407 | ExposureMask | StructureNotifyMask);
1181 1408
1182 termwin_ev.start (display, top); 1409 termwin_ev.start (display, top);
1183 1410
1184 /* 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
1185 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1423 TermWin_cursor = XCreateFontCursor (dpy, shape);
1186 1424
1187 /* the vt window */ 1425 /* the vt window */
1188 vt = XCreateSimpleWindow (dpy, top, 1426 vt = XCreateSimpleWindow (dpy, top,
1189 window_vt_x, window_vt_y, 1427 window_vt_x, window_vt_y,
1190 width, height, 1428 vt_width, vt_height,
1191 0, 1429 0,
1192 pix_colors_focused[Color_fg], 1430 pix_colors_focused[Color_fg],
1193 pix_colors_focused[Color_bg]); 1431 pix_colors_focused[Color_bg]);
1194 1432
1195 attributes.bit_gravity = NorthWestGravity; 1433 attributes.bit_gravity = NorthWestGravity;
… …
1222 if (rs[Rs_fade]) 1460 if (rs[Rs_fade])
1223 pix_colors = pix_colors_unfocused; 1461 pix_colors = pix_colors_unfocused;
1224#endif 1462#endif
1225 1463
1226 pointer_unblank (); 1464 pointer_unblank ();
1227 scr_recolour (); 1465 scr_recolor ();
1228}
1229
1230/* ------------------------------------------------------------------------- *
1231 * GET TTY CURRENT STATE *
1232 * ------------------------------------------------------------------------- */
1233void
1234rxvt_get_ttymode (struct termios *tio, int erase)
1235{
1236 /*
1237 * standard System V termios interface
1238 */
1239 if (tcgetattr (STDIN_FILENO, tio) < 0)
1240 {
1241 // return error - use system defaults,
1242 // where possible, and zero elsewhere
1243 memset (tio, 0, sizeof (struct termios));
1244
1245 tio->c_cc[VINTR] = CINTR;
1246 tio->c_cc[VQUIT] = CQUIT;
1247 tio->c_cc[VERASE] = CERASE;
1248#ifdef VERASE2
1249 tio->c_cc[VERASE2] = CERASE2;
1250#endif
1251 tio->c_cc[VKILL] = CKILL;
1252 tio->c_cc[VSTART] = CSTART;
1253 tio->c_cc[VSTOP] = CSTOP;
1254 tio->c_cc[VSUSP] = CSUSP;
1255# ifdef VDSUSP
1256 tio->c_cc[VDSUSP] = CDSUSP;
1257# endif
1258# ifdef VREPRINT
1259 tio->c_cc[VREPRINT] = CRPRNT;
1260# endif
1261# ifdef VDISCRD
1262 tio->c_cc[VDISCRD] = CFLUSH;
1263# endif
1264# ifdef VWERSE
1265 tio->c_cc[VWERSE] = CWERASE;
1266# endif
1267# ifdef VLNEXT
1268 tio->c_cc[VLNEXT] = CLNEXT;
1269# endif
1270 }
1271
1272 tio->c_cc[VEOF] = CEOF;
1273 tio->c_cc[VEOL] = VDISABLE;
1274# ifdef VEOL2
1275 tio->c_cc[VEOL2] = VDISABLE;
1276# endif
1277# ifdef VSWTC
1278 tio->c_cc[VSWTC] = VDISABLE;
1279# endif
1280# ifdef VSWTCH
1281 tio->c_cc[VSWTCH] = VDISABLE;
1282# endif
1283# if VMIN != VEOF
1284 tio->c_cc[VMIN] = 1;
1285# endif
1286# if VTIME != VEOL
1287 tio->c_cc[VTIME] = 0;
1288# endif
1289
1290 if (erase != -1)
1291 tio->c_cc[VERASE] = (char)erase;
1292
1293 /* input modes */
1294 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1295# ifdef IMAXBEL
1296 | IMAXBEL
1297# endif
1298 | IXON);
1299
1300 /* output modes */
1301 tio->c_oflag = (OPOST | ONLCR);
1302
1303 /* control modes */
1304 tio->c_cflag = (CS8 | CREAD);
1305
1306 /* line discipline modes */
1307 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1308# if defined (ECHOCTL) && defined (ECHOKE)
1309 | ECHOCTL | ECHOKE
1310# endif
1311 | ECHOE | ECHOK);
1312
1313 /*
1314 * Debugging
1315 */
1316#ifdef DEBUG_TTYMODE
1317 /* c_iflag bits */
1318 fprintf (stderr, "Input flags\n");
1319
1320 /* cpp token stringize doesn't work on all machines <sigh> */
1321# define FOO(flag,name) \
1322 if ((tio->c_iflag) & flag) \
1323 fprintf (stderr, "%s ", name)
1324
1325 /* c_iflag bits */
1326 FOO (IGNBRK, "IGNBRK");
1327 FOO (BRKINT, "BRKINT");
1328 FOO (IGNPAR, "IGNPAR");
1329 FOO (PARMRK, "PARMRK");
1330 FOO (INPCK, "INPCK");
1331 FOO (ISTRIP, "ISTRIP");
1332 FOO (INLCR, "INLCR");
1333 FOO (IGNCR, "IGNCR");
1334 FOO (ICRNL, "ICRNL");
1335 FOO (IXON, "IXON");
1336 FOO (IXOFF, "IXOFF");
1337# ifdef IUCLC
1338 FOO (IUCLC, "IUCLC");
1339# endif
1340# ifdef IXANY
1341 FOO (IXANY, "IXANY");
1342# endif
1343# ifdef IMAXBEL
1344 FOO (IMAXBEL, "IMAXBEL");
1345# endif
1346
1347 fprintf (stderr, "\n");
1348
1349# undef FOO
1350# define FOO(entry, name) \
1351 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1352
1353 FOO (VINTR, "VINTR");
1354 FOO (VQUIT, "VQUIT");
1355 FOO (VERASE, "VERASE");
1356 FOO (VKILL, "VKILL");
1357 FOO (VEOF, "VEOF");
1358 FOO (VEOL, "VEOL");
1359# ifdef VEOL2
1360 FOO (VEOL2, "VEOL2");
1361# endif
1362# ifdef VSWTC
1363 FOO (VSWTC, "VSWTC");
1364# endif
1365# ifdef VSWTCH
1366 FOO (VSWTCH, "VSWTCH");
1367# endif
1368 FOO (VSTART, "VSTART");
1369 FOO (VSTOP, "VSTOP");
1370 FOO (VSUSP, "VSUSP");
1371# ifdef VDSUSP
1372 FOO (VDSUSP, "VDSUSP");
1373# endif
1374# ifdef VREPRINT
1375 FOO (VREPRINT, "VREPRINT");
1376# endif
1377# ifdef VDISCRD
1378 FOO (VDISCRD, "VDISCRD");
1379# endif
1380# ifdef VWERSE
1381 FOO (VWERSE, "VWERSE");
1382# endif
1383# ifdef VLNEXT
1384 FOO (VLNEXT, "VLNEXT");
1385# endif
1386
1387 fprintf (stderr, "\n");
1388# undef FOO
1389#endif /* DEBUG_TTYMODE */
1390} 1466}
1391 1467
1392/*----------------------------------------------------------------------*/ 1468/*----------------------------------------------------------------------*/
1393/* 1469/*
1394 * 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
… …
1406 if (pty->pty >= 0) 1482 if (pty->pty >= 0)
1407 { 1483 {
1408 if (getfd_hook) 1484 if (getfd_hook)
1409 pty->pty = (*getfd_hook) (pty->pty); 1485 pty->pty = (*getfd_hook) (pty->pty);
1410 1486
1411 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1487 if (pty->pty < 0)
1412 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1488 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1413 } 1489 }
1414 } 1490 }
1415 else 1491 else
1416#endif 1492#endif
1417 if (!pty->get ()) 1493 if (!pty->get ())
1418 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1494 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1419 1495
1420 int er; 1496 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1497
1498 struct termios tio = def_tio;
1421 1499
1422#ifndef NO_BACKSPACE_KEY 1500#ifndef NO_BACKSPACE_KEY
1423 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1501 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1424 er = rs[Rs_backspace_key][0]; 1502 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1425 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1503 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1426 er = '\177'; /* the initial state anyway */ 1504 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1427 else
1428#endif 1505#endif
1429 er = -1;
1430 1506
1431 rxvt_get_ttymode (&tio, er);
1432 /* init terminal attributes */ 1507 /* init terminal attributes */
1433 cfsetospeed (&tio, BAUDRATE); 1508 cfsetospeed (&tio, BAUDRATE);
1434 cfsetispeed (&tio, BAUDRATE); 1509 cfsetispeed (&tio, BAUDRATE);
1435 tcsetattr (pty->tty, TCSANOW, &tio); 1510 tcsetattr (pty->tty, TCSANOW, &tio);
1436 pty->set_utf8_mode (enc_utf8); 1511 pty->set_utf8_mode (enc_utf8);
… …
1476 1551
1477 _exit (EXIT_FAILURE); 1552 _exit (EXIT_FAILURE);
1478 1553
1479 default: 1554 default:
1480 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
1481 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1562 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1563 }
1482 1564
1483 pty->close_tty (); 1565 pty->close_tty ();
1484 1566
1485 child_ev.start (cmd_pid); 1567 child_ev.start (cmd_pid);
1486 1568
… …
1511#elif defined (SRIOCSREDIR) 1593#elif defined (SRIOCSREDIR)
1512 int fd; 1594 int fd;
1513 1595
1514 fd = open (CONSOLE, O_WRONLY, 0); 1596 fd = open (CONSOLE, O_WRONLY, 0);
1515 if (fd >= 0) 1597 if (fd >= 0)
1516 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1598 {
1599 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1517 close (fd); 1600 close (fd);
1601 }
1518#endif /* SRIOCSREDIR */ 1602#endif /* SRIOCSREDIR */
1519 } 1603 }
1520 1604
1521 /* reset signals and spin off the command interpreter */ 1605 /* reset signals and spin off the command interpreter */
1522 signal (SIGINT, SIG_DFL); 1606 signal (SIGINT, SIG_DFL);
1523 signal (SIGQUIT, SIG_DFL); 1607 signal (SIGQUIT, SIG_DFL);
1524 signal (SIGCHLD, SIG_DFL); 1608 signal (SIGCHLD, SIG_DFL);
1525 signal (SIGHUP, SIG_DFL); 1609 signal (SIGHUP, SIG_DFL);
1526 signal (SIGPIPE, SIG_DFL); 1610 signal (SIGPIPE, SIG_DFL);
1527 /* 1611 /*
1528 * mimick login's behavior by disabling the job control signals 1612 * mimic login's behavior by disabling the job control signals
1529 * a shell that wants them can turn them back on 1613 * a shell that wants them can turn them back on
1530 */ 1614 */
1531#ifdef SIGTSTP 1615#ifdef SIGTSTP
1532 signal (SIGTSTP, SIG_IGN); 1616 signal (SIGTSTP, SIG_IGN);
1533 signal (SIGTTIN, SIG_IGN); 1617 signal (SIGTTIN, SIG_IGN);
1534 signal (SIGTTOU, SIG_IGN); 1618 signal (SIGTTOU, SIG_IGN);
1535#endif /* SIGTSTP */ 1619#endif /* SIGTSTP */
1536 1620
1537 // unblock signals (signals are blocked by iom.C
1538 sigset_t ss;
1539 sigemptyset (&ss);
1540 sigprocmask (SIG_SETMASK, &ss, 0);
1541
1542 /* command interpreter path */ 1621 /* command interpreter path */
1543 if (argv) 1622 if (argv)
1544 { 1623 {
1545# ifdef DEBUG_CMD 1624# ifdef DEBUG_CMD
1546 int i; 1625 int i;
… …
1557 const char *argv0, *shell; 1636 const char *argv0, *shell;
1558 1637
1559 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1638 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1560 shell = "/bin/sh"; 1639 shell = "/bin/sh";
1561 1640
1562 argv0 = (const char *)rxvt_basename (shell); 1641 argv0 = rxvt_basename (shell);
1563 1642
1564 if (option (Opt_loginShell)) 1643 if (option (Opt_loginShell))
1565 { 1644 {
1566 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1645 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1567 1646

Diff Legend

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