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.223 by ayin, Mon Nov 26 10:33:36 2007 UTC vs.
Revision 1.338 by sf-exg, Mon Oct 6 11:11:19 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) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
18 * 16 *
19 * 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
20 * 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
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
23 * 21 *
24 * 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,
25 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <signal.h>
44
45#include <fcntl.h>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
50# ifdef HAVE_SETLOCALE
51# include <clocale> 51# include <locale.h>
52# endif
53#endif 52#endif
54 53
55#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
56# 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>
57#endif 61#endif
58 62
59#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h> 65#include <sys/types.h>
… …
72#include <netinet/in.h> 76#include <netinet/in.h>
73#include <arpa/inet.h> 77#include <arpa/inet.h>
74#include <net/if.h> 78#include <net/if.h>
75#include <net/if_arp.h> 79#include <net/if_arp.h>
76 80
77static char * 81static char * ecb_cold
78rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
79{ 83{
80 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
81 struct ifconf ifc; 85 struct ifconf ifc;
82 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
142 146
143 return rval; 147 return rval;
144} 148}
145#endif 149#endif
146 150
147const char *const def_colorName[] = 151static const char *const def_colorName[] =
148 { 152 {
149 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
150 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
151 /* low-intensity colors */ 155 /* low-intensity colors */
152 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
173 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
176 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
177 181
182#if !USE_256_COLORS
178 // 88 xterm colours 183 // 88 xterm colours
179 "rgb:00/00/00", 184 "rgb:00/00/00",
180 "rgb:00/00/8b", 185 "rgb:00/00/8b",
181 "rgb:00/00/cd", 186 "rgb:00/00/cd",
182 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
246 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
247 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
248 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
249 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
250 "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
251 499
252#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
253 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
254 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
255#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
… …
265#if ENABLE_FRILLS 513#if ENABLE_FRILLS
266 NULL, // Color_underline 514 NULL, // Color_underline
267#endif 515#endif
268#ifdef OPTION_HC 516#ifdef OPTION_HC
269 NULL, 517 NULL,
518 NULL,
270#endif 519#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 523#endif
275#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
276 NULL, 525 NULL,
277#endif 526#endif
278#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 528 "rgb:00/00/00",
280#endif 529#endif
281 }; 530 };
282 531
283bool 532void
284rxvt_term::init_vars () 533rxvt_term::init_vars ()
285{ 534{
286 pix_colors = // 535 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 536
293 MEvent.time = CurrentTime; 537 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 538 MEvent.button = AnyButton;
295 want_refresh = 1; 539 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 540 priv_modes = SavedModes = PrivMode_Default;
297 ncol = 80; 541 ncol = 80;
298 nrow = 24; 542 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
302 saveLines = SAVELINES; 547 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 548
305 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
306 550
307 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 552
310 set_option (Opt_scrollBar); 553 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 554 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 555 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
318 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
319 563 set_option (Opt_buffered);
320 return true;
321}
322
323void
324rxvt_term::init_secondary ()
325{
326 int i;
327
328 /*
329 * Close all unused file descriptors
330 * We don't want them, we don't need them.
331 */
332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO);
336 }
337 else if (i != STDIN_FILENO)
338 {
339 dup2 (i, STDIN_FILENO);
340 close (i);
341 }
342
343 dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345#if 0 // schmorp sayz closing filies is murder
346 for (i = STDERR_FILENO + 1; i < num_fds; i++)
347 {
348#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349 if (i == 4 || i == 7)
350 continue;
351#endif
352 close (i);
353 }
354#endif
355} 564}
356 565
357/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
358const char ** 567const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
360{ 569{
361 int i, r_argc; 570 int i;
362 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
363
364 /*
365 * Look for -e option. Find => split and make cmd_argv[] of command args
366 */
367 for (r_argc = 0; r_argc < argc; r_argc++)
368 if (!strcmp (argv[r_argc], "-e"))
369 break;
370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
384
385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
386
387 for (i = 0; i < r_argc; i++)
388 r_argv[i] = (const char *)argv[i];
389
390 r_argv[i] = NULL;
391 572
392 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
393 574
394 /* 575 /*
395 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
396 */ 577 */
397 578
398 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
399 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
400 581
401 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
402 583
403 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
406 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]);
407 }
408 586
409 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
410 xa = display->xa; 588 xa = display->xa;
411 589
412 set (display); 590 set (display);
413 extract_resources (); 591 extract_resources ();
414 592
415#if XFT 593#if ENABLE_FRILLS
416 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
417 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));
418#endif 598#endif
419
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv);
424 599
425 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
427 rs [i] = 0; 602 rs [i] = 0;
428 603
… …
436 { 611 {
437 rxvt_perl.init (this); 612 rxvt_perl.init (this);
438 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
439 } 614 }
440#endif 615#endif
616
617 extract_keysym_resources ();
441 618
442 /* 619 /*
443 * set any defaults not already set 620 * set any defaults not already set
444 */ 621 */
445 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
446 { 623 {
447 if (!rs[Rs_title]) 624 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 625 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
626
449 if (!rs[Rs_iconName]) 627 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 628 rs[Rs_iconName] = rs[Rs_title];
451 } 629 }
452 else 630 else
453 { 631 {
454 if (!rs[Rs_title]) 632 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 633 rs[Rs_title] = rs[Rs_name];
634
456 if (!rs[Rs_iconName]) 635 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 636 rs[Rs_iconName] = rs[Rs_name];
458 } 637 }
459 638
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 639 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
467 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 646 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
468 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
469 648
470 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
471 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 650 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
651
652 if (rs[Rs_letterSpace])
653 letterSpace = atoi (rs[Rs_letterSpace]);
472#endif 654#endif
473 655
474#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
475 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
476 pointerBlankDelay = i; 658 pointerBlankDelay = i;
477 else 659 else
478 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
479#endif 661#endif
480 662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
669
481 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 671 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 673
490 if (!rs[Rs_cutchars]) 674 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 675 rs[Rs_cutchars] = CUTCHARS;
492 676
493#ifndef NO_BACKSPACE_KEY 677#ifndef NO_BACKSPACE_KEY
… …
506# else 690# else
507 rs[Rs_delete_key] = "\033[3~"; 691 rs[Rs_delete_key] = "\033[3~";
508# endif 692# endif
509#endif 693#endif
510 694
511#ifdef HAVE_SCROLLBARS 695 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 696
515#ifdef XTERM_REVERSE_VIDEO 697#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 698 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 699 if (option (Opt_reverseVideo))
518 { 700 {
… …
556 return cmd_argv; 738 return cmd_argv;
557} 739}
558 740
559/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
560void 742void
743rxvt_term::init (stringvec *argv, stringvec *envv)
744{
745 argv->push_back (0);
746 envv->push_back (0);
747
748 this->argv = argv;
749 this->envv = envv;
750
751 env = new char *[this->envv->size ()];
752 for (int i = 0; i < this->envv->size (); i++)
753 env[i] = this->envv->at (i);
754
755 init2 (argv->size () - 1, argv->begin ());
756}
757
758void
759rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
760{
761#if ENABLE_PERL
762 // perl might want to access the stringvecs later, so we need to copy them
763 stringvec *args = new stringvec;
764 for (int i = 0; i < argc; i++)
765 args->push_back (strdup (argv [i]));
766
767 stringvec *envs = new stringvec;
768 for (const char *const *var = envv; *var; var++)
769 envs->push_back (strdup (*var));
770
771 init (args, envs);
772#else
773 init2 (argc, argv);
774#endif
775}
776
777void
778rxvt_term::init2 (int argc, const char *const *argv)
779{
780 SET_R (this);
781 set_locale ("");
782 set_environ (env); // a few things in X do not call setlocale :(
783
784 init_vars ();
785
786 const char **cmd_argv = init_resources (argc, argv);
787
788#ifdef KEYSYM_RESOURCE
789 keyboard->register_done ();
790#endif
791
792 if (const char *path = rs[Rs_chdir])
793 if (*path) // ignored if empty
794 {
795 if (*path != '/')
796 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
797
798 if (chdir (path))
799 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
800 }
801
802 if (option (Opt_scrollBar))
803 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
804
805 pty = ptytty::create ();
806
807 create_windows (argc, argv);
808
809 init_xlocale ();
810
811 scr_poweron (); // initialize screen
812
813#if 0
814 XSynchronize (dpy, True);
815#endif
816
817 if (option (Opt_scrollBar))
818 scrollBar.resize (); /* create and map scrollbar */
819
820#ifdef HAVE_BG_PIXMAP
821 bg_init ();
822#endif
823
824#if ENABLE_PERL
825 rootwin_ev.start (display, display->root);
826#endif
827
828 init_done = 1;
829
830 init_command (cmd_argv);
831
832 if (pty->pty >= 0)
833 pty_ev.start (pty->pty, ev::READ);
834
835 HOOK_INVOKE ((this, HOOK_START, DT_END));
836
837#if ENABLE_XEMBED
838 if (rs[Rs_embed])
839 {
840 long info[2] = { 0, XEMBED_MAPPED };
841
842 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
843 32, PropModeReplace, (unsigned char *)&info, 2);
844 }
845#endif
846
847#if HAVE_STARTUP_NOTIFICATION
848 SnDisplay *snDisplay;
849 SnLauncheeContext *snContext;
850
851 snDisplay = sn_display_new (dpy, NULL, NULL);
852 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
853
854 /* Tell the window manager that this window is part of the startup context */
855 if (snContext)
856 sn_launchee_context_setup_window (snContext, parent);
857#endif
858
859 XMapWindow (dpy, vt);
860 XMapWindow (dpy, parent);
861
862#if HAVE_STARTUP_NOTIFICATION
863 if (snContext)
864 {
865 /* Mark the startup process as complete */
866 sn_launchee_context_complete (snContext);
867
868 sn_launchee_context_unref (snContext);
869 }
870
871 sn_display_unref (snDisplay);
872#endif
873
874 refresh_check ();
875}
876
877/*----------------------------------------------------------------------*/
878void
561rxvt_term::init_env () 879rxvt_term::init_env ()
562{ 880{
563 int i;
564 char *val; 881 char *val;
882 char *env_display;
883 char *env_windowid;
884 char *env_colorfgbg;
885 char *env_term;
565 886
566#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
567 /* Fixup display_name for export over pty to any interested terminal 888 /* Fixup display_name for export over pty to any interested terminal
568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
569 * (for the first non-loopback interface) that we get from 890 * (for the first non-loopback interface) that we get from
… …
582 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
583 904
584 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
585 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
586 907
587 i = strlen (val);
588 env_display = (char *)rxvt_malloc (i + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
589 909
590 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
591 911
912 env_windowid = (char *)rxvt_malloc (21);
592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 913 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
593 914
594 /* add entries to the environment: 915 /* add entries to the environment:
595 * @ DISPLAY: in case we started with -display 916 * @ DISPLAY: in case we started with -display
596 * @ WINDOWID: X window id number of the window 917 * @ WINDOWID: X window id number of the window
597 * @ COLORTERM: terminal sub-name and also indicates its color 918 * @ COLORTERM: terminal sub-name and also indicates its color
… …
600 * @ COLORFGBG: fg;bg color codes 921 * @ COLORFGBG: fg;bg color codes
601 */ 922 */
602 putenv (env_display); 923 putenv (env_display);
603 putenv (env_windowid); 924 putenv (env_windowid);
604 925
605 if (env_colorfgbg) 926 env_colorfgbg = get_colorfgbg ();
606 putenv (env_colorfgbg); 927 putenv (env_colorfgbg);
607 928
608#ifdef RXVT_TERMINFO 929#ifdef RXVT_TERMINFO
609 putenv ("TERMINFO=" RXVT_TERMINFO); 930 putenv ("TERMINFO=" RXVT_TERMINFO);
610#endif 931#endif
611 932
… …
630 unsetenv ("TERMCAP"); /* terminfo should be okay */ 951 unsetenv ("TERMCAP"); /* terminfo should be okay */
631#endif /* HAVE_UNSETENV */ 952#endif /* HAVE_UNSETENV */
632} 953}
633 954
634/*----------------------------------------------------------------------*/ 955/*----------------------------------------------------------------------*/
635/*
636 * This is more or less stolen straight from XFree86 xterm.
637 * This should support all European type languages.
638 */
639void 956void
640rxvt_term::set_locale (const char *locale) 957rxvt_term::set_locale (const char *locale)
641{ 958{
642 set_environ (envv); 959 set_environ (env);
643 960
644#if HAVE_XSETLOCALE || HAVE_SETLOCALE
645 free (this->locale); 961 free (this->locale);
646 this->locale = setlocale (LC_CTYPE, locale); 962 this->locale = setlocale (LC_CTYPE, locale);
647 963
648 if (!this->locale) 964 if (!this->locale)
649 { 965 {
… …
660 976
661 977
662 this->locale = strdup (this->locale); 978 this->locale = strdup (this->locale);
663 SET_LOCALE (this->locale); 979 SET_LOCALE (this->locale);
664 mbstate.reset (); 980 mbstate.reset ();
665#endif
666 981
667#if HAVE_NL_LANGINFO 982#if HAVE_NL_LANGINFO
668 char *codeset = strdup (nl_langinfo (CODESET)); 983 char *codeset = nl_langinfo (CODESET);
669 // /^UTF.?8/i 984 // /^UTF.?8/i
670 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 985 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
671 && (codeset[1] == 'T' || codeset[1] == 't') 986 && (codeset[1] == 'T' || codeset[1] == 't')
672 && (codeset[2] == 'F' || codeset[2] == 'f') 987 && (codeset[2] == 'F' || codeset[2] == 'f')
673 && (codeset[3] == '8' || codeset[4] == '8'); 988 && (codeset[3] == '8' || codeset[4] == '8');
674 free (codeset);
675#else 989#else
676 enc_utf8 = 0; 990 enc_utf8 = 0;
677#endif 991#endif
678} 992}
679 993
680void 994void
681rxvt_term::init_xlocale () 995rxvt_term::init_xlocale ()
682{ 996{
683 set_environ (envv); 997 set_environ (env);
684 998
685#ifdef USE_XIM 999#if USE_XIM
686 if (!locale) 1000 if (!locale)
687 rxvt_warn ("setting locale failed, working without locale support.\n"); 1001 rxvt_warn ("setting locale failed, continuing without locale support.\n");
688 else 1002 else
689 { 1003 {
690 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1004 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
691 1005
692 if (!XSupportsLocale ()) 1006 if (!XSupportsLocale ())
693 { 1007 {
694 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1008 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
695 return; 1009 return;
696 } 1010 }
697 1011
698 im_ev.start (display); 1012 im_ev.start (display);
699 1013
… …
740 run_command (argv); 1054 run_command (argv);
741} 1055}
742 1056
743/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
744void 1058void
745rxvt_term::Get_Colours () 1059rxvt_term::get_colours ()
746{ 1060{
747 int i; 1061 int i;
748 1062
749#ifdef OFF_FOCUS_FADING 1063#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 1064 pix_colors = pix_colors_focused;
… …
810 * get scrollBar shadow colors 1124 * get scrollBar shadow colors
811 * 1125 *
812 * The calculations of topShadow/bottomShadow values are adapted 1126 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 1127 * from the fvwm window manager.
814 */ 1128 */
815#ifdef KEEP_SCROLLCOLOR 1129#ifdef RXVT_SCROLLBAR
816 if (depth <= 2) 1130 if (depth <= 2)
817 { 1131 {
818 /* Monochrome */ 1132 /* Monochrome */
819 alias_color (Color_scroll, Color_fg); 1133 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg); 1134 alias_color (Color_topShadow, Color_bg);
… …
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1149 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 1150 cscroll.a)
837 )) 1151 ))
838 alias_color (Color_topShadow, Color_White); 1152 alias_color (Color_topShadow, Color_White);
839 } 1153 }
840#endif /* KEEP_SCROLLCOLOR */ 1154#endif
841 1155
842#ifdef OFF_FOCUS_FADING 1156#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1157 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 1158 update_fade_color (i);
845#endif 1159#endif
… …
848/*----------------------------------------------------------------------*/ 1162/*----------------------------------------------------------------------*/
849/* color aliases, fg/bg bright-bold */ 1163/* color aliases, fg/bg bright-bold */
850void 1164void
851rxvt_term::color_aliases (int idx) 1165rxvt_term::color_aliases (int idx)
852{ 1166{
853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1167 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
854 { 1168 {
855 int i = atoi (rs[Rs_color + idx]); 1169 int i = atoi (rs[Rs_color + idx]);
856 1170
857 if (i >= 8 && i <= 15) 1171 if (i >= 8 && i <= 15)
858 /* bright colors */ 1172 /* bright colors */
… …
898 for (j = map->max_keypermod; j--; k++) 1212 for (j = map->max_keypermod; j--; k++)
899 { 1213 {
900 if (kc[k] == 0) 1214 if (kc[k] == 0)
901 break; 1215 break;
902 1216
903 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1217 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
904 { 1218 {
905 case XK_Num_Lock: 1219 case XK_Num_Lock:
906 ModNumLockMask = modmasks[i - 1]; 1220 ModNumLockMask = modmasks[i - 1];
907 continue; 1221 continue;
908 1222
… …
950 1264
951 if (i) 1265 if (i)
952 ModMetaMask = modmasks[i - 1]; 1266 ModMetaMask = modmasks[i - 1];
953} 1267}
954 1268
1269void
1270rxvt_term::set_icon (const char *file)
1271{
1272#if HAVE_PIXBUF
1273 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1274 if (!pixbuf)
1275 {
1276 rxvt_warn ("Loading image icon failed, continuing without.\n");
1277 return;
1278 }
1279
1280 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1281 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1282
1283 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1284 {
1285 rxvt_warn ("Icon image too big, continuing without.\n");
1286 g_object_unref (pixbuf);
1287 return;
1288 }
1289
1290 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1291 {
1292 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1293 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1294 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1295
1296 buffer [0] = w;
1297 buffer [1] = h;
1298 for (int i = 0; i < h; i++)
1299 {
1300 for (int j = 0; j < w; j++)
1301 {
1302 unsigned char *pixel = row + j * channels;
1303 long value;
1304
1305 if (channels == 4)
1306 value = pixel[3];
1307 else
1308 value = (unsigned char)0x00ff;
1309
1310 value = (value << 8) + pixel[0];
1311 value = (value << 8) + pixel[1];
1312 value = (value << 8) + pixel[2];
1313 buffer[(i * w + j) + 2] = value;
1314 }
1315
1316 row += rowstride;
1317 }
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 g_object_unref (pixbuf);
1327#endif
1328}
1329
955/*----------------------------------------------------------------------*/ 1330/*----------------------------------------------------------------------*/
956/* rxvt_Create_Windows () - Open and map the window */ 1331/* Open and map the window */
957void 1332void
958rxvt_term::create_windows (int argc, const char *const *argv) 1333rxvt_term::create_windows (int argc, const char *const *argv)
959{ 1334{
960 XClassHint classHint; 1335 XClassHint classHint;
961 XWMHints wmHint; 1336 XWMHints wmHint;
… …
967 Window top, parent; 1342 Window top, parent;
968 1343
969 dLocal (Display *, dpy); 1344 dLocal (Display *, dpy);
970 1345
971 /* grab colors before netscape does */ 1346 /* grab colors before netscape does */
972 Get_Colours (); 1347 get_colours ();
973 1348
974 if (!set_fonts ()) 1349 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1350 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 1351
977 parent = display->root; 1352 parent = display->root;
… …
1007 } 1382 }
1008#endif 1383#endif
1009 1384
1010 window_calc (0, 0); 1385 window_calc (0, 0);
1011 1386
1012 /* sub-window placement & size in rxvt_resize_subwindows () */ 1387 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1013 attributes.background_pixel = pix_colors_focused [Color_border]; 1388 attributes.background_pixel = pix_colors_focused [Color_border];
1014 attributes.border_pixel = pix_colors_focused [Color_border]; 1389 attributes.border_pixel = pix_colors_focused [Color_border];
1015 attributes.colormap = cmap; 1390 attributes.colormap = cmap;
1016 1391
1017 top = XCreateWindow (dpy, parent, 1392 top = XCreateWindow (dpy, parent,
… …
1020 ext_bwidth, 1395 ext_bwidth,
1021 depth, InputOutput, visual, 1396 depth, InputOutput, visual,
1022 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1397 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1023 &attributes); 1398 &attributes);
1024 1399
1025 this->parent[0] = top; 1400 this->parent = top;
1026 1401
1027 old_width = szHint.width; 1402 set_title (rs [Rs_title]);
1028 old_height = szHint.height; 1403 set_icon_name (rs [Rs_iconName]);
1029
1030 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1031 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1032 1404
1033 classHint.res_name = (char *)rs[Rs_name]; 1405 classHint.res_name = (char *)rs[Rs_name];
1034 classHint.res_class = (char *)RESCLASS; 1406 classHint.res_class = (char *)RESCLASS;
1035 1407
1036 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1408 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1037 wmHint.input = True; 1409 wmHint.input = True;
1038 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1410 wmHint.initial_state = option (Opt_iconic) ? IconicState
1411 : option (Opt_dockapp) ? WithdrawnState
1412 : NormalState;
1039 wmHint.window_group = top; 1413 wmHint.window_group = top;
1040 1414
1041 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1415 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1042 &szHint, &wmHint, &classHint); 1416 &szHint, &wmHint, &classHint);
1417#if ENABLE_EWMH
1418 /*
1419 * set up icon hint
1420 * rs [Rs_iconfile] is path to icon
1421 */
1422
1423 if (rs [Rs_iconfile])
1424 set_icon (rs [Rs_iconfile]);
1425#endif
1043 1426
1044#if ENABLE_FRILLS 1427#if ENABLE_FRILLS
1045 if (mwmhints.flags) 1428 if (mwmhints.flags)
1046 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1429 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1047 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1430 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1052#if ENABLE_EWMH 1435#if ENABLE_EWMH
1053 xa[XA_NET_WM_PING], 1436 xa[XA_NET_WM_PING],
1054#endif 1437#endif
1055 }; 1438 };
1056 1439
1057 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1440 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1058 1441
1059#if ENABLE_FRILLS 1442#if ENABLE_FRILLS
1060 if (rs[Rs_transient_for]) 1443 if (rs[Rs_transient_for])
1061 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1444 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1062#endif 1445#endif
… …
1082 termwin_ev.start (display, top); 1465 termwin_ev.start (display, top);
1083 1466
1084 /* vt cursor: Black-on-White is standard, but this is more popular */ 1467 /* vt cursor: Black-on-White is standard, but this is more popular */
1085 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1086 1469
1087#ifdef HAVE_SCROLLBARS
1088 /* cursor scrollBar: Black-on-White */
1089 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1090#endif
1091
1092 /* the vt window */ 1470 /* the vt window */
1093 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1094 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1095 width, height, 1473 vt_width, vt_height,
1096 0, 1474 0,
1097 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1098 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1099 1477
1100 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;
… …
1120 GCForeground | GCBackground | GCGraphicsExposures, 1498 GCForeground | GCBackground | GCGraphicsExposures,
1121 &gcvalue); 1499 &gcvalue);
1122 1500
1123 drawable = new rxvt_drawable (this, vt); 1501 drawable = new rxvt_drawable (this, vt);
1124 1502
1125#ifdef RXVT_SCROLLBAR
1126 gcvalue.foreground = pix_colors[Color_topShadow];
1127 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[Color_bottomShadow];
1129 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1131 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1132#endif
1133
1134#ifdef OFF_FOCUS_FADING 1503#ifdef OFF_FOCUS_FADING
1135 // initially we are in unfocused state 1504 // initially we are in unfocused state
1136 if (rs[Rs_fade]) 1505 if (rs[Rs_fade])
1137 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1138#endif 1507#endif
1139 1508
1140 pointer_unblank (); 1509 pointer_unblank ();
1141 scr_recolour (); 1510 scr_recolour ();
1142}
1143
1144/* ------------------------------------------------------------------------- *
1145 * GET TTY CURRENT STATE *
1146 * ------------------------------------------------------------------------- */
1147void
1148rxvt_get_ttymode (ttymode_t *tio, int erase)
1149{
1150 /*
1151 * standard System V termios interface
1152 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1154 {
1155 // return error - use system defaults,
1156 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t));
1158
1159 tio->c_cc[VINTR] = CINTR;
1160 tio->c_cc[VQUIT] = CQUIT;
1161 tio->c_cc[VERASE] = CERASE;
1162#ifdef VERASE2
1163 tio->c_cc[VERASE2] = CERASE2;
1164#endif
1165 tio->c_cc[VKILL] = CKILL;
1166 tio->c_cc[VSTART] = CSTART;
1167 tio->c_cc[VSTOP] = CSTOP;
1168 tio->c_cc[VSUSP] = CSUSP;
1169# ifdef VDSUSP
1170 tio->c_cc[VDSUSP] = CDSUSP;
1171# endif
1172# ifdef VREPRINT
1173 tio->c_cc[VREPRINT] = CRPRNT;
1174# endif
1175# ifdef VDISCRD
1176 tio->c_cc[VDISCRD] = CFLUSH;
1177# endif
1178# ifdef VWERSE
1179 tio->c_cc[VWERSE] = CWERASE;
1180# endif
1181# ifdef VLNEXT
1182 tio->c_cc[VLNEXT] = CLNEXT;
1183# endif
1184 }
1185
1186 tio->c_cc[VEOF] = CEOF;
1187 tio->c_cc[VEOL] = VDISABLE;
1188# ifdef VEOL2
1189 tio->c_cc[VEOL2] = VDISABLE;
1190# endif
1191# ifdef VSWTC
1192 tio->c_cc[VSWTC] = VDISABLE;
1193# endif
1194# ifdef VSWTCH
1195 tio->c_cc[VSWTCH] = VDISABLE;
1196# endif
1197# if VMIN != VEOF
1198 tio->c_cc[VMIN] = 1;
1199# endif
1200# if VTIME != VEOL
1201 tio->c_cc[VTIME] = 0;
1202# endif
1203
1204 if (erase != -1)
1205 tio->c_cc[VERASE] = (char)erase;
1206
1207 /* input modes */
1208 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1209# ifdef IMAXBEL
1210 | IMAXBEL
1211# endif
1212 | IXON);
1213
1214 /* output modes */
1215 tio->c_oflag = (OPOST | ONLCR);
1216
1217 /* control modes */
1218 tio->c_cflag = (CS8 | CREAD);
1219
1220 /* line discipline modes */
1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1222# if defined (ECHOCTL) && defined (ECHOKE)
1223 | ECHOCTL | ECHOKE
1224# endif
1225 | ECHOE | ECHOK);
1226
1227 /*
1228 * Debugging
1229 */
1230#ifdef DEBUG_TTYMODE
1231#ifdef HAVE_TERMIOS_H
1232 /* c_iflag bits */
1233 fprintf (stderr, "Input flags\n");
1234
1235 /* cpp token stringize doesn't work on all machines <sigh> */
1236# define FOO(flag,name) \
1237 if ((tio->c_iflag) & flag) \
1238 fprintf (stderr, "%s ", name)
1239
1240 /* c_iflag bits */
1241 FOO (IGNBRK, "IGNBRK");
1242 FOO (BRKINT, "BRKINT");
1243 FOO (IGNPAR, "IGNPAR");
1244 FOO (PARMRK, "PARMRK");
1245 FOO (INPCK, "INPCK");
1246 FOO (ISTRIP, "ISTRIP");
1247 FOO (INLCR, "INLCR");
1248 FOO (IGNCR, "IGNCR");
1249 FOO (ICRNL, "ICRNL");
1250 FOO (IXON, "IXON");
1251 FOO (IXOFF, "IXOFF");
1252# ifdef IUCLC
1253 FOO (IUCLC, "IUCLC");
1254# endif
1255# ifdef IXANY
1256 FOO (IXANY, "IXANY");
1257# endif
1258# ifdef IMAXBEL
1259 FOO (IMAXBEL, "IMAXBEL");
1260# endif
1261
1262 fprintf (stderr, "\n");
1263
1264# undef FOO
1265# define FOO(entry, name) \
1266 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1267
1268 FOO (VINTR, "VINTR");
1269 FOO (VQUIT, "VQUIT");
1270 FOO (VERASE, "VERASE");
1271 FOO (VKILL, "VKILL");
1272 FOO (VEOF, "VEOF");
1273 FOO (VEOL, "VEOL");
1274# ifdef VEOL2
1275 FOO (VEOL2, "VEOL2");
1276# endif
1277# ifdef VSWTC
1278 FOO (VSWTC, "VSWTC");
1279# endif
1280# ifdef VSWTCH
1281 FOO (VSWTCH, "VSWTCH");
1282# endif
1283 FOO (VSTART, "VSTART");
1284 FOO (VSTOP, "VSTOP");
1285 FOO (VSUSP, "VSUSP");
1286# ifdef VDSUSP
1287 FOO (VDSUSP, "VDSUSP");
1288# endif
1289# ifdef VREPRINT
1290 FOO (VREPRINT, "VREPRINT");
1291# endif
1292# ifdef VDISCRD
1293 FOO (VDISCRD, "VDISCRD");
1294# endif
1295# ifdef VWERSE
1296 FOO (VWERSE, "VWERSE");
1297# endif
1298# ifdef VLNEXT
1299 FOO (VLNEXT, "VLNEXT");
1300# endif
1301
1302 fprintf (stderr, "\n");
1303# undef FOO
1304# endif /* HAVE_TERMIOS_H */
1305#endif /* DEBUG_TTYMODE */
1306} 1511}
1307 1512
1308/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1309/* 1514/*
1310 * Run the command in a subprocess and return a file descriptor for the 1515 * Run the command in a subprocess and return a file descriptor for the
… …
1322 if (pty->pty >= 0) 1527 if (pty->pty >= 0)
1323 { 1528 {
1324 if (getfd_hook) 1529 if (getfd_hook)
1325 pty->pty = (*getfd_hook) (pty->pty); 1530 pty->pty = (*getfd_hook) (pty->pty);
1326 1531
1327 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1532 if (pty->pty < 0)
1328 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1533 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1329 } 1534 }
1330 } 1535 }
1331 else 1536 else
1332#endif 1537#endif
1333 if (!pty->get ()) 1538 if (!pty->get ())
1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1539 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1335 1540
1336 int er; 1541 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1542
1543 struct termios tio = def_tio;
1337 1544
1338#ifndef NO_BACKSPACE_KEY 1545#ifndef NO_BACKSPACE_KEY
1339 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1546 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1340 er = rs[Rs_backspace_key][0]; 1547 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1341 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1548 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1342 er = '\177'; /* the initial state anyway */ 1549 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1343 else
1344#endif 1550#endif
1345 er = -1;
1346 1551
1347 rxvt_get_ttymode (&tio, er); 1552 /* init terminal attributes */
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1553 cfsetospeed (&tio, BAUDRATE);
1554 cfsetispeed (&tio, BAUDRATE);
1555 tcsetattr (pty->tty, TCSANOW, &tio);
1349 pty->set_utf8_mode (enc_utf8); 1556 pty->set_utf8_mode (enc_utf8);
1350 1557
1351 /* set initial window size */ 1558 /* set initial window size */
1352 tt_winch (); 1559 tt_winch ();
1353 1560
… …
1389 1596
1390 _exit (EXIT_FAILURE); 1597 _exit (EXIT_FAILURE);
1391 1598
1392 default: 1599 default:
1393 if (!option (Opt_utmpInhibit)) 1600 if (!option (Opt_utmpInhibit))
1601 {
1602#ifdef LOG_ONLY_ON_LOGIN
1603 bool login_shell = option (Opt_loginShell);
1604#else
1605 bool login_shell = true;
1606#endif
1394 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1607 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1608 }
1395 1609
1396 pty->close_tty (); 1610 pty->close_tty ();
1397 1611
1398 child_ev.start (cmd_pid); 1612 child_ev.start (cmd_pid);
1399 1613
… …
1413rxvt_term::run_child (const char *const *argv) 1627rxvt_term::run_child (const char *const *argv)
1414{ 1628{
1415 char *login; 1629 char *login;
1416 1630
1417 if (option (Opt_console)) 1631 if (option (Opt_console))
1632 {
1418 { /* be virtual console, fail silently */ 1633 /* be virtual console, fail silently */
1419#ifdef TIOCCONS 1634#ifdef TIOCCONS
1420 unsigned int on = 1; 1635 unsigned int on = 1;
1421 1636
1422 ioctl (STDIN_FILENO, TIOCCONS, &on); 1637 ioctl (STDIN_FILENO, TIOCCONS, &on);
1423#elif defined (SRIOCSREDIR) 1638#elif defined (SRIOCSREDIR)
1424 int fd; 1639 int fd;
1425 1640
1426 fd = open (CONSOLE, O_WRONLY, 0); 1641 fd = open (CONSOLE, O_WRONLY, 0);
1427 if (fd >= 0) 1642 if (fd >= 0)
1428 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1643 {
1644 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1429 close (fd); 1645 close (fd);
1646 }
1430#endif /* SRIOCSREDIR */ 1647#endif /* SRIOCSREDIR */
1431 } 1648 }
1432 1649
1433 /* reset signals and spin off the command interpreter */ 1650 /* reset signals and spin off the command interpreter */
1434 signal (SIGINT, SIG_DFL); 1651 signal (SIGINT, SIG_DFL);
1435 signal (SIGQUIT, SIG_DFL); 1652 signal (SIGQUIT, SIG_DFL);
1436 signal (SIGCHLD, SIG_DFL); 1653 signal (SIGCHLD, SIG_DFL);
1437 signal (SIGHUP, SIG_DFL); 1654 signal (SIGHUP, SIG_DFL);
1438 signal (SIGPIPE, SIG_DFL); 1655 signal (SIGPIPE, SIG_DFL);
1439 /* 1656 /*
1440 * mimick login's behavior by disabling the job control signals 1657 * mimic login's behavior by disabling the job control signals
1441 * a shell that wants them can turn them back on 1658 * a shell that wants them can turn them back on
1442 */ 1659 */
1443#ifdef SIGTSTP 1660#ifdef SIGTSTP
1444 signal (SIGTSTP, SIG_IGN); 1661 signal (SIGTSTP, SIG_IGN);
1445 signal (SIGTTIN, SIG_IGN); 1662 signal (SIGTTIN, SIG_IGN);
1446 signal (SIGTTOU, SIG_IGN); 1663 signal (SIGTTOU, SIG_IGN);
1447#endif /* SIGTSTP */ 1664#endif /* SIGTSTP */
1448 1665
1449 // unblock signals (signals are blocked by iom.C
1450 sigset_t ss;
1451 sigemptyset (&ss);
1452 sigprocmask (SIG_SETMASK, &ss, 0);
1453
1454 /* command interpreter path */ 1666 /* command interpreter path */
1455 if (argv) 1667 if (argv)
1456 { 1668 {
1457# ifdef DEBUG_CMD 1669# ifdef DEBUG_CMD
1458 int i; 1670 int i;
… …
1469 const char *argv0, *shell; 1681 const char *argv0, *shell;
1470 1682
1471 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1683 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1472 shell = "/bin/sh"; 1684 shell = "/bin/sh";
1473 1685
1474 argv0 = (const char *)rxvt_basename (shell); 1686 argv0 = rxvt_basename (shell);
1475 1687
1476 if (option (Opt_loginShell)) 1688 if (option (Opt_loginShell))
1477 { 1689 {
1478 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1690 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1479 1691

Diff Legend

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