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

Diff Legend

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