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

Diff Legend

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