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.251 by ayin, Tue Feb 19 18:15:26 2008 UTC vs.
Revision 1.342 by root, Mon Dec 15 02:04:02 2014 UTC

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

Diff Legend

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