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.215 by root, Mon Oct 8 15:36:13 2007 UTC vs.
Revision 1.344 by sf-exg, Tue Jun 16 11:58:26 2015 UTC

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

Diff Legend

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