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.211 by ayin, Sun Sep 9 10:14:40 2007 UTC vs.
Revision 1.348 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

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

Diff Legend

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