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

Diff Legend

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