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.204 by sasha, Thu Aug 9 22:08:21 2007 UTC vs.
Revision 1.322 by sf-exg, Thu May 17 10:18:32 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 *
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 ENABLE_TRANSPARENCY 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 536
189 MEvent.time = CurrentTime; 537 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 538 MEvent.button = AnyButton;
191 want_refresh = 1; 539 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 540 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 541 ncol = 80;
194 nrow = 24; 542 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 547 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 548
201 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
202 550
203 oldcursor.row = oldcursor.col = -1; 551 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 552
218 set_option (Opt_scrollBar); 553 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 554 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 555 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
226 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
227 563 set_option (Opt_buffered);
228 return true;
229}
230
231void
232rxvt_term::init_secondary ()
233{
234 int i;
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} 564}
264 565
265/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
266const char ** 567const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
268{ 569{
269 int i, r_argc; 570 int i;
270 char *val;
271 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
272 572
273 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */
276 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e"))
278 break;
279
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281
282 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i];
284
285 r_argv[i] = NULL;
286
287 if (r_argc == argc)
288 cmd_argv = NULL;
289 else
290 {
291 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
292
293 for (i = 0; i < argc - r_argc - 1; i++)
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296 cmd_argv[i] = NULL;
297 }
298
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
300 574
301 /* 575 /*
302 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
303 */ 577 */
304 578
305 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
306 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
307 581
308 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
309 583
310 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
311 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]);
312 586
313 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
… …
319#if XFT 593#if XFT
320 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif 596#endif
323 597
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
327 free (r_argv);
328
329 bgPixmap.set_target (this);
330
331 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
332 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
333 rs [i] = 0; 600 rs [i] = 0;
334 601
335#if ENABLE_PERL 602#if ENABLE_PERL
… …
342 { 609 {
343 rxvt_perl.init (this); 610 rxvt_perl.init (this);
344 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
345 } 612 }
346#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 ();
347 618
348 /* 619 /*
349 * set any defaults not already set 620 * set any defaults not already set
350 */ 621 */
351 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
352 { 623 {
353 if (!rs[Rs_title]) 624 if (!rs[Rs_title])
354 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 625 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
626
355 if (!rs[Rs_iconName]) 627 if (!rs[Rs_iconName])
356 rs[Rs_iconName] = rs[Rs_title]; 628 rs[Rs_iconName] = rs[Rs_title];
357 } 629 }
358 else 630 else
359 { 631 {
360 if (!rs[Rs_title]) 632 if (!rs[Rs_title])
361 rs[Rs_title] = rs[Rs_name]; 633 rs[Rs_title] = rs[Rs_name];
634
362 if (!rs[Rs_iconName]) 635 if (!rs[Rs_iconName])
363 rs[Rs_iconName] = rs[Rs_name]; 636 rs[Rs_iconName] = rs[Rs_name];
364 } 637 }
365 638
366 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 639 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
373 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)
374 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
375 648
376 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
377 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]);
378#endif 654#endif
379 655
380#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
381 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
382 pointerBlankDelay = i; 658 pointerBlankDelay = i;
… …
386 662
387 /* no point having a scrollbar without having any scrollback! */ 663 /* no point having a scrollbar without having any scrollback! */
388 if (!saveLines) 664 if (!saveLines)
389 set_option (Opt_scrollBar, 0); 665 set_option (Opt_scrollBar, 0);
390 666
391#ifdef PRINTPIPE
392 if (!rs[Rs_print_pipe])
393 rs[Rs_print_pipe] = PRINTPIPE;
394#endif
395
396 if (!rs[Rs_cutchars]) 667 if (!rs[Rs_cutchars])
397 rs[Rs_cutchars] = CUTCHARS; 668 rs[Rs_cutchars] = CUTCHARS;
398 669
399#ifndef NO_BACKSPACE_KEY 670#ifndef NO_BACKSPACE_KEY
400 if (!rs[Rs_backspace_key]) 671 if (!rs[Rs_backspace_key])
401# ifdef DEFAULT_BACKSPACE 672# ifdef DEFAULT_BACKSPACE
402 key_backspace = DEFAULT_BACKSPACE; 673 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
403# else 674# else
404 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 675 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
405# endif 676# endif
406 else
407 {
408 val = strdup (rs[Rs_backspace_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_backspace = val;
412 }
413#endif 677#endif
414 678
415#ifndef NO_DELETE_KEY 679#ifndef NO_DELETE_KEY
416 if (!rs[Rs_delete_key]) 680 if (!rs[Rs_delete_key])
417# ifdef DEFAULT_DELETE 681# ifdef DEFAULT_DELETE
418 key_delete = DEFAULT_DELETE; 682 rs[Rs_delete_key] = DEFAULT_DELETE;
419# else 683# else
420 key_delete = "\033[3~"; 684 rs[Rs_delete_key] = "\033[3~";
421# endif 685# endif
422 else
423 {
424 val = strdup (rs[Rs_delete_key]);
425 rxvt_Str_trim (val);
426 rxvt_Str_escaped (val);
427 key_delete = val;
428 }
429#endif 686#endif
430 if (rs[Rs_answerbackstring])
431 {
432 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
433 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
434 }
435 687
436#ifdef HAVE_SCROLLBARS 688 scrollBar.setup (this);
437 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
438#endif
439 689
440#ifdef XTERM_REVERSE_VIDEO 690#ifdef XTERM_REVERSE_VIDEO
441 /* this is how xterm implements reverseVideo */ 691 /* this is how xterm implements reverseVideo */
442 if (option (Opt_reverseVideo)) 692 if (option (Opt_reverseVideo))
443 { 693 {
… …
463 color_aliases (Color_fg); 713 color_aliases (Color_fg);
464 color_aliases (Color_bg); 714 color_aliases (Color_bg);
465#ifndef NO_CURSORCOLOR 715#ifndef NO_CURSORCOLOR
466 color_aliases (Color_cursor); 716 color_aliases (Color_cursor);
467 color_aliases (Color_cursor2); 717 color_aliases (Color_cursor2);
468#endif /* NO_CURSORCOLOR */ 718#endif /* NO_CURSORCOLOR */
469 color_aliases (Color_pointer_fg); 719 color_aliases (Color_pointer_fg);
470 color_aliases (Color_pointer_bg); 720 color_aliases (Color_pointer_bg);
471 color_aliases (Color_border); 721 color_aliases (Color_border);
472#ifndef NO_BOLD_UNDERLINE_REVERSE 722#ifndef NO_BOLD_UNDERLINE_REVERSE
473 color_aliases (Color_BD); 723 color_aliases (Color_BD);
474 color_aliases (Color_UL); 724 color_aliases (Color_UL);
475 color_aliases (Color_RV); 725 color_aliases (Color_RV);
476#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 726#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
477 727
478 if (!rs[Rs_color + Color_border]) 728 if (!rs[Rs_color + Color_border])
479 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 729 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
480 730
481 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 bg_set_blur (rs [Rs_blurradius]);
824
825 if (ISSET_PIXCOLOR (Color_tint))
826 bg_set_tint (pix_colors_focused [Color_tint]);
827
828 if (rs [Rs_shade])
829 bg_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#ifdef BG_IMAGE_FROM_FILE
838 if (rs[Rs_backgroundPixmap])
839 if (bg_image.set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842#endif
843 }
844#endif
845
846#if ENABLE_PERL
847 rootwin_ev.start (display, display->root);
848#endif
849
850 init_done = 1;
851
852 init_command (cmd_argv);
853
854 if (pty->pty >= 0)
855 pty_ev.start (pty->pty, ev::READ);
856
857 HOOK_INVOKE ((this, HOOK_START, DT_END));
858
859#if ENABLE_XEMBED
860 if (rs[Rs_embed])
861 {
862 long info[2] = { 0, XEMBED_MAPPED };
863
864 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
865 32, PropModeReplace, (unsigned char *)&info, 2);
866 }
867#endif
868
869#if HAVE_STARTUP_NOTIFICATION
870 SnDisplay *snDisplay;
871 SnLauncheeContext *snContext;
872
873 snDisplay = sn_display_new (dpy, NULL, NULL);
874 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
875
876 /* Tell the window manager that this window is part of the startup context */
877 if (snContext)
878 sn_launchee_context_setup_window (snContext, parent);
879#endif
880
881 XMapWindow (dpy, vt);
882 XMapWindow (dpy, parent);
883
884#if HAVE_STARTUP_NOTIFICATION
885 if (snContext)
886 {
887 /* Mark the startup process as complete */
888 sn_launchee_context_complete (snContext);
889
890 sn_launchee_context_unref (snContext);
891 }
892
893 sn_display_unref (snDisplay);
894#endif
895
896 refresh_check ();
482} 897}
483 898
484/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
485void 900void
486rxvt_term::init_env () 901rxvt_term::init_env ()
487{ 902{
488 int i;
489 unsigned int u;
490 char *val; 903 char *val;
904 char *env_display;
905 char *env_windowid;
906 char *env_colorfgbg;
907 char *env_term;
491 908
492#ifdef DISPLAY_IS_IP 909#ifdef DISPLAY_IS_IP
493 /* Fixup display_name for export over pty to any interested terminal 910 /* Fixup display_name for export over pty to any interested terminal
494 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 911 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
495 * (for the first non-loopback interface) that we get from 912 * (for the first non-loopback interface) that we get from
… …
502 */ 919 */
503 val = rxvt_network_display (rs[Rs_display_name]); 920 val = rxvt_network_display (rs[Rs_display_name]);
504 rs[Rs_display_name] = (const char *)val; 921 rs[Rs_display_name] = (const char *)val;
505 922
506 if (val == NULL) 923 if (val == NULL)
507#endif /* DISPLAY_IS_IP */ 924#endif /* DISPLAY_IS_IP */
508 val = XDisplayString (dpy); 925 val = XDisplayString (dpy);
509 926
510 if (rs[Rs_display_name] == NULL) 927 if (rs[Rs_display_name] == NULL)
511 rs[Rs_display_name] = val; /* use broken `:0' value */ 928 rs[Rs_display_name] = val; /* use broken `:0' value */
512 929
513 i = strlen (val);
514 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 930 env_display = (char *)rxvt_malloc (strlen (val) + 9);
515 931
516 sprintf (env_display, "DISPLAY=%s", val); 932 sprintf (env_display, "DISPLAY=%s", val);
517 933
934 env_windowid = (char *)rxvt_malloc (21);
518 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 935 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
519 936
520 /* add entries to the environment: 937 /* add entries to the environment:
521 * @ DISPLAY: in case we started with -display 938 * @ DISPLAY: in case we started with -display
522 * @ WINDOWID: X window id number of the window 939 * @ WINDOWID: X window id number of the window
523 * @ COLORTERM: terminal sub-name and also indicates its color 940 * @ COLORTERM: terminal sub-name and also indicates its color
… …
526 * @ COLORFGBG: fg;bg color codes 943 * @ COLORFGBG: fg;bg color codes
527 */ 944 */
528 putenv (env_display); 945 putenv (env_display);
529 putenv (env_windowid); 946 putenv (env_windowid);
530 947
531 if (env_colorfgbg) 948 env_colorfgbg = get_colorfgbg ();
532 putenv (env_colorfgbg); 949 putenv (env_colorfgbg);
533 950
534#ifdef RXVT_TERMINFO 951#ifdef RXVT_TERMINFO
535 putenv ("TERMINFO=" RXVT_TERMINFO); 952 putenv ("TERMINFO=" RXVT_TERMINFO);
536#endif 953#endif
537 954
… …
540 else 957 else
541 putenv ("COLORTERM=" COLORTERMENVFULL); 958 putenv ("COLORTERM=" COLORTERMENVFULL);
542 959
543 if (rs[Rs_term_name] != NULL) 960 if (rs[Rs_term_name] != NULL)
544 { 961 {
545 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 962 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
546 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 963 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
547 putenv (env_term); 964 putenv (env_term);
548 } 965 }
549 else 966 else
550 putenv ("TERM=" TERMENV); 967 putenv ("TERM=" TERMENV);
… …
552#ifdef HAVE_UNSETENV 969#ifdef HAVE_UNSETENV
553 /* avoid passing old settings and confusing term size */ 970 /* avoid passing old settings and confusing term size */
554 unsetenv ("LINES"); 971 unsetenv ("LINES");
555 unsetenv ("COLUMNS"); 972 unsetenv ("COLUMNS");
556 unsetenv ("TERMCAP"); /* terminfo should be okay */ 973 unsetenv ("TERMCAP"); /* terminfo should be okay */
557#endif /* HAVE_UNSETENV */ 974#endif /* HAVE_UNSETENV */
558} 975}
559 976
560/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
561/*
562 * This is more or less stolen straight from XFree86 xterm.
563 * This should support all European type languages.
564 */
565void 978void
566rxvt_term::set_locale (const char *locale) 979rxvt_term::set_locale (const char *locale)
567{ 980{
568 set_environ (envv); 981 set_environ (envv);
569 982
570#if HAVE_XSETLOCALE || HAVE_SETLOCALE
571 free (this->locale); 983 free (this->locale);
572 this->locale = setlocale (LC_CTYPE, locale); 984 this->locale = setlocale (LC_CTYPE, locale);
573 985
574 if (!this->locale) 986 if (!this->locale)
575 { 987 {
… …
583 995
584 this->locale = "C"; 996 this->locale = "C";
585 } 997 }
586 998
587 999
588 this->locale = rxvt_strdup (this->locale); 1000 this->locale = strdup (this->locale);
589 SET_LOCALE (this->locale); 1001 SET_LOCALE (this->locale);
590 mbstate.reset (); 1002 mbstate.reset ();
591#endif
592 1003
593#if HAVE_NL_LANGINFO 1004#if HAVE_NL_LANGINFO
594 char *codeset = strdup (nl_langinfo (CODESET)); 1005 char *codeset = nl_langinfo (CODESET);
595 // /^UTF.?8/i 1006 // /^UTF.?8/i
596 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1007 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
597 && (codeset[1] == 'T' || codeset[1] == 't') 1008 && (codeset[1] == 'T' || codeset[1] == 't')
598 && (codeset[2] == 'F' || codeset[2] == 'f') 1009 && (codeset[2] == 'F' || codeset[2] == 'f')
599 && (codeset[3] == '8' || codeset[4] == '8'); 1010 && (codeset[3] == '8' || codeset[4] == '8');
600 free (codeset);
601#else 1011#else
602 enc_utf8 = 0; 1012 enc_utf8 = 0;
603#endif 1013#endif
604} 1014}
605 1015
… …
608{ 1018{
609 set_environ (envv); 1019 set_environ (envv);
610 1020
611#ifdef USE_XIM 1021#ifdef USE_XIM
612 if (!locale) 1022 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 1023 rxvt_warn ("setting locale failed, continuing without locale support.\n");
614 else 1024 else
615 { 1025 {
616 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1026 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 1027
618 if (!XSupportsLocale ()) 1028 if (!XSupportsLocale ())
619 { 1029 {
620 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1030 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
621 return; 1031 return;
622 } 1032 }
623 1033
624 im_ev.start (display); 1034 im_ev.start (display);
625 1035
… …
650 priv_modes |= PrivMode_Keypress; 1060 priv_modes |= PrivMode_Keypress;
651 if (!option (Opt_jumpScroll)) 1061 if (!option (Opt_jumpScroll))
652 priv_modes |= PrivMode_smoothScroll; 1062 priv_modes |= PrivMode_smoothScroll;
653 1063
654#ifndef NO_BACKSPACE_KEY 1064#ifndef NO_BACKSPACE_KEY
655 if (strcmp (key_backspace, "DEC") == 0) 1065 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
656 priv_modes |= PrivMode_HaveBackSpace; 1066 priv_modes |= PrivMode_HaveBackSpace;
657#endif 1067#endif
658 1068
659 /* add value for scrollBar */ 1069 /* add value for scrollBar */
660 if (scrollBar.state) 1070 if (scrollBar.state)
… …
666 run_command (argv); 1076 run_command (argv);
667} 1077}
668 1078
669/*----------------------------------------------------------------------*/ 1079/*----------------------------------------------------------------------*/
670void 1080void
671rxvt_term::Get_Colours () 1081rxvt_term::get_colours ()
672{ 1082{
673 int i; 1083 int i;
674 1084
675#ifdef OFF_FOCUS_FADING 1085#ifdef OFF_FOCUS_FADING
676 pix_colors = pix_colors_focused; 1086 pix_colors = pix_colors_focused;
677#endif 1087#endif
678 1088
679 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1089 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
680 { 1090 {
681 const char *name = rs[Rs_color + i]; 1091 const char *name = rs[Rs_color + i];
682 1092
683 if (!name) 1093 if (!name)
… …
736 * get scrollBar shadow colors 1146 * get scrollBar shadow colors
737 * 1147 *
738 * The calculations of topShadow/bottomShadow values are adapted 1148 * The calculations of topShadow/bottomShadow values are adapted
739 * from the fvwm window manager. 1149 * from the fvwm window manager.
740 */ 1150 */
741#ifdef KEEP_SCROLLCOLOR 1151#ifdef RXVT_SCROLLBAR
742 if (depth <= 2) 1152 if (depth <= 2)
743 { 1153 {
744 /* Monochrome */ 1154 /* Monochrome */
745 alias_color (Color_scroll, Color_fg); 1155 alias_color (Color_scroll, Color_fg);
746 alias_color (Color_topShadow, Color_bg); 1156 alias_color (Color_topShadow, Color_bg);
… …
761 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1171 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
762 cscroll.a) 1172 cscroll.a)
763 )) 1173 ))
764 alias_color (Color_topShadow, Color_White); 1174 alias_color (Color_topShadow, Color_White);
765 } 1175 }
766#endif /* KEEP_SCROLLCOLOR */ 1176#endif
767 1177
768#ifdef OFF_FOCUS_FADING 1178#ifdef OFF_FOCUS_FADING
769 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1179 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
770 update_fade_color (i); 1180 update_fade_color (i);
771#endif 1181#endif
… …
774/*----------------------------------------------------------------------*/ 1184/*----------------------------------------------------------------------*/
775/* color aliases, fg/bg bright-bold */ 1185/* color aliases, fg/bg bright-bold */
776void 1186void
777rxvt_term::color_aliases (int idx) 1187rxvt_term::color_aliases (int idx)
778{ 1188{
779 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1189 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
780 { 1190 {
781 int i = atoi (rs[Rs_color + idx]); 1191 int i = atoi (rs[Rs_color + idx]);
782 1192
783 if (i >= 8 && i <= 15) 1193 if (i >= 8 && i <= 15)
784 { /* bright colors */ 1194 /* bright colors */
785 i -= 8;
786 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1195 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
787 return; 1196 else if (i >= 0 && i <= 7)
788 } 1197 /* normal colors */
789
790 if (i >= 0 && i <= 7) /* normal colors */
791 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1198 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
792 } 1199 }
793} 1200}
794 1201
795/*----------------------------------------------------------------------*/ 1202/*----------------------------------------------------------------------*/
… …
879 1286
880 if (i) 1287 if (i)
881 ModMetaMask = modmasks[i - 1]; 1288 ModMetaMask = modmasks[i - 1];
882} 1289}
883 1290
1291void
1292rxvt_term::set_icon (const char *file)
1293{
1294#ifdef HAVE_PIXBUF
1295 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1296 if (!pixbuf)
1297 {
1298 rxvt_warn ("Loading image icon failed, continuing without.\n");
1299 return;
1300 }
1301
1302 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1303 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1304
1305 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1306 {
1307 rxvt_warn ("Icon image too big, continuing without.\n");
1308 g_object_unref (pixbuf);
1309 return;
1310 }
1311
1312 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1313 {
1314 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1315 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1316 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1317
1318 buffer [0] = w;
1319 buffer [1] = h;
1320 for (int i = 0; i < h; i++)
1321 {
1322 for (int j = 0; j < w; j++)
1323 {
1324 unsigned char *pixel = row + j * channels;
1325 long value;
1326
1327 if (channels == 4)
1328 value = pixel[3];
1329 else
1330 value = (unsigned char)0x00ff;
1331
1332 value = (value << 8) + pixel[0];
1333 value = (value << 8) + pixel[1];
1334 value = (value << 8) + pixel[2];
1335 buffer[(i * w + j) + 2] = value;
1336 }
1337
1338 row += rowstride;
1339 }
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 g_object_unref (pixbuf);
1349#endif
1350}
1351
884/*----------------------------------------------------------------------*/ 1352/*----------------------------------------------------------------------*/
885/* rxvt_Create_Windows () - Open and map the window */ 1353/* Open and map the window */
886void 1354void
887rxvt_term::create_windows (int argc, const char *const *argv) 1355rxvt_term::create_windows (int argc, const char *const *argv)
888{ 1356{
889 XClassHint classHint; 1357 XClassHint classHint;
890 XWMHints wmHint; 1358 XWMHints wmHint;
… …
896 Window top, parent; 1364 Window top, parent;
897 1365
898 dLocal (Display *, dpy); 1366 dLocal (Display *, dpy);
899 1367
900 /* grab colors before netscape does */ 1368 /* grab colors before netscape does */
901 Get_Colours (); 1369 get_colours ();
902 1370
903 if (!set_fonts ()) 1371 if (!set_fonts ())
904 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1372 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
905 1373
906 parent = display->root; 1374 parent = display->root;
… …
910#if ENABLE_FRILLS 1378#if ENABLE_FRILLS
911 if (option (Opt_borderLess)) 1379 if (option (Opt_borderLess))
912 { 1380 {
913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1381 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
914 { 1382 {
915 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1383 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
916 attributes.override_redirect = true; 1384 attributes.override_redirect = true;
917 mwmhints.flags = 0;
918 } 1385 }
919 else 1386 else
920 { 1387 {
921 mwmhints.flags = MWM_HINTS_DECORATIONS; 1388 mwmhints.flags = MWM_HINTS_DECORATIONS;
922 mwmhints.decorations = 0;
923 } 1389 }
924 } 1390 }
925 else
926 mwmhints.flags = 0;
927#endif 1391#endif
928 1392
929#if ENABLE_XEMBED 1393#if ENABLE_XEMBED
930 if (rs[Rs_embed]) 1394 if (rs[Rs_embed])
931 { 1395 {
… …
940 } 1404 }
941#endif 1405#endif
942 1406
943 window_calc (0, 0); 1407 window_calc (0, 0);
944 1408
945 /* sub-window placement & size in rxvt_resize_subwindows () */ 1409 /* sub-window placement & size in rxvt_term::resize_all_windows () */
946 attributes.background_pixel = pix_colors_focused [Color_border]; 1410 attributes.background_pixel = pix_colors_focused [Color_border];
947 attributes.border_pixel = pix_colors_focused [Color_border]; 1411 attributes.border_pixel = pix_colors_focused [Color_border];
948 attributes.colormap = cmap; 1412 attributes.colormap = cmap;
949 1413
950 top = XCreateWindow (dpy, parent, 1414 top = XCreateWindow (dpy, parent,
… …
953 ext_bwidth, 1417 ext_bwidth,
954 depth, InputOutput, visual, 1418 depth, InputOutput, visual,
955 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1419 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
956 &attributes); 1420 &attributes);
957 1421
958 this->parent[0] = top; 1422 this->parent = top;
959 1423
960 old_width = szHint.width; 1424 set_title (rs [Rs_title]);
961 old_height = szHint.height; 1425 set_icon_name (rs [Rs_iconName]);
962
963 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
964 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
965 1426
966 classHint.res_name = (char *)rs[Rs_name]; 1427 classHint.res_name = (char *)rs[Rs_name];
967 classHint.res_class = (char *)RESCLASS; 1428 classHint.res_class = (char *)RESCLASS;
968 1429
969 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1430 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
971 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1432 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
972 wmHint.window_group = top; 1433 wmHint.window_group = top;
973 1434
974 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1435 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
975 &szHint, &wmHint, &classHint); 1436 &szHint, &wmHint, &classHint);
1437#if ENABLE_EWMH
1438 /*
1439 * set up icon hint
1440 * rs [Rs_iconfile] is path to icon
1441 */
1442
1443 if (rs [Rs_iconfile])
1444 {
1445 set_icon (rs [Rs_iconfile]);
1446 }
1447#endif
976 1448
977#if ENABLE_FRILLS 1449#if ENABLE_FRILLS
978 if (mwmhints.flags) 1450 if (mwmhints.flags)
979 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1451 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
980 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1452 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
985#if ENABLE_EWMH 1457#if ENABLE_EWMH
986 xa[XA_NET_WM_PING], 1458 xa[XA_NET_WM_PING],
987#endif 1459#endif
988 }; 1460 };
989 1461
990 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1462 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
991 1463
992#if ENABLE_FRILLS 1464#if ENABLE_FRILLS
993 if (rs[Rs_transient_for]) 1465 if (rs[Rs_transient_for])
994 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1466 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
995#endif 1467#endif
… …
1015 termwin_ev.start (display, top); 1487 termwin_ev.start (display, top);
1016 1488
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1489 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1490 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1019 1491
1020#ifdef HAVE_SCROLLBARS
1021 /* cursor scrollBar: Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1023#endif
1024
1025 /* the vt window */ 1492 /* the vt window */
1026 vt = XCreateSimpleWindow (dpy, top, 1493 vt = XCreateSimpleWindow (dpy, top,
1027 window_vt_x, window_vt_y, 1494 window_vt_x, window_vt_y,
1028 width, height, 1495 vt_width, vt_height,
1029 0, 1496 0,
1030 pix_colors_focused[Color_fg], 1497 pix_colors_focused[Color_fg],
1031 pix_colors_focused[Color_bg]); 1498 pix_colors_focused[Color_bg]);
1032 1499
1033 attributes.bit_gravity = NorthWestGravity; 1500 attributes.bit_gravity = NorthWestGravity;
… …
1042 1509
1043 vt_select_input (); 1510 vt_select_input ();
1044 1511
1045 vt_ev.start (display, vt); 1512 vt_ev.start (display, vt);
1046 1513
1047#ifdef XPM_BACKGROUND
1048 if (rs[Rs_backgroundPixmap] != NULL)
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 bgPixmap.handle_geometry (p);
1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1059
1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1061 scr_touch (true);
1062 }
1063#endif
1064
1065 /* graphics context for the vt window */ 1514 /* graphics context for the vt window */
1066 gcvalue.foreground = pix_colors[Color_fg]; 1515 gcvalue.foreground = pix_colors[Color_fg];
1067 gcvalue.background = pix_colors[Color_bg]; 1516 gcvalue.background = pix_colors[Color_bg];
1068 gcvalue.graphics_exposures = 0; 1517 gcvalue.graphics_exposures = 0;
1069 1518
… …
1071 GCForeground | GCBackground | GCGraphicsExposures, 1520 GCForeground | GCBackground | GCGraphicsExposures,
1072 &gcvalue); 1521 &gcvalue);
1073 1522
1074 drawable = new rxvt_drawable (this, vt); 1523 drawable = new rxvt_drawable (this, vt);
1075 1524
1076#ifdef RXVT_SCROLLBAR
1077 gcvalue.foreground = pix_colors[Color_topShadow];
1078 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079 gcvalue.foreground = pix_colors[Color_bottomShadow];
1080 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1082 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083#endif
1084
1085#ifdef OFF_FOCUS_FADING 1525#ifdef OFF_FOCUS_FADING
1086 // initially we are in unfocused state 1526 // initially we are in unfocused state
1087 if (rs[Rs_fade]) 1527 if (rs[Rs_fade])
1088 pix_colors = pix_colors_unfocused; 1528 pix_colors = pix_colors_unfocused;
1089#endif 1529#endif
1090 1530
1091 pointer_unblank (); 1531 pointer_unblank ();
1092 scr_recolour (); 1532 scr_recolour ();
1093}
1094
1095/* ------------------------------------------------------------------------- *
1096 * GET TTY CURRENT STATE *
1097 * ------------------------------------------------------------------------- */
1098void
1099rxvt_get_ttymode (ttymode_t *tio, int erase)
1100{
1101 /*
1102 * standard System V termios interface
1103 */
1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1105 {
1106 // return error - use system defaults,
1107 // where possible, and zero elsewhere
1108 memset (tio, 0, sizeof (ttymode_t));
1109
1110 tio->c_cc[VINTR] = CINTR;
1111 tio->c_cc[VQUIT] = CQUIT;
1112 tio->c_cc[VERASE] = CERASE;
1113#ifdef VERASE2
1114 tio->c_cc[VERASE2] = CERASE2;
1115#endif
1116 tio->c_cc[VKILL] = CKILL;
1117 tio->c_cc[VSTART] = CSTART;
1118 tio->c_cc[VSTOP] = CSTOP;
1119 tio->c_cc[VSUSP] = CSUSP;
1120# ifdef VDSUSP
1121 tio->c_cc[VDSUSP] = CDSUSP;
1122# endif
1123# ifdef VREPRINT
1124 tio->c_cc[VREPRINT] = CRPRNT;
1125# endif
1126# ifdef VDISCRD
1127 tio->c_cc[VDISCRD] = CFLUSH;
1128# endif
1129# ifdef VWERSE
1130 tio->c_cc[VWERSE] = CWERASE;
1131# endif
1132# ifdef VLNEXT
1133 tio->c_cc[VLNEXT] = CLNEXT;
1134# endif
1135 }
1136
1137 tio->c_cc[VEOF] = CEOF;
1138 tio->c_cc[VEOL] = VDISABLE;
1139# ifdef VEOL2
1140 tio->c_cc[VEOL2] = VDISABLE;
1141# endif
1142# ifdef VSWTC
1143 tio->c_cc[VSWTC] = VDISABLE;
1144# endif
1145# ifdef VSWTCH
1146 tio->c_cc[VSWTCH] = VDISABLE;
1147# endif
1148# if VMIN != VEOF
1149 tio->c_cc[VMIN] = 1;
1150# endif
1151# if VTIME != VEOL
1152 tio->c_cc[VTIME] = 0;
1153# endif
1154
1155 if (erase != -1)
1156 tio->c_cc[VERASE] = (char)erase;
1157
1158 /* input modes */
1159 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1160# ifdef IMAXBEL
1161 | IMAXBEL
1162# endif
1163 | IXON);
1164
1165 /* output modes */
1166 tio->c_oflag = (OPOST | ONLCR);
1167
1168 /* control modes */
1169 tio->c_cflag = (CS8 | CREAD);
1170
1171 /* line discipline modes */
1172 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1173# if defined (ECHOCTL) && defined (ECHOKE)
1174 | ECHOCTL | ECHOKE
1175# endif
1176 | ECHOE | ECHOK);
1177
1178 /*
1179 * Debugging
1180 */
1181#ifdef DEBUG_TTYMODE
1182#ifdef HAVE_TERMIOS_H
1183 /* c_iflag bits */
1184 fprintf (stderr, "Input flags\n");
1185
1186 /* cpp token stringize doesn't work on all machines <sigh> */
1187# define FOO(flag,name) \
1188 if ((tio->c_iflag) & flag) \
1189 fprintf (stderr, "%s ", name)
1190
1191 /* c_iflag bits */
1192 FOO (IGNBRK, "IGNBRK");
1193 FOO (BRKINT, "BRKINT");
1194 FOO (IGNPAR, "IGNPAR");
1195 FOO (PARMRK, "PARMRK");
1196 FOO (INPCK, "INPCK");
1197 FOO (ISTRIP, "ISTRIP");
1198 FOO (INLCR, "INLCR");
1199 FOO (IGNCR, "IGNCR");
1200 FOO (ICRNL, "ICRNL");
1201 FOO (IXON, "IXON");
1202 FOO (IXOFF, "IXOFF");
1203# ifdef IUCLC
1204 FOO (IUCLC, "IUCLC");
1205# endif
1206# ifdef IXANY
1207 FOO (IXANY, "IXANY");
1208# endif
1209# ifdef IMAXBEL
1210 FOO (IMAXBEL, "IMAXBEL");
1211# endif
1212
1213 fprintf (stderr, "\n");
1214
1215# undef FOO
1216# define FOO(entry, name) \
1217 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1218
1219 FOO (VINTR, "VINTR");
1220 FOO (VQUIT, "VQUIT");
1221 FOO (VERASE, "VERASE");
1222 FOO (VKILL, "VKILL");
1223 FOO (VEOF, "VEOF");
1224 FOO (VEOL, "VEOL");
1225# ifdef VEOL2
1226 FOO (VEOL2, "VEOL2");
1227# endif
1228# ifdef VSWTC
1229 FOO (VSWTC, "VSWTC");
1230# endif
1231# ifdef VSWTCH
1232 FOO (VSWTCH, "VSWTCH");
1233# endif
1234 FOO (VSTART, "VSTART");
1235 FOO (VSTOP, "VSTOP");
1236 FOO (VSUSP, "VSUSP");
1237# ifdef VDSUSP
1238 FOO (VDSUSP, "VDSUSP");
1239# endif
1240# ifdef VREPRINT
1241 FOO (VREPRINT, "VREPRINT");
1242# endif
1243# ifdef VDISCRD
1244 FOO (VDISCRD, "VDISCRD");
1245# endif
1246# ifdef VWERSE
1247 FOO (VWERSE, "VWERSE");
1248# endif
1249# ifdef VLNEXT
1250 FOO (VLNEXT, "VLNEXT");
1251# endif
1252
1253 fprintf (stderr, "\n");
1254# undef FOO
1255# endif /* HAVE_TERMIOS_H */
1256#endif /* DEBUG_TTYMODE */
1257} 1533}
1258 1534
1259/*----------------------------------------------------------------------*/ 1535/*----------------------------------------------------------------------*/
1260/* 1536/*
1261 * Run the command in a subprocess and return a file descriptor for the 1537 * Run the command in a subprocess and return a file descriptor for the
… …
1273 if (pty->pty >= 0) 1549 if (pty->pty >= 0)
1274 { 1550 {
1275 if (getfd_hook) 1551 if (getfd_hook)
1276 pty->pty = (*getfd_hook) (pty->pty); 1552 pty->pty = (*getfd_hook) (pty->pty);
1277 1553
1278 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1554 if (pty->pty < 0)
1279 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1555 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1280 } 1556 }
1281 } 1557 }
1282 else 1558 else
1283#endif 1559#endif
1284 if (!pty->get ()) 1560 if (!pty->get ())
1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1561 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1286 1562
1287 int er; 1563 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1564
1565 struct termios tio = def_tio;
1288 1566
1289#ifndef NO_BACKSPACE_KEY 1567#ifndef NO_BACKSPACE_KEY
1290 if (key_backspace[0] && !key_backspace[1]) 1568 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1291 er = key_backspace[0]; 1569 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1292 else if (strcmp (key_backspace, "DEC") == 0) 1570 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1293 er = '\177'; /* the initial state anyway */ 1571 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1294 else
1295#endif 1572#endif
1296 er = -1;
1297 1573
1298 rxvt_get_ttymode (&tio, er); 1574 /* init terminal attributes */
1299 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1575 cfsetospeed (&tio, BAUDRATE);
1576 cfsetispeed (&tio, BAUDRATE);
1577 tcsetattr (pty->tty, TCSANOW, &tio);
1300 pty->set_utf8_mode (enc_utf8); 1578 pty->set_utf8_mode (enc_utf8);
1301 1579
1302 /* set initial window size */ 1580 /* set initial window size */
1303 tt_winch (); 1581 tt_winch ();
1304 1582
… …
1340 1618
1341 _exit (EXIT_FAILURE); 1619 _exit (EXIT_FAILURE);
1342 1620
1343 default: 1621 default:
1344 if (!option (Opt_utmpInhibit)) 1622 if (!option (Opt_utmpInhibit))
1623 {
1624#ifdef LOG_ONLY_ON_LOGIN
1625 bool login_shell = option (Opt_loginShell);
1626#else
1627 bool login_shell = true;
1628#endif
1345 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1629 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1630 }
1346 1631
1347 pty->close_tty (); 1632 pty->close_tty ();
1348 1633
1349 child_ev.start (cmd_pid); 1634 child_ev.start (cmd_pid);
1350 1635
… …
1364rxvt_term::run_child (const char *const *argv) 1649rxvt_term::run_child (const char *const *argv)
1365{ 1650{
1366 char *login; 1651 char *login;
1367 1652
1368 if (option (Opt_console)) 1653 if (option (Opt_console))
1654 {
1369 { /* be virtual console, fail silently */ 1655 /* be virtual console, fail silently */
1370#ifdef TIOCCONS 1656#ifdef TIOCCONS
1371 unsigned int on = 1; 1657 unsigned int on = 1;
1372 1658
1373 ioctl (STDIN_FILENO, TIOCCONS, &on); 1659 ioctl (STDIN_FILENO, TIOCCONS, &on);
1374#elif defined (SRIOCSREDIR) 1660#elif defined (SRIOCSREDIR)
1375 int fd; 1661 int fd;
1376 1662
1377 fd = open (CONSOLE, O_WRONLY, 0); 1663 fd = open (CONSOLE, O_WRONLY, 0);
1378 if (fd >= 0) 1664 if (fd >= 0)
1379 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1665 {
1666 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1380 close (fd); 1667 close (fd);
1381#endif /* SRIOCSREDIR */ 1668 }
1669#endif /* SRIOCSREDIR */
1382 } 1670 }
1383 1671
1384 /* reset signals and spin off the command interpreter */ 1672 /* reset signals and spin off the command interpreter */
1385 signal (SIGINT, SIG_DFL); 1673 signal (SIGINT, SIG_DFL);
1386 signal (SIGQUIT, SIG_DFL); 1674 signal (SIGQUIT, SIG_DFL);
1387 signal (SIGCHLD, SIG_DFL); 1675 signal (SIGCHLD, SIG_DFL);
1388 signal (SIGHUP, SIG_DFL); 1676 signal (SIGHUP, SIG_DFL);
1389 signal (SIGPIPE, SIG_DFL); 1677 signal (SIGPIPE, SIG_DFL);
1390 /* 1678 /*
1391 * mimick login's behavior by disabling the job control signals 1679 * mimic login's behavior by disabling the job control signals
1392 * a shell that wants them can turn them back on 1680 * a shell that wants them can turn them back on
1393 */ 1681 */
1394#ifdef SIGTSTP 1682#ifdef SIGTSTP
1395 signal (SIGTSTP, SIG_IGN); 1683 signal (SIGTSTP, SIG_IGN);
1396 signal (SIGTTIN, SIG_IGN); 1684 signal (SIGTTIN, SIG_IGN);
1397 signal (SIGTTOU, SIG_IGN); 1685 signal (SIGTTOU, SIG_IGN);
1398#endif /* SIGTSTP */ 1686#endif /* SIGTSTP */
1399
1400 // unblock signals (signals are blocked by iom.C
1401 sigset_t ss;
1402 sigemptyset (&ss);
1403 sigprocmask (SIG_SETMASK, &ss, 0);
1404 1687
1405 /* command interpreter path */ 1688 /* command interpreter path */
1406 if (argv != NULL) 1689 if (argv)
1407 { 1690 {
1408# ifdef DEBUG_CMD 1691# ifdef DEBUG_CMD
1409 int i; 1692 int i;
1410 1693
1411 for (i = 0; argv[i]; i++) 1694 for (i = 0; argv[i]; i++)
… …
1420 const char *argv0, *shell; 1703 const char *argv0, *shell;
1421 1704
1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1705 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1423 shell = "/bin/sh"; 1706 shell = "/bin/sh";
1424 1707
1425 argv0 = (const char *)rxvt_r_basename (shell); 1708 argv0 = rxvt_basename (shell);
1426 1709
1427 if (option (Opt_loginShell)) 1710 if (option (Opt_loginShell))
1428 { 1711 {
1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1712 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1430 1713
1431 login[0] = '-'; 1714 login[0] = '-';
1432 strcpy (&login[1], argv0); 1715 strcpy (&login[1], argv0);
1433 argv0 = login; 1716 argv0 = login;
1434 } 1717 }
1435 1718
1436 execlp (shell, argv0, NULL); 1719 execlp (shell, argv0, (char *)0);
1437 /* no error message: STDERR is closed! */ 1720 /* no error message: STDERR is closed! */
1438 } 1721 }
1439 1722
1440 return -1; 1723 return -1;
1441} 1724}

Diff Legend

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