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

Diff Legend

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