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

Diff Legend

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