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.144 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.346 by sf-exg, Tue Jun 21 12:03:56 2016 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 */ 563#endif
171#if TINTING 564#if BG_IMAGE_FROM_ROOT
172 NULL, 565 NULL,
173#endif 566#endif
174#if OFF_FOCUS_FADING 567#if OFF_FOCUS_FADING
175 "black", 568 "rgb:00/00/00",
176#endif 569#endif
177 }; 570 };
178 571
179const char *const xa_names[] = 572void
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 () 573rxvt_term::init_vars ()
220{ 574{
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; 575 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 576
234 MEvent.time = CurrentTime; 577 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 578 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 579 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 580 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 581 ncol = 80;
241 nrow = 24; 582 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 583 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 584 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 585 lineSpace = LINESPACE;
586 letterSpace = LETTERSPACE;
245 saveLines = SAVELINES; 587 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS;
247 588
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 589 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 590
252 oldcursor.row = oldcursor.col = -1; 591 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 592
259 last_bot = last_state = -1; 593 set_option (Opt_scrollBar);
260 594 set_option (Opt_scrollTtyOutput);
261 return true; 595 set_option (Opt_jumpScroll);
262} 596 set_option (Opt_skipScroll);
263 597 set_option (Opt_secondaryScreen);
264void 598 set_option (Opt_secondaryScroll);
265rxvt_term::init_secondary () 599 set_option (Opt_pastableTabs);
266{ 600 set_option (Opt_intensityStyles);
267 int i; 601 set_option (Opt_iso14755);
268 602 set_option (Opt_iso14755_52);
269 /* 603 set_option (Opt_buffered);
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} 604}
297 605
298/*----------------------------------------------------------------------*/ 606/*----------------------------------------------------------------------*/
299const char ** 607const char **
300rxvt_term::init_resources (int argc, const char *const *argv) 608rxvt_term::init_resources (int argc, const char *const *argv)
301{ 609{
302 int i, r_argc; 610 int i;
303 char *val;
304 const char **cmd_argv, **r_argv; 611 const char **cmd_argv;
305 612
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]); 613 rs[Rs_name] = rxvt_basename (argv[0]);
333 614
334 /* 615 /*
335 * Open display, get options/resources and create the window 616 * Open display, get options/resources and create the window
336 */ 617 */
337 618
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 619 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 620 rs[Rs_display_name] = ":0";
340 621
341 get_options (r_argc, r_argv); 622 cmd_argv = get_options (argc, argv);
342 623
343 if (!(display = displays.get (rs[Rs_display_name]))) 624 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 625 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 626
627 // using a local pointer decreases code size a lot
628 xa = display->xa;
629
630 set (display);
346 extract_resources (); 631 extract_resources ();
347 632
348 free (r_argv); 633#if ENABLE_FRILLS
634 if (rs[Rs_visual])
635 select_visual (strtol (rs[Rs_visual], 0, 0));
636 else if (rs[Rs_depth])
637 select_depth (strtol (rs[Rs_depth], 0, 0));
638#endif
639
640 for (int i = NUM_RESOURCES; i--; )
641 if (rs [i] == resval_undef)
642 rs [i] = 0;
643
644#if ENABLE_PERL
645 if (!rs[Rs_perl_ext_1])
646 rs[Rs_perl_ext_1] = "default";
647
648 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
649 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
650 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
651 {
652 rxvt_perl.init (this);
653 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
654 }
655#endif
656
657 // must be called after initialising the perl interpreter as it
658 // may invoke the `on_register_command' hook
659 extract_keysym_resources ();
349 660
350 /* 661 /*
351 * set any defaults not already set 662 * set any defaults not already set
352 */ 663 */
353 if (cmd_argv && cmd_argv[0]) 664 if (cmd_argv && cmd_argv[0])
354 { 665 {
355 if (!rs[Rs_title]) 666 if (!rs[Rs_title])
356 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 667 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
668
357 if (!rs[Rs_iconName]) 669 if (!rs[Rs_iconName])
358 rs[Rs_iconName] = rs[Rs_title]; 670 rs[Rs_iconName] = rs[Rs_title];
359 } 671 }
360 else 672 else
361 { 673 {
362 if (!rs[Rs_title]) 674 if (!rs[Rs_title])
363 rs[Rs_title] = rs[Rs_name]; 675 rs[Rs_title] = rs[Rs_name];
676
364 if (!rs[Rs_iconName]) 677 if (!rs[Rs_iconName])
365 rs[Rs_iconName] = rs[Rs_name]; 678 rs[Rs_iconName] = rs[Rs_name];
366 } 679 }
367 680
368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 681 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
375 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 688 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
376 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 689 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
377 690
378 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 691 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
379 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 692 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
693
694 if (rs[Rs_letterSpace])
695 letterSpace = atoi (rs[Rs_letterSpace]);
380#endif 696#endif
381 697
382#ifdef POINTER_BLANK 698#ifdef POINTER_BLANK
383 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 699 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
384 pointerBlankDelay = i; 700 pointerBlankDelay = i;
385 else 701 else
386 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
387#endif 703#endif
388 704
705 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
706 multiClickTime = i;
707 else
708 multiClickTime = 500;
709
710 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
711
389 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
390 if (!saveLines) 713 if (!saveLines)
391 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
392 715
393#ifdef PRINTPIPE
394 if (!rs[Rs_print_pipe])
395 rs[Rs_print_pipe] = PRINTPIPE;
396#endif
397
398 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
399 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
400 718
401#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
402 if (!rs[Rs_backspace_key]) 720 if (!rs[Rs_backspace_key])
403# ifdef DEFAULT_BACKSPACE 721# ifdef DEFAULT_BACKSPACE
404 key_backspace = DEFAULT_BACKSPACE; 722 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
405# else 723# else
406 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 724 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
407# endif 725# 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 726#endif
416 727
417#ifndef NO_DELETE_KEY 728#ifndef NO_DELETE_KEY
418 if (!rs[Rs_delete_key]) 729 if (!rs[Rs_delete_key])
419# ifdef DEFAULT_DELETE 730# ifdef DEFAULT_DELETE
420 key_delete = DEFAULT_DELETE; 731 rs[Rs_delete_key] = DEFAULT_DELETE;
421# else 732# else
422 key_delete = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
423# endif 734# 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 735#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 736
438#ifdef HAVE_SCROLLBARS 737 scrollBar.setup (this);
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif
441 738
442#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 741 if (option (Opt_reverseVideo))
445 { 742 {
446 if (!rs[Rs_color + Color_fg]) 743 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 744 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
745
448 if (!rs[Rs_color + Color_bg]) 746 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 747 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 748 }
451#endif 749#endif
452 750
… …
454 if (!rs[Rs_color + i]) 752 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 753 rs[Rs_color + i] = def_colorName[i];
456 754
457#ifndef XTERM_REVERSE_VIDEO 755#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 756 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 757 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 758 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 759#endif
462 760
463 /* convenient aliases for setting fg/bg to colors */ 761 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 762 color_aliases (Color_fg);
465 color_aliases (Color_bg); 763 color_aliases (Color_bg);
466#ifndef NO_CURSORCOLOR 764#ifndef NO_CURSORCOLOR
467 color_aliases (Color_cursor); 765 color_aliases (Color_cursor);
468 color_aliases (Color_cursor2); 766 color_aliases (Color_cursor2);
469#endif /* NO_CURSORCOLOR */ 767#endif /* NO_CURSORCOLOR */
470 color_aliases (Color_pointer_fg); 768 color_aliases (Color_pointer_fg);
471 color_aliases (Color_pointer_bg); 769 color_aliases (Color_pointer_bg);
472 color_aliases (Color_border); 770 color_aliases (Color_border);
473#ifndef NO_BOLD_UNDERLINE_REVERSE 771#ifndef NO_BOLD_UNDERLINE_REVERSE
474 color_aliases (Color_BD); 772 color_aliases (Color_BD);
475 color_aliases (Color_UL); 773 color_aliases (Color_UL);
476 color_aliases (Color_RV); 774 color_aliases (Color_RV);
477#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 775#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
478 776
479 if (!rs[Rs_color + Color_border]) 777 if (!rs[Rs_color + Color_border])
480 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 778 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
481 779
482 return cmd_argv; 780 return cmd_argv;
781}
782
783/*----------------------------------------------------------------------*/
784void
785rxvt_term::init (stringvec *argv, stringvec *envv)
786{
787 argv->push_back (0);
788 envv->push_back (0);
789
790 this->argv = argv;
791 this->envv = envv;
792
793 env = new char *[this->envv->size ()];
794 for (int i = 0; i < this->envv->size (); i++)
795 env[i] = this->envv->at (i);
796
797 init2 (argv->size () - 1, argv->begin ());
798}
799
800void
801rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
802{
803#if ENABLE_PERL
804 // perl might want to access the stringvecs later, so we need to copy them
805 stringvec *args = new stringvec;
806 for (int i = 0; i < argc; i++)
807 args->push_back (strdup (argv [i]));
808
809 stringvec *envs = new stringvec;
810 for (const char *const *var = envv; *var; var++)
811 envs->push_back (strdup (*var));
812
813 init (args, envs);
814#else
815 init2 (argc, argv);
816#endif
817}
818
819void
820rxvt_term::init2 (int argc, const char *const *argv)
821{
822 SET_R (this);
823 set_locale ("");
824 set_environ (env); // a few things in X do not call setlocale :(
825
826 init_vars ();
827
828 const char **cmd_argv = init_resources (argc, argv);
829
830#ifdef KEYSYM_RESOURCE
831 keyboard->register_done ();
832#endif
833
834 if (const char *path = rs[Rs_chdir])
835 if (*path) // ignored if empty
836 {
837 if (*path != '/')
838 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
839
840 if (chdir (path))
841 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
842 }
843
844 if (option (Opt_scrollBar))
845 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
846
847 pty = ptytty::create ();
848
849 create_windows (argc, argv);
850
851 init_xlocale ();
852
853 scr_poweron (); // initialize screen
854
855#if 0
856 XSynchronize (dpy, True);
857#endif
858
859 if (option (Opt_scrollBar))
860 scrollBar.resize (); /* create and map scrollbar */
861
862#ifdef HAVE_BG_PIXMAP
863 bg_init ();
864#endif
865
866#if ENABLE_PERL
867 rootwin_ev.start (display, display->root);
868#endif
869
870 init_done = 1;
871
872 init_command (cmd_argv);
873
874 if (pty->pty >= 0)
875 pty_ev.start (pty->pty, ev::READ);
876
877 HOOK_INVOKE ((this, HOOK_START, DT_END));
878
879#if ENABLE_XEMBED
880 if (rs[Rs_embed])
881 {
882 long info[2] = { 0, XEMBED_MAPPED };
883
884 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
885 32, PropModeReplace, (unsigned char *)&info, 2);
886 }
887#endif
888
889#if HAVE_STARTUP_NOTIFICATION
890 SnDisplay *snDisplay;
891 SnLauncheeContext *snContext;
892
893 snDisplay = sn_display_new (dpy, NULL, NULL);
894 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
895
896 /* Tell the window manager that this window is part of the startup context */
897 if (snContext)
898 sn_launchee_context_setup_window (snContext, parent);
899#endif
900
901 XMapWindow (dpy, vt);
902 XMapWindow (dpy, parent);
903
904#if HAVE_STARTUP_NOTIFICATION
905 if (snContext)
906 {
907 /* Mark the startup process as complete */
908 sn_launchee_context_complete (snContext);
909
910 sn_launchee_context_unref (snContext);
911 }
912
913 sn_display_unref (snDisplay);
914#endif
915
916 refresh_check ();
483} 917}
484 918
485/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
486void 920void
487rxvt_term::init_env () 921rxvt_term::init_env ()
488{ 922{
489 int i;
490 unsigned int u;
491 char *val; 923 char *val;
924 char *env_display;
925 char *env_windowid;
926 char *env_colorfgbg;
927 char *env_term;
492 928
493#ifdef DISPLAY_IS_IP 929#ifdef DISPLAY_IS_IP
494 /* Fixup display_name for export over pty to any interested terminal 930 /* 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 931 * 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 932 * (for the first non-loopback interface) that we get from
… …
503 */ 939 */
504 val = rxvt_network_display (rs[Rs_display_name]); 940 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 941 rs[Rs_display_name] = (const char *)val;
506 942
507 if (val == NULL) 943 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 944#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 945 val = XDisplayString (dpy);
510 946
511 if (rs[Rs_display_name] == NULL) 947 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 948 rs[Rs_display_name] = val; /* use broken `:0' value */
513 949
514 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 950 env_display = (char *)rxvt_malloc (strlen (val) + 9);
516 951
517 sprintf (env_display, "DISPLAY=%s", val); 952 sprintf (env_display, "DISPLAY=%s", val);
518 953
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)); 954 env_windowid = (char *)rxvt_malloc (21);
525
526 sprintf (env_windowid, "WINDOWID=%u", 955 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
527 (unsigned int)parent[0]);
528 956
529 /* add entries to the environment: 957 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 958 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 959 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 960 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 962 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 963 * @ COLORFGBG: fg;bg color codes
536 */ 964 */
537 putenv (env_display); 965 putenv (env_display);
538 putenv (env_windowid); 966 putenv (env_windowid);
539 if (env_colorfgbg) 967
968 env_colorfgbg = get_colorfgbg ();
540 putenv (env_colorfgbg); 969 putenv (env_colorfgbg);
541 970
542#ifdef RXVT_TERMINFO 971#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 972 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 973#endif
545 974
546 if (display->depth <= 2) 975 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 976 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 977 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 978 putenv ("COLORTERM=" COLORTERMENVFULL);
550 979
551 if (rs[Rs_term_name] != NULL) 980 if (rs[Rs_term_name] != NULL)
552 { 981 {
553 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 982 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
554 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 983 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
555 putenv (env_term); 984 putenv (env_term);
556 } 985 }
557 else 986 else
558 putenv ("TERM=" TERMENV); 987 putenv ("TERM=" TERMENV);
… …
560#ifdef HAVE_UNSETENV 989#ifdef HAVE_UNSETENV
561 /* avoid passing old settings and confusing term size */ 990 /* avoid passing old settings and confusing term size */
562 unsetenv ("LINES"); 991 unsetenv ("LINES");
563 unsetenv ("COLUMNS"); 992 unsetenv ("COLUMNS");
564 unsetenv ("TERMCAP"); /* terminfo should be okay */ 993 unsetenv ("TERMCAP"); /* terminfo should be okay */
565#endif /* HAVE_UNSETENV */ 994#endif /* HAVE_UNSETENV */
566} 995}
567 996
568/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
569/*
570 * This is more or less stolen straight from XFree86 xterm.
571 * This should support all European type languages.
572 */
573void 998void
574rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
575{ 1000{
576 set_environ (envv); 1001 set_environ (env);
577 1002
578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
579 free (this->locale); 1003 free (this->locale);
580 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
581 1005
582 if (!this->locale) 1006 if (!this->locale)
583 { 1007 {
… …
591 1015
592 this->locale = "C"; 1016 this->locale = "C";
593 } 1017 }
594 1018
595 1019
596 this->locale = rxvt_strdup (this->locale); 1020 this->locale = strdup (this->locale);
597 SET_LOCALE (this->locale); 1021 SET_LOCALE (this->locale);
598 mbstate.reset (); 1022 mbstate.reset ();
599#endif
600 1023
601#if HAVE_NL_LANGINFO 1024#if HAVE_NL_LANGINFO
602 char *codeset = strdup (nl_langinfo (CODESET)); 1025 char *codeset = nl_langinfo (CODESET);
603 // /^UTF.?8/i 1026 // /^UTF.?8/i
604 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1027 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
605 && (codeset[1] == 'T' || codeset[1] == 't') 1028 && (codeset[1] == 'T' || codeset[1] == 't')
606 && (codeset[2] == 'F' || codeset[2] == 'f') 1029 && (codeset[2] == 'F' || codeset[2] == 'f')
607 && (codeset[3] == '8' || codeset[4] == '8'); 1030 && (codeset[3] == '8' || codeset[4] == '8');
608 free (codeset);
609#else 1031#else
610 enc_utf8 = 0; 1032 enc_utf8 = 0;
611#endif 1033#endif
612} 1034}
613 1035
614void 1036void
615rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
616{ 1038{
617 set_environ (envv); 1039 set_environ (env);
618 1040
619#ifdef USE_XIM 1041#if USE_XIM
620 if (!locale) 1042 if (!locale)
621 rxvt_warn ("setting locale failed, working without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
622 else 1044 else
623 { 1045 {
624 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1046 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
625 1047
626 if (!XSupportsLocale ()) 1048 if (!XSupportsLocale ())
627 { 1049 {
628 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1050 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
629 return; 1051 return;
630 } 1052 }
631 1053
632 im_ev.start (display); 1054 im_ev.start (display);
633 1055
… …
645 * Initialize the command connection. 1067 * Initialize the command connection.
646 * This should be called after the X server connection is established. 1068 * This should be called after the X server connection is established.
647 */ 1069 */
648 1070
649#ifdef META8_OPTION 1071#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1072 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 1073#endif
652 1074
653 get_ourmods (); 1075 get_ourmods ();
654 1076
655 if (!OPTION (Opt_scrollTtyOutput)) 1077 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 1078 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 1079 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 1080 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 1081 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 1082 priv_modes |= PrivMode_smoothScroll;
661 1083
662#ifndef NO_BACKSPACE_KEY 1084#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 1085 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 1086 priv_modes |= PrivMode_HaveBackSpace;
665#endif 1087#endif
666 1088
667 /* add value for scrollBar */ 1089 /* add value for scrollBar */
668 if (scrollBar.state) 1090 if (scrollBar.state)
… …
674 run_command (argv); 1096 run_command (argv);
675} 1097}
676 1098
677/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
678void 1100void
679rxvt_term::Get_Colours () 1101rxvt_term::get_colors ()
680{ 1102{
681 int i; 1103 int i;
682 1104
683#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
685#endif 1107#endif
686
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
688 {
689 rxvt_color xcol;
690 1108
691 if (!rs[Rs_color + i]) 1109 for (i = 0; i < NRS_COLORS; i++)
692 continue; 1110 if (const char *name = rs[Rs_color + i])
693 1111 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 1112
748 /* 1113 /*
749 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
750 * 1115 *
751 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 1117 * from the fvwm window manager.
753 */ 1118 */
754#ifdef KEEP_SCROLLCOLOR 1119#ifdef RXVT_SCROLLBAR
1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
755 1121
756 if (display->depth <= 2) 1122 rgba cscroll;
757 { 1123 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 1124
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 */ 1125 /* topShadowColor */
781 if (!xcol[1].set (display, 1126 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1127 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1128 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1129 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 1130 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1131 cscroll.a)
1132 ))
1133 alias_color (Color_topShadow, Color_White);
1134#endif
786 1135
787 pix_colors[Color_topShadow] = xcol[1]; 1136#ifdef OFF_FOCUS_FADING
788 } 1137 for (i = 0; i < NRS_COLORS; i++)
789#endif /* KEEP_SCROLLCOLOR */ 1138 update_fade_color (i, true);
1139#endif
790} 1140}
791 1141
792/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
794void 1144void
795rxvt_term::color_aliases (int idx) 1145rxvt_term::color_aliases (int idx)
796{ 1146{
797 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1147 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
798 { 1148 {
799 int i = atoi (rs[Rs_color + idx]); 1149 int i = atoi (rs[Rs_color + idx]);
800 1150
801 if (i >= 8 && i <= 15) 1151 if (i >= 8 && i <= 15)
802 { /* bright colors */ 1152 /* bright colors */
803 i -= 8;
804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1153 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
805 return; 1154 else if (i >= 0 && i <= 7)
806 } 1155 /* normal colors */
807
808 if (i >= 0 && i <= 7) /* normal colors */
809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1156 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
810 } 1157 }
811} 1158}
812 1159
813/*----------------------------------------------------------------------*/ 1160/*----------------------------------------------------------------------*/
… …
833 1180
834 if (rsmod 1181 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1182 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 1183 requestedmeta = rsmod[3] - '0';
837 1184
838 map = XGetModifierMapping (display->display); 1185 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 1186 kc = map->modifiermap;
840 1187
841 for (i = 1; i < 6; i++) 1188 for (i = 1; i < 6; i++)
842 { 1189 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1190 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
846 { 1193 {
847 if (kc[k] == 0) 1194 if (kc[k] == 0)
848 break; 1195 break;
849 1196
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
851 { 1198 {
852 case XK_Num_Lock: 1199 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
854 continue; 1201 continue;
855 1202
… …
897 1244
898 if (i) 1245 if (i)
899 ModMetaMask = modmasks[i - 1]; 1246 ModMetaMask = modmasks[i - 1];
900} 1247}
901 1248
1249void
1250rxvt_term::set_icon (const char *file)
1251{
1252#if HAVE_PIXBUF && ENABLE_EWMH
1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1254 if (!pixbuf)
1255 {
1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1257 return;
1258 }
1259
1260 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1261 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1262
1263 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1264 {
1265 rxvt_warn ("Icon image too big, continuing without.\n");
1266 g_object_unref (pixbuf);
1267 return;
1268 }
1269
1270 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1271 {
1272 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1273 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1274 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1275
1276 buffer [0] = w;
1277 buffer [1] = h;
1278 for (int i = 0; i < h; i++)
1279 {
1280 for (int j = 0; j < w; j++)
1281 {
1282 unsigned char *pixel = row + j * channels;
1283 long value;
1284
1285 if (channels == 4)
1286 value = pixel[3];
1287 else
1288 value = (unsigned char)0x00ff;
1289
1290 value = (value << 8) + pixel[0];
1291 value = (value << 8) + pixel[1];
1292 value = (value << 8) + pixel[2];
1293 buffer[(i * w + j) + 2] = value;
1294 }
1295
1296 row += rowstride;
1297 }
1298
1299 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1300 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1301 free (buffer);
1302 }
1303 else
1304 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1305
1306 g_object_unref (pixbuf);
1307#endif
1308}
1309
902/*----------------------------------------------------------------------*/ 1310/*----------------------------------------------------------------------*/
903/* rxvt_Create_Windows () - Open and map the window */ 1311/* Open and map the window */
904void 1312void
905rxvt_term::create_windows (int argc, const char *const *argv) 1313rxvt_term::create_windows (int argc, const char *const *argv)
906{ 1314{
907 XClassHint classHint; 1315 XClassHint classHint;
908 XWMHints wmHint; 1316 XWMHints wmHint;
909#if ENABLE_FRILLS 1317#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 1318 MWMHints mwmhints = { };
912#endif 1319#endif
913 XGCValues gcvalue; 1320 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 1321 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 1322 Window top, parent;
917 dDisp;
918 1323
919#ifdef USING_W11LIB 1324 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923 1325
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1326 /* grab colors before netscape does */
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 1327 get_colors ();
926 1328
927 if (OPTION (Opt_transparent)) 1329 if (!set_fonts ())
928 { 1330 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 1331
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1332 parent = display->root;
931 } 1333
1334 attributes.override_redirect = !!option (Opt_override_redirect);
932 1335
933#if ENABLE_FRILLS 1336#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 1337 if (option (Opt_borderLess))
935 { 1338 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 1339 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
937
938 if (prop == None)
939 { 1340 {
940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1341 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
941#ifdef PREFER_24BIT
942 attributes.override_redirect = TRUE; 1342 attributes.override_redirect = true;
943#endif
944 mwmhints.flags = 0;
945 } 1343 }
946 else 1344 else
947 { 1345 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 1346 mwmhints.flags = MWM_HINTS_DECORATIONS;
949 mwmhints.decorations = 0;
950 } 1347 }
951 } 1348 }
952 else
953 mwmhints.flags = 0;
954#endif 1349#endif
955
956 /* grab colors before netscape does */
957 Get_Colours ();
958
959 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962 parent = DefaultRootWindow (disp);
963 1350
964#if ENABLE_XEMBED 1351#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 1352 if (rs[Rs_embed])
966 { 1353 {
967 XWindowAttributes wattr; 1354 XWindowAttributes wattr;
968 1355
969 parent = strtol (rs[Rs_embed], 0, 0); 1356 parent = strtol (rs[Rs_embed], 0, 0);
970 1357
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 1358 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1359 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 1360
974 window_calc (wattr.width, wattr.height); 1361 window_calc (wattr.width, wattr.height);
975 } 1362 }
976#endif 1363#endif
977 1364
978 window_calc (0, 0); 1365 window_calc (0, 0);
979 1366
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 1367 /* sub-window placement & size in rxvt_term::resize_all_windows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 1368 attributes.background_pixel = pix_colors_focused [Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 1369 attributes.border_pixel = pix_colors_focused [Color_border];
984 attributes.colormap = display->cmap; 1370 attributes.colormap = cmap;
1371
985 top = XCreateWindow (disp, parent, 1372 top = XCreateWindow (dpy, parent,
986 szHint.x, szHint.y, 1373 szHint.x, szHint.y,
987 szHint.width, szHint.height, 1374 szHint.width, szHint.height,
988 ext_bwidth, 1375 ext_bwidth,
989 display->depth, InputOutput, 1376 depth, InputOutput, visual,
990 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1377 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 1378 &attributes);
993 top = XCreateSimpleWindow (disp, parent,
994 szHint.x, szHint.y,
995 szHint.width, szHint.height,
996 ext_bwidth,
997 pix_colors_focused[Color_border],
998 pix_colors_focused[Color_border]);
999#endif
1000 1379
1001 this->parent[0] = top; 1380 this->parent = top;
1002 1381
1003 old_width = szHint.width; 1382 set_title (rs [Rs_title]);
1004 old_height = szHint.height; 1383 set_icon_name (rs [Rs_iconName]);
1005 1384
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008
1009 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1011 1387
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 1389 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1015 wmHint.window_group = top; 1393 wmHint.window_group = top;
1016 1394
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1018 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1397#if ENABLE_EWMH
1398 /*
1399 * set up icon hint
1400 * rs [Rs_iconfile] is path to icon
1401 */
1402
1403 if (rs [Rs_iconfile])
1404 set_icon (rs [Rs_iconfile]);
1405#endif
1406
1407#if ENABLE_FRILLS
1408 if (mwmhints.flags)
1409 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1410 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1411#endif
1019 1412
1020 Atom protocols[] = { 1413 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 1414 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 1415#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 1416 xa[XA_NET_WM_PING],
1024#endif 1417#endif
1025 }; 1418 };
1026 1419
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1420 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1028 1421
1029#if ENABLE_FRILLS 1422#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for]) 1423 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1424 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif 1425#endif
1033 1426
1034#if ENABLE_EWMH 1427#if ENABLE_EWMH
1035 long pid = getpid (); 1428 long pid = getpid ();
1036 1429
1037 XChangeProperty (disp, top, 1430 XChangeProperty (dpy, top,
1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1431 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039 PropModeReplace, (unsigned char *)&pid, 1); 1432 PropModeReplace, (unsigned char *)&pid, 1);
1040 1433
1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1434 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif 1435#endif
1043 1436
1044 XSelectInput (disp, top, 1437 XSelectInput (dpy, top,
1045 KeyPressMask 1438 KeyPressMask
1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1439#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1047 | KeyReleaseMask 1440 | KeyReleaseMask
1048#endif 1441#endif
1049 | FocusChangeMask | VisibilityChangeMask 1442 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1051 1444
1052 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1053 1446
1054#if ENABLE_FRILLS
1055 if (mwmhints.flags)
1056 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058#endif
1059
1060 /* vt cursor: Black-on-White is standard, but this is more popular */ 1447 /* vt cursor: Black-on-White is standard, but this is more popular */
1448 unsigned int shape = XC_xterm;
1449
1450#ifdef HAVE_XMU
1451 if (rs[Rs_pointerShape])
1452 {
1453 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1454 if (stmp >= 0)
1455 shape = stmp;
1456 }
1457#endif
1458
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1062
1063#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1066#endif
1067 1460
1068 /* the vt window */ 1461 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1070 window_vt_x,
1071 window_vt_y, 1463 window_vt_x, window_vt_y,
1072 width,
1073 height, 1464 vt_width, vt_height,
1074 0, 1465 0,
1075 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1468
1081 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1470 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1083 1471
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1472 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1085 1473
1086 if (OPTION (Opt_pointerBlank)) 1474 if (option (Opt_pointerBlank))
1087 vt_emask |= PointerMotionMask; 1475 vt_emask |= PointerMotionMask;
1088 else 1476 else
1089 vt_emask |= Button1MotionMask | Button3MotionMask; 1477 vt_emask |= Button1MotionMask | Button3MotionMask;
1090 1478
1091 vt_select_input (); 1479 vt_select_input ();
1092 1480
1093 vt_ev.start (display, vt); 1481 vt_ev.start (display, vt);
1094 1482
1095#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! OPTION (Opt_transparent))
1098 {
1099 const char *p = rs[Rs_backgroundPixmap];
1100
1101 if ((p = strchr (p, ';')) != NULL)
1102 {
1103 p++;
1104 scale_pixmap (p);
1105 }
1106
1107 set_bgPixmap (rs[Rs_backgroundPixmap]);
1108 scr_touch (true);
1109 }
1110#endif
1111
1112 /* graphics context for the vt window */ 1483 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1484 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1485 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1486 gcvalue.graphics_exposures = 0;
1487
1116 gc = XCreateGC (disp, vt, 1488 gc = XCreateGC (dpy, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1489 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1490 &gcvalue);
1119 1491
1120 drawable = new rxvt_drawable (display, vt); 1492 drawable = new rxvt_drawable (this, vt);
1121
1122#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129#endif
1130 1493
1131#ifdef OFF_FOCUS_FADING 1494#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1495 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1135#endif 1498#endif
1136 1499
1137 pointer_unblank (); 1500 pointer_unblank ();
1138 scr_recolour (); 1501 scr_recolor ();
1139
1140#if ENABLE_XEMBED
1141 if (rs[Rs_embed])
1142 {
1143 long info[2] = { 0, XEMBED_MAPPED };
1144
1145 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146 32, PropModeReplace, (unsigned char *)&info, 2);
1147 }
1148#endif
1149}
1150
1151/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */
1154void
1155rxvt_get_ttymode (ttymode_t *tio, int erase)
1156{
1157#ifdef HAVE_TERMIOS_H
1158 /*
1159 * standard System V termios interface
1160 */
1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1162 {
1163 // return error - use system defaults,
1164 // where possible, and zero elsewhere
1165 memset (tio, 0, sizeof (ttymode_t));
1166
1167 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE;
1170#ifdef VERASE2
1171 tio->c_cc[VERASE2] = CERASE2;
1172#endif
1173 tio->c_cc[VKILL] = CKILL;
1174 tio->c_cc[VSTART] = CSTART;
1175 tio->c_cc[VSTOP] = CSTOP;
1176 tio->c_cc[VSUSP] = CSUSP;
1177# ifdef VDSUSP
1178 tio->c_cc[VDSUSP] = CDSUSP;
1179# endif
1180# ifdef VREPRINT
1181 tio->c_cc[VREPRINT] = CRPRNT;
1182# endif
1183# ifdef VDISCRD
1184 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif
1186# ifdef VWERSE
1187 tio->c_cc[VWERSE] = CWERASE;
1188# endif
1189# ifdef VLNEXT
1190 tio->c_cc[VLNEXT] = CLNEXT;
1191# endif
1192 }
1193
1194 tio->c_cc[VEOF] = CEOF;
1195 tio->c_cc[VEOL] = VDISABLE;
1196# ifdef VEOL2
1197 tio->c_cc[VEOL2] = VDISABLE;
1198# endif
1199# ifdef VSWTC
1200 tio->c_cc[VSWTC] = VDISABLE;
1201# endif
1202# ifdef VSWTCH
1203 tio->c_cc[VSWTCH] = VDISABLE;
1204# endif
1205# if VMIN != VEOF
1206 tio->c_cc[VMIN] = 1;
1207# endif
1208# if VTIME != VEOL
1209 tio->c_cc[VTIME] = 0;
1210# endif
1211
1212 if (erase != -1)
1213 tio->c_cc[VERASE] = (char)erase;
1214
1215 /* input modes */
1216 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1217# ifdef IMAXBEL
1218 | IMAXBEL
1219# endif
1220 | IXON);
1221
1222 /* output modes */
1223 tio->c_oflag = (OPOST | ONLCR);
1224
1225 /* control modes */
1226 tio->c_cflag = (CS8 | CREAD);
1227
1228 /* line discipline modes */
1229 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1230# if defined (ECHOCTL) && defined (ECHOKE)
1231 | ECHOCTL | ECHOKE
1232# endif
1233 | ECHOE | ECHOK);
1234# else /* HAVE_TERMIOS_H */
1235
1236 /*
1237 * sgtty interface
1238 */
1239
1240 /* get parameters -- gtty */
1241 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1242 {
1243 tio->sg.sg_erase = CERASE; /* ^H */
1244 tio->sg.sg_kill = CKILL; /* ^U */
1245 }
1246
1247 if (erase != -1)
1248 tio->sg.sg_erase = (char)erase;
1249
1250 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1251
1252 /* get special characters */
1253 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1254 {
1255 tio->tc.t_intrc = CINTR; /* ^C */
1256 tio->tc.t_quitc = CQUIT; /* ^\ */
1257 tio->tc.t_startc = CSTART; /* ^Q */
1258 tio->tc.t_stopc = CSTOP; /* ^S */
1259 tio->tc.t_eofc = CEOF; /* ^D */
1260 tio->tc.t_brkc = -1;
1261 }
1262
1263 /* get local special chars */
1264 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1265 {
1266 tio->lc.t_suspc = CSUSP; /* ^Z */
1267 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1268 tio->lc.t_rprntc = CRPRNT; /* ^R */
1269 tio->lc.t_flushc = CFLUSH; /* ^O */
1270 tio->lc.t_werasc = CWERASE; /* ^W */
1271 tio->lc.t_lnextc = CLNEXT; /* ^V */
1272 }
1273 /* get line discipline */
1274 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1275# ifdef NTTYDISC
1276 tio->line = NTTYDISC;
1277# endif /* NTTYDISC */
1278
1279 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1280#endif /* HAVE_TERMIOS_H */
1281
1282 /*
1283 * Debugging
1284 */
1285#ifdef DEBUG_TTYMODE
1286#ifdef HAVE_TERMIOS_H
1287 /* c_iflag bits */
1288 fprintf (stderr, "Input flags\n");
1289
1290 /* cpp token stringize doesn't work on all machines <sigh> */
1291# define FOO(flag,name) \
1292 if ((tio->c_iflag) & flag) \
1293 fprintf (stderr, "%s ", name)
1294
1295 /* c_iflag bits */
1296 FOO (IGNBRK, "IGNBRK");
1297 FOO (BRKINT, "BRKINT");
1298 FOO (IGNPAR, "IGNPAR");
1299 FOO (PARMRK, "PARMRK");
1300 FOO (INPCK, "INPCK");
1301 FOO (ISTRIP, "ISTRIP");
1302 FOO (INLCR, "INLCR");
1303 FOO (IGNCR, "IGNCR");
1304 FOO (ICRNL, "ICRNL");
1305 FOO (IXON, "IXON");
1306 FOO (IXOFF, "IXOFF");
1307# ifdef IUCLC
1308 FOO (IUCLC, "IUCLC");
1309# endif
1310# ifdef IXANY
1311 FOO (IXANY, "IXANY");
1312# endif
1313# ifdef IMAXBEL
1314 FOO (IMAXBEL, "IMAXBEL");
1315# endif
1316
1317 fprintf (stderr, "\n");
1318
1319# undef FOO
1320# define FOO(entry, name) \
1321 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1322
1323 FOO (VINTR, "VINTR");
1324 FOO (VQUIT, "VQUIT");
1325 FOO (VERASE, "VERASE");
1326 FOO (VKILL, "VKILL");
1327 FOO (VEOF, "VEOF");
1328 FOO (VEOL, "VEOL");
1329# ifdef VEOL2
1330 FOO (VEOL2, "VEOL2");
1331# endif
1332# ifdef VSWTC
1333 FOO (VSWTC, "VSWTC");
1334# endif
1335# ifdef VSWTCH
1336 FOO (VSWTCH, "VSWTCH");
1337# endif
1338 FOO (VSTART, "VSTART");
1339 FOO (VSTOP, "VSTOP");
1340 FOO (VSUSP, "VSUSP");
1341# ifdef VDSUSP
1342 FOO (VDSUSP, "VDSUSP");
1343# endif
1344# ifdef VREPRINT
1345 FOO (VREPRINT, "VREPRINT");
1346# endif
1347# ifdef VDISCRD
1348 FOO (VDISCRD, "VDISCRD");
1349# endif
1350# ifdef VWERSE
1351 FOO (VWERSE, "VWERSE");
1352# endif
1353# ifdef VLNEXT
1354 FOO (VLNEXT, "VLNEXT");
1355# endif
1356
1357 fprintf (stderr, "\n");
1358# undef FOO
1359# endif /* HAVE_TERMIOS_H */
1360#endif /* DEBUG_TTYMODE */
1361} 1502}
1362 1503
1363/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1364/* 1505/*
1365 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the
… …
1370rxvt_term::run_command (const char *const *argv) 1511rxvt_term::run_command (const char *const *argv)
1371{ 1512{
1372#if ENABLE_FRILLS 1513#if ENABLE_FRILLS
1373 if (rs[Rs_pty_fd]) 1514 if (rs[Rs_pty_fd])
1374 { 1515 {
1375 pty.pty = atoi (rs[Rs_pty_fd]); 1516 pty->pty = atoi (rs[Rs_pty_fd]);
1376 1517
1377 if (pty.pty >= 0) 1518 if (pty->pty >= 0)
1378 { 1519 {
1379 if (getfd_hook) 1520 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1381 1522
1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 } 1525 }
1385 } 1526 }
1386 else 1527 else
1387#endif 1528#endif
1388 if (!pty.get ()) 1529 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1531
1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1533
1534 struct termios tio = def_tio;
1535
1536#ifndef NO_BACKSPACE_KEY
1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1538 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1539 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1540 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1541#endif
1542
1543 /* init terminal attributes */
1544 cfsetospeed (&tio, BAUDRATE);
1545 cfsetispeed (&tio, BAUDRATE);
1546 tcsetattr (pty->tty, TCSANOW, &tio);
1391 pty.set_utf8_mode (enc_utf8); 1547 pty->set_utf8_mode (enc_utf8);
1392 1548
1393 /* set initial window size */ 1549 /* set initial window size */
1394 tt_winch (); 1550 tt_winch ();
1395
1396 int er;
1397
1398#ifndef NO_BACKSPACE_KEY
1399 if (key_backspace[0] && !key_backspace[1])
1400 er = key_backspace[0];
1401 else if (strcmp (key_backspace, "DEC") == 0)
1402 er = '\177'; /* the initial state anyway */
1403 else
1404#endif
1405 er = -1;
1406
1407 rxvt_get_ttymode (&tio, er);
1408 1551
1409#if ENABLE_FRILLS 1552#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1553 if (rs[Rs_pty_fd])
1411 return; 1554 return;
1412#endif 1555#endif
… …
1420 rxvt_fatal ("can't fork, aborting.\n"); 1563 rxvt_fatal ("can't fork, aborting.\n");
1421 } 1564 }
1422 case 0: 1565 case 0:
1423 init_env (); 1566 init_env ();
1424 1567
1425 if (!pty.make_controlling_tty ()) 1568 if (!pty->make_controlling_tty ())
1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1569 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1427 else 1570 else
1428 { 1571 {
1429 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1572 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1430 dup2 (pty.tty, STDIN_FILENO); 1573 dup2 (pty->tty, STDIN_FILENO);
1431 dup2 (pty.tty, STDOUT_FILENO); 1574 dup2 (pty->tty, STDOUT_FILENO);
1432 dup2 (pty.tty, STDERR_FILENO); 1575 dup2 (pty->tty, STDERR_FILENO);
1433 1576
1434 // close all our file handles that we do no longer need 1577 // close all our file handles that we do no longer need
1435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1578 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1436 { 1579 {
1437 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1580 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1438 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1581 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1439 } 1582 }
1440 1583
1441 run_child (argv); 1584 run_child (argv);
1442 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1585 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1443 } 1586 }
1444 1587
1445 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1446 1589
1447 default: 1590 default:
1591 if (!option (Opt_utmpInhibit))
1448 { 1592 {
1449#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1593#ifdef LOG_ONLY_ON_LOGIN
1450 int fdstdin; 1594 bool login_shell = option (Opt_loginShell);
1451 1595#else
1452 fdstdin = dup (STDIN_FILENO); 1596 bool login_shell = true;
1453 dup2 (pty.tty, STDIN_FILENO);
1454#endif 1597#endif
1455 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1456#ifdef UTMP_SUPPORT
1457 privileged_utmp (SAVE);
1458#endif
1459
1460#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1461
1462 dup2 (fdstdin, STDIN_FILENO);
1463 close (fdstdin);
1464#endif
1465 } 1599 }
1466 1600
1467 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1601 pty->close_tty ();
1602
1603 child_ev.start (cmd_pid);
1604
1605 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1468 break; 1606 break;
1469 } 1607 }
1470} 1608}
1471 1609
1472/* ------------------------------------------------------------------------- * 1610/* ------------------------------------------------------------------------- *
… …
1479int 1617int
1480rxvt_term::run_child (const char *const *argv) 1618rxvt_term::run_child (const char *const *argv)
1481{ 1619{
1482 char *login; 1620 char *login;
1483 1621
1484 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1485
1486 if (OPTION (Opt_console)) 1622 if (option (Opt_console))
1623 {
1487 { /* be virtual console, fail silently */ 1624 /* be virtual console, fail silently */
1488#ifdef TIOCCONS 1625#ifdef TIOCCONS
1489 unsigned int on = 1; 1626 unsigned int on = 1;
1490 1627
1491 ioctl (STDIN_FILENO, TIOCCONS, &on); 1628 ioctl (STDIN_FILENO, TIOCCONS, &on);
1492#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1493 int fd; 1630 int fd;
1494 1631
1495 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1496 if (fd >= 0) 1633 if (fd >= 0)
1497 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1498 close (fd); 1636 close (fd);
1499#endif /* SRIOCSREDIR */ 1637 }
1638#endif /* SRIOCSREDIR */
1500 } 1639 }
1501 1640
1502 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1503 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);
1504 signal (SIGQUIT, SIG_DFL); 1643 signal (SIGQUIT, SIG_DFL);
1505 signal (SIGCHLD, SIG_DFL); 1644 signal (SIGCHLD, SIG_DFL);
1506 signal (SIGHUP, SIG_DFL); 1645 signal (SIGHUP, SIG_DFL);
1507 signal (SIGPIPE, SIG_DFL); 1646 signal (SIGPIPE, SIG_DFL);
1508 /* 1647 /*
1509 * mimick login's behavior by disabling the job control signals 1648 * mimic login's behavior by disabling the job control signals
1510 * a shell that wants them can turn them back on 1649 * a shell that wants them can turn them back on
1511 */ 1650 */
1512#ifdef SIGTSTP 1651#ifdef SIGTSTP
1513 signal (SIGTSTP, SIG_IGN); 1652 signal (SIGTSTP, SIG_IGN);
1514 signal (SIGTTIN, SIG_IGN); 1653 signal (SIGTTIN, SIG_IGN);
1515 signal (SIGTTOU, SIG_IGN); 1654 signal (SIGTTOU, SIG_IGN);
1516#endif /* SIGTSTP */ 1655#endif /* SIGTSTP */
1517
1518 // unblock signals (signals are blocked by iom.C
1519 sigset_t ss;
1520 sigemptyset (&ss);
1521 sigprocmask (SIG_SETMASK, &ss, 0);
1522 1656
1523 /* command interpreter path */ 1657 /* command interpreter path */
1524 if (argv != NULL) 1658 if (argv)
1525 { 1659 {
1526# ifdef DEBUG_CMD 1660# ifdef DEBUG_CMD
1527 int i; 1661 int i;
1528 1662
1529 for (i = 0; argv[i]; i++) 1663 for (i = 0; argv[i]; i++)
… …
1538 const char *argv0, *shell; 1672 const char *argv0, *shell;
1539 1673
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1674 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh"; 1675 shell = "/bin/sh";
1542 1676
1543 argv0 = (const char *)rxvt_r_basename (shell); 1677 argv0 = rxvt_basename (shell);
1544 1678
1545 if (OPTION (Opt_loginShell)) 1679 if (option (Opt_loginShell))
1546 { 1680 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1681 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1548 1682
1549 login[0] = '-'; 1683 login[0] = '-';
1550 strcpy (&login[1], argv0); 1684 strcpy (&login[1], argv0);
1551 argv0 = login; 1685 argv0 = login;
1552 } 1686 }
1553 1687
1554 execlp (shell, argv0, NULL); 1688 execlp (shell, argv0, (char *)0);
1555 /* no error message: STDERR is closed! */ 1689 /* no error message: STDERR is closed! */
1556 } 1690 }
1557 1691
1558 return -1; 1692 return -1;
1559} 1693}

Diff Legend

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