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

Diff Legend

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