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

Diff Legend

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