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.148 by root, Wed Jan 18 19:43:51 2006 UTC vs.
Revision 1.351 by root, Fri Dec 23 21:46:46 2022 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines