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.200 by ayin, Fri Aug 3 23:15:34 2007 UTC vs.
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 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)
… …
50 "rgb:00/cd/00", // 2: green (Green3) 160 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (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 538
189 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
191 want_refresh = 1; 541 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 543 ncol = 80;
194 nrow = 24; 544 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 549 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 550
201 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
202 552
203 oldcursor.row = oldcursor.col = -1; 553 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
217 last_bot = last_state = -1;
218 554
219 set_option (Opt_scrollBar); 555 set_option (Opt_scrollBar);
220 set_option (Opt_scrollTtyOutput); 556 set_option (Opt_scrollTtyOutput);
221 set_option (Opt_jumpScroll); 557 set_option (Opt_jumpScroll);
222 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
223 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
224 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
225 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
226 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
227 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
228 565 set_option (Opt_buffered);
229 return true;
230}
231
232void
233rxvt_term::init_secondary ()
234{
235 int i;
236
237 /*
238 * Close all unused file descriptors
239 * We don't want them, we don't need them.
240 */
241 if ((i = open ("/dev/null", O_RDONLY)) < 0)
242 {
243 /* TODO: BOO HISS */
244 dup2 (STDERR_FILENO, STDIN_FILENO);
245 }
246 else if (i > STDIN_FILENO)
247 {
248 dup2 (i, STDIN_FILENO);
249 close (i);
250 }
251
252 dup2 (STDERR_FILENO, STDOUT_FILENO);
253
254#if 0 // schmorp sayz closing filies is murder
255 for (i = STDERR_FILENO + 1; i < num_fds; i++)
256 {
257#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
258 if (i == 4 || i == 7)
259 continue;
260#endif
261 close (i);
262 }
263#endif
264} 566}
265 567
266/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
267const char ** 569const char **
268rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
269{ 571{
270 int i, r_argc; 572 int i, r_argc;
271 char *val;
272 const char **cmd_argv, **r_argv; 573 const char **cmd_argv, **r_argv;
273 574
274 /* 575 /*
275 * 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
276 */ 577 */
277 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
278 if (!strcmp (argv[r_argc], "-e")) 579 if (!strcmp (argv[r_argc], "-e"))
279 break; 580 break;
280 581
582 if (r_argc == argc)
583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
586 else
587 {
588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
589
590 for (i = 0; i < argc - r_argc - 1; i++)
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592
593 cmd_argv[i] = NULL;
594 }
595
281 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 596 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
282 597
283 for (i = 0; i < r_argc; i++) 598 for (i = 0; i < r_argc; i++)
284 r_argv[i] = (const char *)argv[i]; 599 r_argv[i] = (const char *)argv[i];
285 600
286 r_argv[i] = NULL; 601 r_argv[i] = NULL;
287 602
288 if (r_argc == argc)
289 cmd_argv = NULL;
290 else
291 {
292 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
293
294 for (i = 0; i < argc - r_argc - 1; i++)
295 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
296
297 cmd_argv[i] = NULL;
298 }
299
300 rs[Rs_name] = rxvt_r_basename (argv[0]); 603 rs[Rs_name] = rxvt_basename (argv[0]);
301 604
302 /* 605 /*
303 * Open display, get options/resources and create the window 606 * Open display, get options/resources and create the window
304 */ 607 */
305 608
… …
307 rs[Rs_display_name] = ":0"; 610 rs[Rs_display_name] = ":0";
308 611
309 get_options (r_argc, r_argv); 612 get_options (r_argc, r_argv);
310 613
311 if (!(display = displays.get (rs[Rs_display_name]))) 614 if (!(display = displays.get (rs[Rs_display_name])))
615 {
616 free (r_argv);
312 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 617 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
618 }
313 619
314 // using a local pointer decreases code size a lot 620 // using a local pointer decreases code size a lot
315 xa = display->xa; 621 xa = display->xa;
316 622
317 set (display); 623 set (display);
… …
320#if XFT 626#if XFT
321 if (rs[Rs_depth]) 627 if (rs[Rs_depth])
322 select_visual (strtol (rs[Rs_depth], 0, 0)); 628 select_visual (strtol (rs[Rs_depth], 0, 0));
323#endif 629#endif
324 630
325#ifdef HAVE_AFTERIMAGE
326 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
327#endif
328 free (r_argv); 631 free (r_argv);
329 632
330 for (int i = NUM_RESOURCES; i--; ) 633 for (int i = NUM_RESOURCES; i--; )
331 if (rs [i] == resval_undef) 634 if (rs [i] == resval_undef)
332 rs [i] = 0; 635 rs [i] = 0;
… …
341 { 644 {
342 rxvt_perl.init (this); 645 rxvt_perl.init (this);
343 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 646 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
344 } 647 }
345#endif 648#endif
649
650 // must be called after initialising the perl interpreter as it
651 // may invoke the `on_register_command' hook
652 extract_keysym_resources ();
346 653
347 /* 654 /*
348 * set any defaults not already set 655 * set any defaults not already set
349 */ 656 */
350 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
351 { 658 {
352 if (!rs[Rs_title]) 659 if (!rs[Rs_title])
353 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 660 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
661
354 if (!rs[Rs_iconName]) 662 if (!rs[Rs_iconName])
355 rs[Rs_iconName] = rs[Rs_title]; 663 rs[Rs_iconName] = rs[Rs_title];
356 } 664 }
357 else 665 else
358 { 666 {
359 if (!rs[Rs_title]) 667 if (!rs[Rs_title])
360 rs[Rs_title] = rs[Rs_name]; 668 rs[Rs_title] = rs[Rs_name];
669
361 if (!rs[Rs_iconName]) 670 if (!rs[Rs_iconName])
362 rs[Rs_iconName] = rs[Rs_name]; 671 rs[Rs_iconName] = rs[Rs_name];
363 } 672 }
364 673
365 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 674 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
372 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 681 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
373 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 682 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
374 683
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 684 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 685 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
686
687 if (rs[Rs_letterSpace])
688 letterSpace = atoi (rs[Rs_letterSpace]);
377#endif 689#endif
378 690
379#ifdef POINTER_BLANK 691#ifdef POINTER_BLANK
380 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
381 pointerBlankDelay = i; 693 pointerBlankDelay = i;
… …
385 697
386 /* no point having a scrollbar without having any scrollback! */ 698 /* no point having a scrollbar without having any scrollback! */
387 if (!saveLines) 699 if (!saveLines)
388 set_option (Opt_scrollBar, 0); 700 set_option (Opt_scrollBar, 0);
389 701
390#ifdef PRINTPIPE
391 if (!rs[Rs_print_pipe])
392 rs[Rs_print_pipe] = PRINTPIPE;
393#endif
394
395 if (!rs[Rs_cutchars]) 702 if (!rs[Rs_cutchars])
396 rs[Rs_cutchars] = CUTCHARS; 703 rs[Rs_cutchars] = CUTCHARS;
397 704
398#ifndef NO_BACKSPACE_KEY 705#ifndef NO_BACKSPACE_KEY
399 if (!rs[Rs_backspace_key]) 706 if (!rs[Rs_backspace_key])
400# ifdef DEFAULT_BACKSPACE 707# ifdef DEFAULT_BACKSPACE
401 key_backspace = DEFAULT_BACKSPACE; 708 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402# else 709# else
403 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 710 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404# endif 711# endif
405 else
406 {
407 val = strdup (rs[Rs_backspace_key]);
408 rxvt_Str_trim (val);
409 rxvt_Str_escaped (val);
410 key_backspace = val;
411 }
412#endif 712#endif
413 713
414#ifndef NO_DELETE_KEY 714#ifndef NO_DELETE_KEY
415 if (!rs[Rs_delete_key]) 715 if (!rs[Rs_delete_key])
416# ifdef DEFAULT_DELETE 716# ifdef DEFAULT_DELETE
417 key_delete = DEFAULT_DELETE; 717 rs[Rs_delete_key] = DEFAULT_DELETE;
418# else 718# else
419 key_delete = "\033[3~"; 719 rs[Rs_delete_key] = "\033[3~";
420# endif 720# endif
421 else
422 {
423 val = strdup (rs[Rs_delete_key]);
424 rxvt_Str_trim (val);
425 rxvt_Str_escaped (val);
426 key_delete = val;
427 }
428#endif 721#endif
429 if (rs[Rs_answerbackstring])
430 {
431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433 }
434 722
435#ifdef HAVE_SCROLLBARS 723 scrollBar.setup (this);
436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437#endif
438 724
439#ifdef XTERM_REVERSE_VIDEO 725#ifdef XTERM_REVERSE_VIDEO
440 /* this is how xterm implements reverseVideo */ 726 /* this is how xterm implements reverseVideo */
441 if (option (Opt_reverseVideo)) 727 if (option (Opt_reverseVideo))
442 { 728 {
… …
462 color_aliases (Color_fg); 748 color_aliases (Color_fg);
463 color_aliases (Color_bg); 749 color_aliases (Color_bg);
464#ifndef NO_CURSORCOLOR 750#ifndef NO_CURSORCOLOR
465 color_aliases (Color_cursor); 751 color_aliases (Color_cursor);
466 color_aliases (Color_cursor2); 752 color_aliases (Color_cursor2);
467#endif /* NO_CURSORCOLOR */ 753#endif /* NO_CURSORCOLOR */
468 color_aliases (Color_pointer_fg); 754 color_aliases (Color_pointer_fg);
469 color_aliases (Color_pointer_bg); 755 color_aliases (Color_pointer_bg);
470 color_aliases (Color_border); 756 color_aliases (Color_border);
471#ifndef NO_BOLD_UNDERLINE_REVERSE 757#ifndef NO_BOLD_UNDERLINE_REVERSE
472 color_aliases (Color_BD); 758 color_aliases (Color_BD);
473 color_aliases (Color_UL); 759 color_aliases (Color_UL);
474 color_aliases (Color_RV); 760 color_aliases (Color_RV);
475#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 761#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
476 762
477 if (!rs[Rs_color + Color_border]) 763 if (!rs[Rs_color + Color_border])
478 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 764 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
479 765
480 return cmd_argv; 766 return cmd_argv;
767}
768
769/*----------------------------------------------------------------------*/
770void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
772{
773 this->envv = envv;
774
775 SET_R (this);
776 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :(
778
779 init_vars ();
780
781 const char **cmd_argv = init_resources (argc, argv);
782
783#ifdef KEYSYM_RESOURCE
784 keyboard->register_done ();
785#endif
786
787 if (const char *path = rs[Rs_chdir])
788 if (*path) // ignored if empty
789 {
790 if (*path != '/')
791 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
792
793 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 }
796
797 if (option (Opt_scrollBar))
798 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799
800 pty = ptytty::create ();
801
802#ifdef HAVE_AFTERIMAGE
803 set_application_name ((char *)rs[Rs_name]);
804 set_output_threshold (OUTPUT_LEVEL_WARNING);
805#endif
806
807 // must be called before create_windows, because the latter may call set_icon
808#ifdef HAVE_PIXBUF
809 g_type_init ();
810#endif
811
812 create_windows (argc, argv);
813
814 init_xlocale ();
815
816 scr_poweron (); // initialize screen
817
818#if 0
819 XSynchronize (dpy, True);
820#endif
821
822 if (option (Opt_scrollBar))
823 scrollBar.resize (); /* create and map scrollbar */
824#ifdef HAVE_BG_PIXMAP
825 {
826 bg_init ();
827
828#ifdef ENABLE_TRANSPARENCY
829 if (option (Opt_transparent))
830 {
831 bg_set_transparent ();
832
833 if (rs [Rs_blurradius])
834 bg_set_blur (rs [Rs_blurradius]);
835
836 if (ISSET_PIXCOLOR (Color_tint))
837 bg_set_tint (pix_colors_focused [Color_tint]);
838
839 if (rs [Rs_shade])
840 bg_set_shade (rs [Rs_shade]);
841
842 bg_set_root_pixmap ();
843 XSelectInput (dpy, display->root, PropertyChangeMask);
844 rootwin_ev.start (display, display->root);
845 }
846#endif
847
848#ifdef BG_IMAGE_FROM_FILE
849 if (rs[Rs_backgroundPixmap])
850 {
851 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ())
853 update_background ();
854 }
855#endif
856 }
857#endif
858
859#if ENABLE_PERL
860 rootwin_ev.start (display, display->root);
861#endif
862
863 set_colorfgbg ();
864
865 init_command (cmd_argv);
866
867 free (cmd_argv);
868
869 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ);
871
872 HOOK_INVOKE ((this, HOOK_START, DT_END));
873
874#if ENABLE_XEMBED
875 if (rs[Rs_embed])
876 {
877 long info[2] = { 0, XEMBED_MAPPED };
878
879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2);
881 }
882#endif
883
884#if HAVE_STARTUP_NOTIFICATION
885 SnDisplay *snDisplay;
886 SnLauncheeContext *snContext;
887
888 snDisplay = sn_display_new (dpy, NULL, NULL);
889 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
890
891 /* Tell the window manager that this window is part of the startup context */
892 if (snContext)
893 sn_launchee_context_setup_window (snContext, parent);
894#endif
895
896 XMapWindow (dpy, vt);
897 XMapWindow (dpy, parent);
898
899#if HAVE_STARTUP_NOTIFICATION
900 if (snContext)
901 {
902 /* Mark the startup process as complete */
903 sn_launchee_context_complete (snContext);
904
905 sn_launchee_context_unref (snContext);
906 }
907
908 sn_display_unref (snDisplay);
909#endif
910
911 refresh_check ();
481} 912}
482 913
483/*----------------------------------------------------------------------*/ 914/*----------------------------------------------------------------------*/
484void 915void
485rxvt_term::init_env () 916rxvt_term::init_env ()
486{ 917{
487 int i;
488 unsigned int u;
489 char *val; 918 char *val;
490 919
491#ifdef DISPLAY_IS_IP 920#ifdef DISPLAY_IS_IP
492 /* Fixup display_name for export over pty to any interested terminal 921 /* Fixup display_name for export over pty to any interested terminal
493 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 922 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
501 */ 930 */
502 val = rxvt_network_display (rs[Rs_display_name]); 931 val = rxvt_network_display (rs[Rs_display_name]);
503 rs[Rs_display_name] = (const char *)val; 932 rs[Rs_display_name] = (const char *)val;
504 933
505 if (val == NULL) 934 if (val == NULL)
506#endif /* DISPLAY_IS_IP */ 935#endif /* DISPLAY_IS_IP */
507 val = XDisplayString (dpy); 936 val = XDisplayString (dpy);
508 937
509 if (rs[Rs_display_name] == NULL) 938 if (rs[Rs_display_name] == NULL)
510 rs[Rs_display_name] = val; /* use broken `:0' value */ 939 rs[Rs_display_name] = val; /* use broken `:0' value */
511 940
512 i = strlen (val);
513 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 941 env_display = (char *)rxvt_malloc (strlen (val) + 9);
514 942
515 sprintf (env_display, "DISPLAY=%s", val); 943 sprintf (env_display, "DISPLAY=%s", val);
516 944
517 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 945 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
518 946
519 /* add entries to the environment: 947 /* add entries to the environment:
520 * @ DISPLAY: in case we started with -display 948 * @ DISPLAY: in case we started with -display
521 * @ WINDOWID: X window id number of the window 949 * @ WINDOWID: X window id number of the window
522 * @ COLORTERM: terminal sub-name and also indicates its color 950 * @ COLORTERM: terminal sub-name and also indicates its color
… …
539 else 967 else
540 putenv ("COLORTERM=" COLORTERMENVFULL); 968 putenv ("COLORTERM=" COLORTERMENVFULL);
541 969
542 if (rs[Rs_term_name] != NULL) 970 if (rs[Rs_term_name] != NULL)
543 { 971 {
544 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 972 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
545 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 973 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
546 putenv (env_term); 974 putenv (env_term);
547 } 975 }
548 else 976 else
549 putenv ("TERM=" TERMENV); 977 putenv ("TERM=" TERMENV);
… …
551#ifdef HAVE_UNSETENV 979#ifdef HAVE_UNSETENV
552 /* avoid passing old settings and confusing term size */ 980 /* avoid passing old settings and confusing term size */
553 unsetenv ("LINES"); 981 unsetenv ("LINES");
554 unsetenv ("COLUMNS"); 982 unsetenv ("COLUMNS");
555 unsetenv ("TERMCAP"); /* terminfo should be okay */ 983 unsetenv ("TERMCAP"); /* terminfo should be okay */
556#endif /* HAVE_UNSETENV */ 984#endif /* HAVE_UNSETENV */
557} 985}
558 986
559/*----------------------------------------------------------------------*/ 987/*----------------------------------------------------------------------*/
560/* 988/*
561 * This is more or less stolen straight from XFree86 xterm. 989 * This is more or less stolen straight from XFree86 xterm.
… …
582 1010
583 this->locale = "C"; 1011 this->locale = "C";
584 } 1012 }
585 1013
586 1014
587 this->locale = rxvt_strdup (this->locale); 1015 this->locale = strdup (this->locale);
588 SET_LOCALE (this->locale); 1016 SET_LOCALE (this->locale);
589 mbstate.reset (); 1017 mbstate.reset ();
590#endif 1018#endif
591 1019
592#if HAVE_NL_LANGINFO 1020#if HAVE_NL_LANGINFO
… …
649 priv_modes |= PrivMode_Keypress; 1077 priv_modes |= PrivMode_Keypress;
650 if (!option (Opt_jumpScroll)) 1078 if (!option (Opt_jumpScroll))
651 priv_modes |= PrivMode_smoothScroll; 1079 priv_modes |= PrivMode_smoothScroll;
652 1080
653#ifndef NO_BACKSPACE_KEY 1081#ifndef NO_BACKSPACE_KEY
654 if (strcmp (key_backspace, "DEC") == 0) 1082 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
655 priv_modes |= PrivMode_HaveBackSpace; 1083 priv_modes |= PrivMode_HaveBackSpace;
656#endif 1084#endif
657 1085
658 /* add value for scrollBar */ 1086 /* add value for scrollBar */
659 if (scrollBar.state) 1087 if (scrollBar.state)
… …
665 run_command (argv); 1093 run_command (argv);
666} 1094}
667 1095
668/*----------------------------------------------------------------------*/ 1096/*----------------------------------------------------------------------*/
669void 1097void
670rxvt_term::Get_Colours () 1098rxvt_term::get_colours ()
671{ 1099{
672 int i; 1100 int i;
673 1101
674#ifdef OFF_FOCUS_FADING 1102#ifdef OFF_FOCUS_FADING
675 pix_colors = pix_colors_focused; 1103 pix_colors = pix_colors_focused;
676#endif 1104#endif
677 1105
678 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1106 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
679 { 1107 {
680 const char *name = rs[Rs_color + i]; 1108 const char *name = rs[Rs_color + i];
681 1109
682 if (!name) 1110 if (!name)
… …
735 * get scrollBar shadow colors 1163 * get scrollBar shadow colors
736 * 1164 *
737 * The calculations of topShadow/bottomShadow values are adapted 1165 * The calculations of topShadow/bottomShadow values are adapted
738 * from the fvwm window manager. 1166 * from the fvwm window manager.
739 */ 1167 */
740#ifdef KEEP_SCROLLCOLOR 1168#ifdef RXVT_SCROLLBAR
741 if (depth <= 2) 1169 if (depth <= 2)
742 { 1170 {
743 /* Monochrome */ 1171 /* Monochrome */
744 alias_color (Color_scroll, Color_fg); 1172 alias_color (Color_scroll, Color_fg);
745 alias_color (Color_topShadow, Color_bg); 1173 alias_color (Color_topShadow, Color_bg);
… …
760 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1188 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
761 cscroll.a) 1189 cscroll.a)
762 )) 1190 ))
763 alias_color (Color_topShadow, Color_White); 1191 alias_color (Color_topShadow, Color_White);
764 } 1192 }
765#endif /* KEEP_SCROLLCOLOR */ 1193#endif
766 1194
767#ifdef OFF_FOCUS_FADING 1195#ifdef OFF_FOCUS_FADING
768 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1196 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
769 update_fade_color (i); 1197 update_fade_color (i);
770#endif 1198#endif
… …
778 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1206 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
779 { 1207 {
780 int i = atoi (rs[Rs_color + idx]); 1208 int i = atoi (rs[Rs_color + idx]);
781 1209
782 if (i >= 8 && i <= 15) 1210 if (i >= 8 && i <= 15)
783 { /* bright colors */ 1211 /* bright colors */
784 i -= 8;
785 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1212 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
786 return; 1213 else if (i >= 0 && i <= 7)
787 } 1214 /* normal colors */
788
789 if (i >= 0 && i <= 7) /* normal colors */
790 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1215 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
791 } 1216 }
792} 1217}
793 1218
794/*----------------------------------------------------------------------*/ 1219/*----------------------------------------------------------------------*/
… …
878 1303
879 if (i) 1304 if (i)
880 ModMetaMask = modmasks[i - 1]; 1305 ModMetaMask = modmasks[i - 1];
881} 1306}
882 1307
1308void
1309rxvt_term::set_icon (const char *file)
1310{
1311#ifdef HAVE_AFTERIMAGE
1312 init_asv ();
1313
1314 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1315 if (!im)
1316 {
1317 rxvt_warn ("Loading image icon failed, continuing without.\n");
1318 return;
1319 }
1320
1321 unsigned int w = im->width;
1322 unsigned int h = im->height;
1323
1324 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1325 {
1326 rxvt_warn ("Icon image too big, continuing without.\n");
1327 destroy_asimage (&im);
1328 return;
1329 }
1330
1331 ASImage *result = scale_asimage (asv, im,
1332 w, h, ASA_ARGB32,
1333 100, ASIMAGE_QUALITY_DEFAULT);
1334 destroy_asimage (&im);
1335
1336 if (!result)
1337 {
1338 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1339 return;
1340 }
1341
1342 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1343 if (buffer)
1344 {
1345 ARGB32 *asbuf = result->alt.argb32;
1346 buffer [0] = w;
1347 buffer [1] = h;
1348
1349 for (unsigned int i = 0; i < w * h; ++i)
1350 buffer [i + 2] = asbuf [i];
1351
1352 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1353 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1354 free (buffer);
1355 }
1356 else
1357 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1358
1359 destroy_asimage (&result);
1360#endif
1361
1362#ifdef HAVE_PIXBUF
1363 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1364 if (!pixbuf)
1365 {
1366 rxvt_warn ("Loading image icon failed, continuing without.\n");
1367 return;
1368 }
1369
1370 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1371 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1372
1373 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1374 {
1375 rxvt_warn ("Icon image too big, continuing without.\n");
1376 g_object_unref (pixbuf);
1377 return;
1378 }
1379
1380 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1381 {
1382 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1383 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1384 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1385
1386 buffer [0] = w;
1387 buffer [1] = h;
1388 for (int i = 0; i < h; i++)
1389 {
1390 for (int j = 0; j < w; j++)
1391 {
1392 unsigned char *pixel = row + j * channels;
1393 long value;
1394
1395 if (channels == 4)
1396 value = pixel[3];
1397 else
1398 value = (unsigned char)0x00ff;
1399
1400 value = (value << 8) + pixel[0];
1401 value = (value << 8) + pixel[1];
1402 value = (value << 8) + pixel[2];
1403 buffer[(i * w + j) + 2] = value;
1404 }
1405
1406 row += rowstride;
1407 }
1408
1409 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1410 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1411 free (buffer);
1412 }
1413 else
1414 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1415
1416 g_object_unref (pixbuf);
1417#endif
1418}
1419
883/*----------------------------------------------------------------------*/ 1420/*----------------------------------------------------------------------*/
884/* rxvt_Create_Windows () - Open and map the window */ 1421/* Open and map the window */
885void 1422void
886rxvt_term::create_windows (int argc, const char *const *argv) 1423rxvt_term::create_windows (int argc, const char *const *argv)
887{ 1424{
888 XClassHint classHint; 1425 XClassHint classHint;
889 XWMHints wmHint; 1426 XWMHints wmHint;
… …
895 Window top, parent; 1432 Window top, parent;
896 1433
897 dLocal (Display *, dpy); 1434 dLocal (Display *, dpy);
898 1435
899 /* grab colors before netscape does */ 1436 /* grab colors before netscape does */
900 Get_Colours (); 1437 get_colours ();
901 1438
902 if (!set_fonts ()) 1439 if (!set_fonts ())
903 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1440 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
904 1441
905 parent = display->root; 1442 parent = display->root;
… …
909#if ENABLE_FRILLS 1446#if ENABLE_FRILLS
910 if (option (Opt_borderLess)) 1447 if (option (Opt_borderLess))
911 { 1448 {
912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1449 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
913 { 1450 {
914 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1451 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
915 attributes.override_redirect = true; 1452 attributes.override_redirect = true;
916 mwmhints.flags = 0;
917 } 1453 }
918 else 1454 else
919 { 1455 {
920 mwmhints.flags = MWM_HINTS_DECORATIONS; 1456 mwmhints.flags = MWM_HINTS_DECORATIONS;
921 mwmhints.decorations = 0;
922 } 1457 }
923 } 1458 }
924 else
925 mwmhints.flags = 0;
926#endif 1459#endif
927 1460
928#if ENABLE_XEMBED 1461#if ENABLE_XEMBED
929 if (rs[Rs_embed]) 1462 if (rs[Rs_embed])
930 { 1463 {
… …
939 } 1472 }
940#endif 1473#endif
941 1474
942 window_calc (0, 0); 1475 window_calc (0, 0);
943 1476
944 /* sub-window placement & size in rxvt_resize_subwindows () */ 1477 /* sub-window placement & size in rxvt_term::resize_all_windows () */
945 attributes.background_pixel = pix_colors_focused [Color_border]; 1478 attributes.background_pixel = pix_colors_focused [Color_border];
946 attributes.border_pixel = pix_colors_focused [Color_border]; 1479 attributes.border_pixel = pix_colors_focused [Color_border];
947 attributes.colormap = cmap; 1480 attributes.colormap = cmap;
948 1481
949 top = XCreateWindow (dpy, parent, 1482 top = XCreateWindow (dpy, parent,
… …
952 ext_bwidth, 1485 ext_bwidth,
953 depth, InputOutput, visual, 1486 depth, InputOutput, visual,
954 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
955 &attributes); 1488 &attributes);
956 1489
957 this->parent[0] = top; 1490 this->parent = top;
958 1491
959 old_width = szHint.width; 1492 old_width = szHint.width;
960 old_height = szHint.height; 1493 old_height = szHint.height;
961 1494
962 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1495 set_title (rs [Rs_title]);
963 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1496 set_icon_name (rs [Rs_iconName]);
964 1497
965 classHint.res_name = (char *)rs[Rs_name]; 1498 classHint.res_name = (char *)rs[Rs_name];
966 classHint.res_class = (char *)RESCLASS; 1499 classHint.res_class = (char *)RESCLASS;
967 1500
968 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1501 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
970 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1503 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
971 wmHint.window_group = top; 1504 wmHint.window_group = top;
972 1505
973 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1506 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
974 &szHint, &wmHint, &classHint); 1507 &szHint, &wmHint, &classHint);
1508#if ENABLE_EWMH
1509 /*
1510 * set up icon hint
1511 * rs [Rs_iconfile] is path to icon
1512 */
1513
1514 if (rs [Rs_iconfile])
1515 {
1516 set_icon (rs [Rs_iconfile]);
1517 }
1518#endif
975 1519
976#if ENABLE_FRILLS 1520#if ENABLE_FRILLS
977 if (mwmhints.flags) 1521 if (mwmhints.flags)
978 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1522 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
979 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1523 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
984#if ENABLE_EWMH 1528#if ENABLE_EWMH
985 xa[XA_NET_WM_PING], 1529 xa[XA_NET_WM_PING],
986#endif 1530#endif
987 }; 1531 };
988 1532
989 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1533 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
990 1534
991#if ENABLE_FRILLS 1535#if ENABLE_FRILLS
992 if (rs[Rs_transient_for]) 1536 if (rs[Rs_transient_for])
993 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1537 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
994#endif 1538#endif
… …
1013 1557
1014 termwin_ev.start (display, top); 1558 termwin_ev.start (display, top);
1015 1559
1016 /* vt cursor: Black-on-White is standard, but this is more popular */ 1560 /* vt cursor: Black-on-White is standard, but this is more popular */
1017 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1561 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1018
1019#ifdef HAVE_SCROLLBARS
1020 /* cursor scrollBar: Black-on-White */
1021 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1022#endif
1023 1562
1024 /* the vt window */ 1563 /* the vt window */
1025 vt = XCreateSimpleWindow (dpy, top, 1564 vt = XCreateSimpleWindow (dpy, top,
1026 window_vt_x, window_vt_y, 1565 window_vt_x, window_vt_y,
1027 width, height, 1566 width, height,
… …
1041 1580
1042 vt_select_input (); 1581 vt_select_input ();
1043 1582
1044 vt_ev.start (display, vt); 1583 vt_ev.start (display, vt);
1045 1584
1046#ifdef XPM_BACKGROUND
1047 if (rs[Rs_backgroundPixmap] != NULL)
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 bgPixmap.handle_geometry (p);
1055 }
1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true);
1059 }
1060#endif
1061
1062 /* graphics context for the vt window */ 1585 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1586 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1587 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 0; 1588 gcvalue.graphics_exposures = 0;
1066 1589
… …
1068 GCForeground | GCBackground | GCGraphicsExposures, 1591 GCForeground | GCBackground | GCGraphicsExposures,
1069 &gcvalue); 1592 &gcvalue);
1070 1593
1071 drawable = new rxvt_drawable (this, vt); 1594 drawable = new rxvt_drawable (this, vt);
1072 1595
1073#ifdef RXVT_SCROLLBAR
1074 gcvalue.foreground = pix_colors[Color_topShadow];
1075 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1077 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1079 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1080#endif
1081
1082#ifdef OFF_FOCUS_FADING 1596#ifdef OFF_FOCUS_FADING
1083 // initially we are in unfocused state 1597 // initially we are in unfocused state
1084 if (rs[Rs_fade]) 1598 if (rs[Rs_fade])
1085 pix_colors = pix_colors_unfocused; 1599 pix_colors = pix_colors_unfocused;
1086#endif 1600#endif
1087 1601
1088 pointer_unblank (); 1602 pointer_unblank ();
1089 scr_recolour (); 1603 scr_recolour ();
1090}
1091
1092/* ------------------------------------------------------------------------- *
1093 * GET TTY CURRENT STATE *
1094 * ------------------------------------------------------------------------- */
1095void
1096rxvt_get_ttymode (ttymode_t *tio, int erase)
1097{
1098 /*
1099 * standard System V termios interface
1100 */
1101 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1102 {
1103 // return error - use system defaults,
1104 // where possible, and zero elsewhere
1105 memset (tio, 0, sizeof (ttymode_t));
1106
1107 tio->c_cc[VINTR] = CINTR;
1108 tio->c_cc[VQUIT] = CQUIT;
1109 tio->c_cc[VERASE] = CERASE;
1110#ifdef VERASE2
1111 tio->c_cc[VERASE2] = CERASE2;
1112#endif
1113 tio->c_cc[VKILL] = CKILL;
1114 tio->c_cc[VSTART] = CSTART;
1115 tio->c_cc[VSTOP] = CSTOP;
1116 tio->c_cc[VSUSP] = CSUSP;
1117# ifdef VDSUSP
1118 tio->c_cc[VDSUSP] = CDSUSP;
1119# endif
1120# ifdef VREPRINT
1121 tio->c_cc[VREPRINT] = CRPRNT;
1122# endif
1123# ifdef VDISCRD
1124 tio->c_cc[VDISCRD] = CFLUSH;
1125# endif
1126# ifdef VWERSE
1127 tio->c_cc[VWERSE] = CWERASE;
1128# endif
1129# ifdef VLNEXT
1130 tio->c_cc[VLNEXT] = CLNEXT;
1131# endif
1132 }
1133
1134 tio->c_cc[VEOF] = CEOF;
1135 tio->c_cc[VEOL] = VDISABLE;
1136# ifdef VEOL2
1137 tio->c_cc[VEOL2] = VDISABLE;
1138# endif
1139# ifdef VSWTC
1140 tio->c_cc[VSWTC] = VDISABLE;
1141# endif
1142# ifdef VSWTCH
1143 tio->c_cc[VSWTCH] = VDISABLE;
1144# endif
1145# if VMIN != VEOF
1146 tio->c_cc[VMIN] = 1;
1147# endif
1148# if VTIME != VEOL
1149 tio->c_cc[VTIME] = 0;
1150# endif
1151
1152 if (erase != -1)
1153 tio->c_cc[VERASE] = (char)erase;
1154
1155 /* input modes */
1156 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1157# ifdef IMAXBEL
1158 | IMAXBEL
1159# endif
1160 | IXON);
1161
1162 /* output modes */
1163 tio->c_oflag = (OPOST | ONLCR);
1164
1165 /* control modes */
1166 tio->c_cflag = (CS8 | CREAD);
1167
1168 /* line discipline modes */
1169 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1170# if defined (ECHOCTL) && defined (ECHOKE)
1171 | ECHOCTL | ECHOKE
1172# endif
1173 | ECHOE | ECHOK);
1174
1175 /*
1176 * Debugging
1177 */
1178#ifdef DEBUG_TTYMODE
1179#ifdef HAVE_TERMIOS_H
1180 /* c_iflag bits */
1181 fprintf (stderr, "Input flags\n");
1182
1183 /* cpp token stringize doesn't work on all machines <sigh> */
1184# define FOO(flag,name) \
1185 if ((tio->c_iflag) & flag) \
1186 fprintf (stderr, "%s ", name)
1187
1188 /* c_iflag bits */
1189 FOO (IGNBRK, "IGNBRK");
1190 FOO (BRKINT, "BRKINT");
1191 FOO (IGNPAR, "IGNPAR");
1192 FOO (PARMRK, "PARMRK");
1193 FOO (INPCK, "INPCK");
1194 FOO (ISTRIP, "ISTRIP");
1195 FOO (INLCR, "INLCR");
1196 FOO (IGNCR, "IGNCR");
1197 FOO (ICRNL, "ICRNL");
1198 FOO (IXON, "IXON");
1199 FOO (IXOFF, "IXOFF");
1200# ifdef IUCLC
1201 FOO (IUCLC, "IUCLC");
1202# endif
1203# ifdef IXANY
1204 FOO (IXANY, "IXANY");
1205# endif
1206# ifdef IMAXBEL
1207 FOO (IMAXBEL, "IMAXBEL");
1208# endif
1209
1210 fprintf (stderr, "\n");
1211
1212# undef FOO
1213# define FOO(entry, name) \
1214 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1215
1216 FOO (VINTR, "VINTR");
1217 FOO (VQUIT, "VQUIT");
1218 FOO (VERASE, "VERASE");
1219 FOO (VKILL, "VKILL");
1220 FOO (VEOF, "VEOF");
1221 FOO (VEOL, "VEOL");
1222# ifdef VEOL2
1223 FOO (VEOL2, "VEOL2");
1224# endif
1225# ifdef VSWTC
1226 FOO (VSWTC, "VSWTC");
1227# endif
1228# ifdef VSWTCH
1229 FOO (VSWTCH, "VSWTCH");
1230# endif
1231 FOO (VSTART, "VSTART");
1232 FOO (VSTOP, "VSTOP");
1233 FOO (VSUSP, "VSUSP");
1234# ifdef VDSUSP
1235 FOO (VDSUSP, "VDSUSP");
1236# endif
1237# ifdef VREPRINT
1238 FOO (VREPRINT, "VREPRINT");
1239# endif
1240# ifdef VDISCRD
1241 FOO (VDISCRD, "VDISCRD");
1242# endif
1243# ifdef VWERSE
1244 FOO (VWERSE, "VWERSE");
1245# endif
1246# ifdef VLNEXT
1247 FOO (VLNEXT, "VLNEXT");
1248# endif
1249
1250 fprintf (stderr, "\n");
1251# undef FOO
1252# endif /* HAVE_TERMIOS_H */
1253#endif /* DEBUG_TTYMODE */
1254} 1604}
1255 1605
1256/*----------------------------------------------------------------------*/ 1606/*----------------------------------------------------------------------*/
1257/* 1607/*
1258 * Run the command in a subprocess and return a file descriptor for the 1608 * Run the command in a subprocess and return a file descriptor for the
… …
1279 else 1629 else
1280#endif 1630#endif
1281 if (!pty->get ()) 1631 if (!pty->get ())
1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1632 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1283 1633
1284 int er; 1634 struct termios tio = def_tio;
1285 1635
1286#ifndef NO_BACKSPACE_KEY 1636#ifndef NO_BACKSPACE_KEY
1287 if (key_backspace[0] && !key_backspace[1]) 1637 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1288 er = key_backspace[0]; 1638 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1289 else if (strcmp (key_backspace, "DEC") == 0) 1639 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1290 er = '\177'; /* the initial state anyway */ 1640 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1291 else
1292#endif 1641#endif
1293 er = -1;
1294 1642
1295 rxvt_get_ttymode (&tio, er); 1643 /* init terminal attributes */
1296 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1644 cfsetospeed (&tio, BAUDRATE);
1645 cfsetispeed (&tio, BAUDRATE);
1646 tcsetattr (pty->tty, TCSANOW, &tio);
1297 pty->set_utf8_mode (enc_utf8); 1647 pty->set_utf8_mode (enc_utf8);
1298 1648
1299 /* set initial window size */ 1649 /* set initial window size */
1300 tt_winch (); 1650 tt_winch ();
1301 1651
… …
1361rxvt_term::run_child (const char *const *argv) 1711rxvt_term::run_child (const char *const *argv)
1362{ 1712{
1363 char *login; 1713 char *login;
1364 1714
1365 if (option (Opt_console)) 1715 if (option (Opt_console))
1716 {
1366 { /* be virtual console, fail silently */ 1717 /* be virtual console, fail silently */
1367#ifdef TIOCCONS 1718#ifdef TIOCCONS
1368 unsigned int on = 1; 1719 unsigned int on = 1;
1369 1720
1370 ioctl (STDIN_FILENO, TIOCCONS, &on); 1721 ioctl (STDIN_FILENO, TIOCCONS, &on);
1371#elif defined (SRIOCSREDIR) 1722#elif defined (SRIOCSREDIR)
… …
1373 1724
1374 fd = open (CONSOLE, O_WRONLY, 0); 1725 fd = open (CONSOLE, O_WRONLY, 0);
1375 if (fd >= 0) 1726 if (fd >= 0)
1376 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1727 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1377 close (fd); 1728 close (fd);
1378#endif /* SRIOCSREDIR */ 1729#endif /* SRIOCSREDIR */
1379 } 1730 }
1380 1731
1381 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1382 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);
1383 signal (SIGQUIT, SIG_DFL); 1734 signal (SIGQUIT, SIG_DFL);
1384 signal (SIGCHLD, SIG_DFL); 1735 signal (SIGCHLD, SIG_DFL);
1385 signal (SIGHUP, SIG_DFL); 1736 signal (SIGHUP, SIG_DFL);
1386 signal (SIGPIPE, SIG_DFL); 1737 signal (SIGPIPE, SIG_DFL);
1387 /* 1738 /*
1388 * mimick login's behavior by disabling the job control signals 1739 * mimic login's behavior by disabling the job control signals
1389 * a shell that wants them can turn them back on 1740 * a shell that wants them can turn them back on
1390 */ 1741 */
1391#ifdef SIGTSTP 1742#ifdef SIGTSTP
1392 signal (SIGTSTP, SIG_IGN); 1743 signal (SIGTSTP, SIG_IGN);
1393 signal (SIGTTIN, SIG_IGN); 1744 signal (SIGTTIN, SIG_IGN);
1394 signal (SIGTTOU, SIG_IGN); 1745 signal (SIGTTOU, SIG_IGN);
1395#endif /* SIGTSTP */ 1746#endif /* SIGTSTP */
1396
1397 // unblock signals (signals are blocked by iom.C
1398 sigset_t ss;
1399 sigemptyset (&ss);
1400 sigprocmask (SIG_SETMASK, &ss, 0);
1401 1747
1402 /* command interpreter path */ 1748 /* command interpreter path */
1403 if (argv != NULL) 1749 if (argv)
1404 { 1750 {
1405# ifdef DEBUG_CMD 1751# ifdef DEBUG_CMD
1406 int i; 1752 int i;
1407 1753
1408 for (i = 0; argv[i]; i++) 1754 for (i = 0; argv[i]; i++)
… …
1417 const char *argv0, *shell; 1763 const char *argv0, *shell;
1418 1764
1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1765 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1420 shell = "/bin/sh"; 1766 shell = "/bin/sh";
1421 1767
1422 argv0 = (const char *)rxvt_r_basename (shell); 1768 argv0 = rxvt_basename (shell);
1423 1769
1424 if (option (Opt_loginShell)) 1770 if (option (Opt_loginShell))
1425 { 1771 {
1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1772 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1427 1773
1428 login[0] = '-'; 1774 login[0] = '-';
1429 strcpy (&login[1], argv0); 1775 strcpy (&login[1], argv0);
1430 argv0 = login; 1776 argv0 = login;
1431 } 1777 }
1432 1778
1433 execlp (shell, argv0, NULL); 1779 execlp (shell, argv0, (char *)0);
1434 /* no error message: STDERR is closed! */ 1780 /* no error message: STDERR is closed! */
1435 } 1781 }
1436 1782
1437 return -1; 1783 return -1;
1438} 1784}

Diff Legend

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