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.138 by root, Wed Jan 11 02:24:12 2006 UTC vs.
Revision 1.318 by sf-exg, Fri Jan 13 13:04:59 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#ifdef MENUBAR 557 set_option (Opt_jumpScroll);
262 menu_readonly = 1; 558 set_option (Opt_skipScroll);
263# if ! (MENUBAR_MAX > 1) 559 set_option (Opt_secondaryScreen);
264 CurrentBar = &BarList; 560 set_option (Opt_secondaryScroll);
265# endif /* (MENUBAR_MAX > 1) */ 561 set_option (Opt_pastableTabs);
266#endif 562 set_option (Opt_intensityStyles);
267 563 set_option (Opt_iso14755);
268 return true; 564 set_option (Opt_iso14755_52);
269} 565 set_option (Opt_buffered);
270
271void
272rxvt_term::init_secondary ()
273{
274 int i;
275
276 /*
277 * Close all unused file descriptors
278 * We don't want them, we don't need them.
279 */
280 if ((i = open ("/dev/null", O_RDONLY)) < 0)
281 {
282 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO);
284 }
285 else if (i > STDIN_FILENO)
286 {
287 dup2 (i, STDIN_FILENO);
288 close (i);
289 }
290
291 dup2 (STDERR_FILENO, STDOUT_FILENO);
292
293#if 0 // schmorp sayz closing filies is murder
294 for (i = STDERR_FILENO + 1; i < num_fds; i++)
295 {
296#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
297 if (i == 4 || i == 7)
298 continue;
299#endif
300 close (i);
301 }
302#endif
303} 566}
304 567
305/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
306const char ** 569const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
308{ 571{
309 int i, r_argc; 572 int i;
310 char *val;
311 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
312 574
313 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args
315 */
316 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
318 break;
319
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321
322 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i];
324
325 r_argv[i] = NULL;
326
327 if (r_argc == argc)
328 cmd_argv = NULL;
329 else
330 {
331 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
332
333 for (i = 0; i < argc - r_argc - 1; i++)
334 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
335
336 cmd_argv[i] = NULL;
337 }
338
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
340 576
341 /* 577 /*
342 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
343 */ 579 */
344 {
345 TEMP_ENV;
346 580
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
349 583
350 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
351 585
352 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
353 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]);
354 }
355 588
589 // using a local pointer decreases code size a lot
590 xa = display->xa;
591
592 set (display);
356 extract_resources (); 593 extract_resources ();
357 free (r_argv); 594
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 ();
358 620
359 /* 621 /*
360 * set any defaults not already set 622 * set any defaults not already set
361 */ 623 */
362 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
363 { 625 {
364 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
366 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
368 } 631 }
369 else 632 else
370 { 633 {
371 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
372 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
373 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
375 } 639 }
376 640
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
384 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)
385 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
386 650
387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
388 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]);
389#endif 656#endif
390 657
391#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
393 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
397 664
398 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
399 if (!saveLines) 666 if (!saveLines)
400 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
401 668
402#ifdef PRINTPIPE
403 if (!rs[Rs_print_pipe])
404 rs[Rs_print_pipe] = PRINTPIPE;
405#endif
406
407 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
408 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
409 671
410#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 673 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 674# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 675 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 676# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 677 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 678# endif
417 else
418 {
419 val = strdup (rs[Rs_backspace_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_backspace = val;
423 }
424#endif 679#endif
425 680
426#ifndef NO_DELETE_KEY 681#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 682 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 683# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 684 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 685# else
431 key_delete = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
432# endif 687# endif
433 else
434 {
435 val = strdup (rs[Rs_delete_key]);
436 rxvt_Str_trim (val);
437 rxvt_Str_escaped (val);
438 key_delete = val;
439 }
440#endif 688#endif
441 if (rs[Rs_answerbackstring])
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 689
447#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif
450 691
451#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
454 { 695 {
455 if (!rs[Rs_color + Color_fg]) 696 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 697 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
698
457 if (!rs[Rs_color + Color_bg]) 699 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 700 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 701 }
460#endif 702#endif
461 703
… …
463 if (!rs[Rs_color + i]) 705 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 706 rs[Rs_color + i] = def_colorName[i];
465 707
466#ifndef XTERM_REVERSE_VIDEO 708#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 709 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 710 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 711 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 712#endif
471 713
472 /* convenient aliases for setting fg/bg to colors */ 714 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 715 color_aliases (Color_fg);
474 color_aliases (Color_bg); 716 color_aliases (Color_bg);
475#ifndef NO_CURSORCOLOR 717#ifndef NO_CURSORCOLOR
476 color_aliases (Color_cursor); 718 color_aliases (Color_cursor);
477 color_aliases (Color_cursor2); 719 color_aliases (Color_cursor2);
478#endif /* NO_CURSORCOLOR */ 720#endif /* NO_CURSORCOLOR */
479 color_aliases (Color_pointer_fg); 721 color_aliases (Color_pointer_fg);
480 color_aliases (Color_pointer_bg); 722 color_aliases (Color_pointer_bg);
481 color_aliases (Color_border); 723 color_aliases (Color_border);
482#ifndef NO_BOLD_UNDERLINE_REVERSE 724#ifndef NO_BOLD_UNDERLINE_REVERSE
483 color_aliases (Color_BD); 725 color_aliases (Color_BD);
484 color_aliases (Color_UL); 726 color_aliases (Color_UL);
485 color_aliases (Color_RV); 727 color_aliases (Color_RV);
486#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 728#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
487 729
488 if (!rs[Rs_color + Color_border]) 730 if (!rs[Rs_color + Color_border])
489 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 731 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
490 732
491 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 init_done = 1;
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 ();
492} 904}
493 905
494/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
495void 907void
496rxvt_term::init_env () 908rxvt_term::init_env ()
497{ 909{
498 int i;
499 unsigned int u;
500 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
501 915
502#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
504 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 918 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
505 * (for the first non-loopback interface) that we get from 919 * (for the first non-loopback interface) that we get from
… …
512 */ 926 */
513 val = rxvt_network_display (rs[Rs_display_name]); 927 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 928 rs[Rs_display_name] = (const char *)val;
515 929
516 if (val == NULL) 930 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 931#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 932 val = XDisplayString (dpy);
519 933
520 if (rs[Rs_display_name] == NULL) 934 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 935 rs[Rs_display_name] = val; /* use broken `:0' value */
522 936
523 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
525 938
526 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
527 940
528 /* avoiding the math library:
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 941 env_windowid = (char *)rxvt_malloc (21);
534
535 sprintf (env_windowid, "WINDOWID=%u", 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
536 (unsigned int)parent[0]);
537 943
538 /* add entries to the environment: 944 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 947 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 949 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
545 */ 951 */
546 putenv (env_display); 952 putenv (env_display);
547 putenv (env_windowid); 953 putenv (env_windowid);
548 if (env_colorfgbg) 954
955 env_colorfgbg = get_colorfgbg ();
549 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
550 957
551#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 960#endif
554 961
555 if (display->depth <= 2) 962 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 963 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 964 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 965 putenv ("COLORTERM=" COLORTERMENVFULL);
559 966
560 if (rs[Rs_term_name] != NULL) 967 if (rs[Rs_term_name] != NULL)
561 { 968 {
562 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 969 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 970 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 971 putenv (env_term);
565 } 972 }
566 else 973 else
567 putenv ("TERM=" TERMENV); 974 putenv ("TERM=" TERMENV);
… …
569#ifdef HAVE_UNSETENV 976#ifdef HAVE_UNSETENV
570 /* avoid passing old settings and confusing term size */ 977 /* avoid passing old settings and confusing term size */
571 unsetenv ("LINES"); 978 unsetenv ("LINES");
572 unsetenv ("COLUMNS"); 979 unsetenv ("COLUMNS");
573 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
574#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
575} 982}
576 983
577/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
578/*
579 * This is more or less stolen straight from XFree86 xterm.
580 * This should support all European type languages.
581 */
582void 985void
583rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
584{ 987{
585 TEMP_ENV; 988 set_environ (envv);
586 989
587#if HAVE_XSETLOCALE || HAVE_SETLOCALE 990#if HAVE_XSETLOCALE || HAVE_SETLOCALE
588 free (this->locale); 991 free (this->locale);
589 this->locale = setlocale (LC_CTYPE, locale); 992 this->locale = setlocale (LC_CTYPE, locale);
590 993
… …
600 1003
601 this->locale = "C"; 1004 this->locale = "C";
602 } 1005 }
603 1006
604 1007
605 this->locale = rxvt_strdup (this->locale); 1008 this->locale = strdup (this->locale);
606 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
607 mbstate.reset (); 1010 mbstate.reset ();
608#endif 1011#endif
609 1012
610#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
612 // /^UTF.?8/i 1015 // /^UTF.?8/i
613 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
614 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
615 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
616 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
617 free (codeset);
618#else 1020#else
619 enc_utf8 = 0; 1021 enc_utf8 = 0;
620#endif 1022#endif
621} 1023}
622 1024
623void 1025void
624rxvt_term::init_xlocale () 1026rxvt_term::init_xlocale ()
625{ 1027{
626 TEMP_ENV; 1028 set_environ (envv);
627 1029
628#ifdef USE_XIM 1030#ifdef USE_XIM
629 if (!locale) 1031 if (!locale)
630 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
631 else 1033 else
632 { 1034 {
633 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
634 1036
635 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
636 { 1038 {
637 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1039 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
638 return; 1040 return;
639 } 1041 }
640 1042
641 im_ev.start (display); 1043 im_ev.start (display);
642 1044
… …
654 * Initialize the command connection. 1056 * Initialize the command connection.
655 * This should be called after the X server connection is established. 1057 * This should be called after the X server connection is established.
656 */ 1058 */
657 1059
658#ifdef META8_OPTION 1060#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1061 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 1062#endif
661 1063
662 get_ourmods (); 1064 get_ourmods ();
663 1065
664 if (!OPTION (Opt_scrollTtyOutput)) 1066 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 1067 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 1068 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 1069 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 1070 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 1071 priv_modes |= PrivMode_smoothScroll;
670 1072
671#ifndef NO_BACKSPACE_KEY 1073#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 1074 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 1075 priv_modes |= PrivMode_HaveBackSpace;
674#endif 1076#endif
675 1077
676 /* add value for scrollBar */ 1078 /* add value for scrollBar */
677 if (scrollbar_visible ()) 1079 if (scrollBar.state)
678 { 1080 {
679 priv_modes |= PrivMode_scrollBar; 1081 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 1082 SavedModes |= PrivMode_scrollBar;
681 } 1083 }
682 1084
683 if (menubar_visible ())
684 {
685 priv_modes |= PrivMode_menuBar;
686 SavedModes |= PrivMode_menuBar;
687 }
688
689 run_command (argv); 1085 run_command (argv);
690} 1086}
691 1087
692/*----------------------------------------------------------------------*/ 1088/*----------------------------------------------------------------------*/
693void 1089void
694rxvt_term::Get_Colours () 1090rxvt_term::get_colours ()
695{ 1091{
696 int i; 1092 int i;
697 1093
698#ifdef OFF_FOCUS_FADING 1094#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused; 1095 pix_colors = pix_colors_focused;
700#endif 1096#endif
701 1097
702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 1098 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
703 { 1099 {
1100 const char *name = rs[Rs_color + i];
1101
1102 if (!name)
1103 continue;
1104
704 rxvt_color xcol; 1105 rxvt_color xcol;
705 1106
706 if (!rs[Rs_color + i]) 1107 if (!set_color (xcol, name))
707 continue;
708
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 1108 {
711#ifndef XTERM_REVERSE_VIDEO 1109#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && OPTION (Opt_reverseVideo)) 1110 if (i < 2 && option (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 1111 name = def_colorName [1 - i];
714 else 1112 else
715#endif 1113#endif
716 rs[Rs_color + i] = def_colorName[i]; 1114 name = def_colorName [i];
717 1115
718 if (!rs[Rs_color + i]) 1116 if (!name)
719 continue; 1117 continue;
720 1118
721 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1119 if (!set_color (xcol, name))
722 { 1120 {
723 switch (i) 1121 switch (i)
724 { 1122 {
725 case Color_fg: 1123 case Color_fg:
726 case Color_bg: 1124 case Color_bg:
727 /* fatal: need bg/fg color */
728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 1125 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
729 /* NOTREACHED */ 1126 name = "";
730 break; 1127 break;
731#ifndef NO_CURSORCOLOR 1128#ifndef NO_CURSORCOLOR
732 case Color_cursor2: 1129 case Color_cursor2:
733 xcol = pix_colors[Color_fg]; 1130#endif
734 break;
735#endif /* ! NO_CURSORCOLOR */
736 case Color_pointer_fg: 1131 case Color_pointer_fg:
737 xcol = pix_colors[Color_fg]; 1132 name = rs[Rs_color + Color_fg];
1133 xcol.set (this, name);
738 break; 1134 break;
739 default: 1135 default:
740 xcol = pix_colors[Color_bg]; /* None */ 1136 name = rs[Rs_color + Color_bg];
1137 xcol.set (this, name);
741 break; 1138 break;
742 } 1139 }
743 } 1140 }
744 } 1141 }
745 1142
746 pix_colors[i] = xcol; 1143 pix_colors[i] = xcol;
747 SET_PIXCOLOR (i); 1144 rs[Rs_color + i] = name;
748 }
749
750#ifdef OFF_FOCUS_FADING
751 if (rs[Rs_fade])
752 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
754#endif
755
756 if (display->depth <= 2)
757 { 1145 }
1146
1147 if (depth <= 2)
1148 {
758 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1149 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
759 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 1150 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
760 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 1151 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
761 } 1152 }
762 1153
763 /* 1154 /*
764 * get scrollBar/menuBar shadow colors 1155 * get scrollBar shadow colors
765 * 1156 *
766 * The calculations of topShadow/bottomShadow values are adapted 1157 * The calculations of topShadow/bottomShadow values are adapted
767 * from the fvwm window manager. 1158 * from the fvwm window manager.
768 */ 1159 */
769#ifdef KEEP_SCROLLCOLOR 1160#ifdef RXVT_SCROLLBAR
770
771 if (display->depth <= 2) 1161 if (depth <= 2)
772 { 1162 {
773 /* Monochrome */ 1163 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1164 alias_color (Color_scroll, Color_fg);
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1165 alias_color (Color_topShadow, Color_bg);
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1166 alias_color (Color_bottomShadow, Color_bg);
777 } 1167 }
778 else 1168 else
779 { 1169 {
780 rxvt_color xcol[2]; 1170 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
781 /* xcol[0] == white
782 * xcol[1] == top shadow
783 * xcol[2] == bot shadow */
784 1171
785 xcol[1] = pix_colors[Color_scroll]; 1172 rgba cscroll;
786 xcol[0].set (display, 65535, 65535, 65535); 1173 pix_colors [Color_scroll].get (cscroll);
787
788 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
789
790 xcol[0].get (display, pr0, pg0, pb0);
791 xcol[1].get (display, pr1, pg1, pb1);
792
793 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
794 1174
795 /* topShadowColor */ 1175 /* topShadowColor */
796 if (!xcol[1].set (display, 1176 if (!pix_colors[Color_topShadow].set (this,
797 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1177 rgba (
798 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1178 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
799 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1179 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
800 xcol[1] = pix_colors[Color_White]; 1180 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
801 1181 cscroll.a)
802 pix_colors[Color_topShadow] = xcol[1]; 1182 ))
1183 alias_color (Color_topShadow, Color_White);
803 } 1184 }
804#endif /* KEEP_SCROLLCOLOR */ 1185#endif
1186
1187#ifdef OFF_FOCUS_FADING
1188 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1189 update_fade_color (i);
1190#endif
805} 1191}
806 1192
807/*----------------------------------------------------------------------*/ 1193/*----------------------------------------------------------------------*/
808/* color aliases, fg/bg bright-bold */ 1194/* color aliases, fg/bg bright-bold */
809void 1195void
810rxvt_term::color_aliases (int idx) 1196rxvt_term::color_aliases (int idx)
811{ 1197{
812 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1198 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
813 { 1199 {
814 int i = atoi (rs[Rs_color + idx]); 1200 int i = atoi (rs[Rs_color + idx]);
815 1201
816 if (i >= 8 && i <= 15) 1202 if (i >= 8 && i <= 15)
817 { /* bright colors */ 1203 /* bright colors */
818 i -= 8;
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1204 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
820 return; 1205 else if (i >= 0 && i <= 7)
821 } 1206 /* normal colors */
822
823 if (i >= 0 && i <= 7) /* normal colors */
824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1207 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825 } 1208 }
826} 1209}
827 1210
828/*----------------------------------------------------------------------*/ 1211/*----------------------------------------------------------------------*/
… …
848 1231
849 if (rsmod 1232 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1233 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 1234 requestedmeta = rsmod[3] - '0';
852 1235
853 map = XGetModifierMapping (display->display); 1236 map = XGetModifierMapping (dpy);
854 kc = map->modifiermap; 1237 kc = map->modifiermap;
855 1238
856 for (i = 1; i < 6; i++) 1239 for (i = 1; i < 6; i++)
857 { 1240 {
858 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1241 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
860 for (j = map->max_keypermod; j--; k++) 1243 for (j = map->max_keypermod; j--; k++)
861 { 1244 {
862 if (kc[k] == 0) 1245 if (kc[k] == 0)
863 break; 1246 break;
864 1247
865 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1248 switch (XKeycodeToKeysym (dpy, kc[k], 0))
866 { 1249 {
867 case XK_Num_Lock: 1250 case XK_Num_Lock:
868 ModNumLockMask = modmasks[i - 1]; 1251 ModNumLockMask = modmasks[i - 1];
869 continue; 1252 continue;
870 1253
… …
912 1295
913 if (i) 1296 if (i)
914 ModMetaMask = modmasks[i - 1]; 1297 ModMetaMask = modmasks[i - 1];
915} 1298}
916 1299
1300void
1301rxvt_term::set_icon (const char *file)
1302{
1303#ifdef HAVE_AFTERIMAGE
1304 init_asv ();
1305
1306 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1307 if (!im)
1308 {
1309 rxvt_warn ("Loading image icon failed, continuing without.\n");
1310 return;
1311 }
1312
1313 unsigned int w = im->width;
1314 unsigned int h = im->height;
1315
1316 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1317 {
1318 rxvt_warn ("Icon image too big, continuing without.\n");
1319 destroy_asimage (&im);
1320 return;
1321 }
1322
1323 ASImage *result = scale_asimage (asv, im,
1324 w, h, ASA_ARGB32,
1325 100, ASIMAGE_QUALITY_DEFAULT);
1326 destroy_asimage (&im);
1327
1328 if (!result)
1329 {
1330 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1331 return;
1332 }
1333
1334 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1335 if (buffer)
1336 {
1337 ARGB32 *asbuf = result->alt.argb32;
1338 buffer [0] = w;
1339 buffer [1] = h;
1340
1341 for (unsigned int i = 0; i < w * h; ++i)
1342 buffer [i + 2] = asbuf [i];
1343
1344 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1345 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1346 free (buffer);
1347 }
1348 else
1349 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1350
1351 destroy_asimage (&result);
1352#endif
1353
1354#ifdef HAVE_PIXBUF
1355 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1356 if (!pixbuf)
1357 {
1358 rxvt_warn ("Loading image icon failed, continuing without.\n");
1359 return;
1360 }
1361
1362 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1363 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1364
1365 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1366 {
1367 rxvt_warn ("Icon image too big, continuing without.\n");
1368 g_object_unref (pixbuf);
1369 return;
1370 }
1371
1372 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1373 {
1374 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1375 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1376 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1377
1378 buffer [0] = w;
1379 buffer [1] = h;
1380 for (int i = 0; i < h; i++)
1381 {
1382 for (int j = 0; j < w; j++)
1383 {
1384 unsigned char *pixel = row + j * channels;
1385 long value;
1386
1387 if (channels == 4)
1388 value = pixel[3];
1389 else
1390 value = (unsigned char)0x00ff;
1391
1392 value = (value << 8) + pixel[0];
1393 value = (value << 8) + pixel[1];
1394 value = (value << 8) + pixel[2];
1395 buffer[(i * w + j) + 2] = value;
1396 }
1397
1398 row += rowstride;
1399 }
1400
1401 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1402 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1403 free (buffer);
1404 }
1405 else
1406 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1407
1408 g_object_unref (pixbuf);
1409#endif
1410}
1411
917/*----------------------------------------------------------------------*/ 1412/*----------------------------------------------------------------------*/
918/* rxvt_Create_Windows () - Open and map the window */ 1413/* Open and map the window */
919void 1414void
920rxvt_term::create_windows (int argc, const char *const *argv) 1415rxvt_term::create_windows (int argc, const char *const *argv)
921{ 1416{
922 XClassHint classHint; 1417 XClassHint classHint;
923 XWMHints wmHint; 1418 XWMHints wmHint;
924#if ENABLE_FRILLS 1419#if ENABLE_FRILLS
925 Atom prop = None;
926 MWMHints mwmhints; 1420 MWMHints mwmhints = { };
927#endif 1421#endif
928 XGCValues gcvalue; 1422 XGCValues gcvalue;
929 long vt_emask;
930 XSetWindowAttributes attributes; 1423 XSetWindowAttributes attributes;
931 XWindowAttributes gattr;
932 Window top, parent; 1424 Window top, parent;
933 dDisp;
934 1425
935#ifdef USING_W11LIB 1426 dLocal (Display *, dpy);
936 /* enable W11 callbacks */
937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
938#endif
939 1427
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1428 /* grab colors before netscape does */
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 1429 get_colours ();
942 1430
943 if (OPTION (Opt_transparent)) 1431 if (!set_fonts ())
944 { 1432 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 1433
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1434 parent = display->root;
947 } 1435
1436 attributes.override_redirect = !!option (Opt_override_redirect);
948 1437
949#if ENABLE_FRILLS 1438#if ENABLE_FRILLS
950 if (OPTION (Opt_borderLess)) 1439 if (option (Opt_borderLess))
951 { 1440 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 1441 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
953
954 if (prop == None)
955 { 1442 {
956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1443 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
957#ifdef PREFER_24BIT
958 attributes.override_redirect = TRUE; 1444 attributes.override_redirect = true;
959#endif
960 mwmhints.flags = 0;
961 } 1445 }
962 else 1446 else
963 { 1447 {
964 mwmhints.flags = MWM_HINTS_DECORATIONS; 1448 mwmhints.flags = MWM_HINTS_DECORATIONS;
965 mwmhints.decorations = 0;
966 } 1449 }
967 } 1450 }
968 else
969 mwmhints.flags = 0;
970#endif 1451#endif
971
972 /* grab colors before netscape does */
973 Get_Colours ();
974
975 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978 parent = DefaultRootWindow (disp);
979 1452
980#if ENABLE_XEMBED 1453#if ENABLE_XEMBED
981 if (rs[Rs_embed]) 1454 if (rs[Rs_embed])
982 { 1455 {
983 XWindowAttributes wattr; 1456 XWindowAttributes wattr;
984 1457
985 parent = strtol (rs[Rs_embed], 0, 0); 1458 parent = strtol (rs[Rs_embed], 0, 0);
986 1459
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 1460 if (!XGetWindowAttributes (dpy, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1461 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 1462
990 window_calc (wattr.width, wattr.height); 1463 window_calc (wattr.width, wattr.height);
991 } 1464 }
992#endif 1465#endif
993 1466
994 window_calc (0, 0); 1467 window_calc (0, 0);
995 1468
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 1469 /* sub-window placement & size in rxvt_term::resize_all_windows () */
997#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 1470 attributes.background_pixel = pix_colors_focused [Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 1471 attributes.border_pixel = pix_colors_focused [Color_border];
1000 attributes.colormap = display->cmap; 1472 attributes.colormap = cmap;
1473
1001 top = XCreateWindow (disp, parent, 1474 top = XCreateWindow (dpy, parent,
1002 szHint.x, szHint.y, 1475 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 1476 szHint.width, szHint.height,
1004 ext_bwidth, 1477 ext_bwidth,
1005 display->depth, InputOutput, 1478 depth, InputOutput, visual,
1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1008#else 1480 &attributes);
1009 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y,
1011 szHint.width, szHint.height,
1012 ext_bwidth,
1013 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]);
1015#endif
1016 1481
1017 this->parent[0] = top; 1482 this->parent = top;
1018 1483
1019 old_width = szHint.width; 1484 set_title (rs [Rs_title]);
1020 old_height = szHint.height; 1485 set_icon_name (rs [Rs_iconName]);
1021 1486
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1024
1025 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 1488 classHint.res_class = (char *)RESCLASS;
1027 1489
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1490 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 1491 wmHint.input = True;
1030 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1492 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 1493 wmHint.window_group = top;
1032 1494
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1495 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 1496 &szHint, &wmHint, &classHint);
1497#if ENABLE_EWMH
1498 /*
1499 * set up icon hint
1500 * rs [Rs_iconfile] is path to icon
1501 */
1502
1503 if (rs [Rs_iconfile])
1504 {
1505 set_icon (rs [Rs_iconfile]);
1506 }
1507#endif
1508
1509#if ENABLE_FRILLS
1510 if (mwmhints.flags)
1511 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1512 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1513#endif
1035 1514
1036 Atom protocols[] = { 1515 Atom protocols[] = {
1037 xa[XA_WM_DELETE_WINDOW], 1516 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH 1517#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING], 1518 xa[XA_NET_WM_PING],
1040#endif 1519#endif
1041 }; 1520 };
1042 1521
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1522 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1044 1523
1045#if ENABLE_FRILLS 1524#if ENABLE_FRILLS
1046 if (rs[Rs_transient_for]) 1525 if (rs[Rs_transient_for])
1047 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1526 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1048#endif 1527#endif
1049 1528
1050#if ENABLE_EWMH 1529#if ENABLE_EWMH
1051 long pid = getpid (); 1530 long pid = getpid ();
1052 1531
1053 XChangeProperty (disp, top, 1532 XChangeProperty (dpy, top,
1054 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1533 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1055 PropModeReplace, (unsigned char *)&pid, 1); 1534 PropModeReplace, (unsigned char *)&pid, 1);
1056 1535
1057 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1536 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif 1537#endif
1059 1538
1060 XSelectInput (disp, top, 1539 XSelectInput (dpy, top,
1061 KeyPressMask 1540 KeyPressMask
1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1541#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1063 | KeyReleaseMask 1542 | KeyReleaseMask
1064#endif 1543#endif
1065 | FocusChangeMask | VisibilityChangeMask 1544 | FocusChangeMask | VisibilityChangeMask
1066 | ExposureMask | StructureNotifyMask); 1545 | ExposureMask | StructureNotifyMask);
1067 1546
1068 termwin_ev.start (display, top); 1547 termwin_ev.start (display, top);
1069 1548
1070#if ENABLE_FRILLS
1071 if (mwmhints.flags)
1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1074#endif
1075
1076 /* vt cursor: Black-on-White is standard, but this is more popular */ 1549 /* vt cursor: Black-on-White is standard, but this is more popular */
1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1078
1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1080 /* cursor (menuBar/scrollBar): Black-on-White */
1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1082#endif
1083 1551
1084 /* the vt window */ 1552 /* the vt window */
1085 vt = XCreateSimpleWindow (disp, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1086 window_vt_x,
1087 window_vt_y, 1554 window_vt_x, window_vt_y,
1088 width,
1089 height, 1555 vt_width, vt_height,
1090 0, 1556 0,
1091 pix_colors_focused[Color_fg], 1557 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_bg]); 1558 pix_colors_focused[Color_bg]);
1093#ifdef DEBUG_X
1094 XStoreName (disp, vt, "vt window");
1095#endif
1096 1559
1097 attributes.bit_gravity = NorthWestGravity; 1560 attributes.bit_gravity = NorthWestGravity;
1098 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1561 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1099 1562
1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1563 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1101 1564
1102 if (OPTION (Opt_pointerBlank) 1565 if (option (Opt_pointerBlank))
1103#ifdef ENABLE_PERL
1104 || perl.self
1105#endif
1106 )
1107 vt_emask |= PointerMotionMask; 1566 vt_emask |= PointerMotionMask;
1108 else 1567 else
1109 vt_emask |= Button1MotionMask | Button3MotionMask; 1568 vt_emask |= Button1MotionMask | Button3MotionMask;
1110 1569
1111 XSelectInput (disp, vt, vt_emask); 1570 vt_select_input ();
1571
1112 vt_ev.start (display, vt); 1572 vt_ev.start (display, vt);
1113 1573
1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1115 if (menuBar_height ())
1116 {
1117 menuBar.win = XCreateSimpleWindow (disp, top,
1118 window_vt_x, 0,
1119 width,
1120 menuBar_TotalHeight (),
1121 0,
1122 pix_colors_focused[Color_fg],
1123 pix_colors_focused[Color_scroll]);
1124
1125#ifdef DEBUG_X
1126 XStoreName (disp, menuBar.win, "menubar");
1127#endif
1128
1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1130
1131 XDefineCursor (disp, menuBar.win,
1132 XCreateFontCursor (disp, XC_left_ptr));
1133
1134 XSelectInput (disp, menuBar.win,
1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1136 menubar_ev.start (display, menuBar.win);
1137 }
1138#endif
1139
1140#ifdef XPM_BACKGROUND
1141 if (rs[Rs_backgroundPixmap] != NULL
1142 && ! OPTION (Opt_transparent))
1143 {
1144 const char *p = rs[Rs_backgroundPixmap];
1145
1146 if ((p = strchr (p, ';')) != NULL)
1147 {
1148 p++;
1149 scale_pixmap (p);
1150 }
1151
1152 set_bgPixmap (rs[Rs_backgroundPixmap]);
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 /* graphics context for the vt window */ 1574 /* graphics context for the vt window */
1158 gcvalue.foreground = pix_colors[Color_fg]; 1575 gcvalue.foreground = pix_colors[Color_fg];
1159 gcvalue.background = pix_colors[Color_bg]; 1576 gcvalue.background = pix_colors[Color_bg];
1160 gcvalue.graphics_exposures = 1; 1577 gcvalue.graphics_exposures = 0;
1578
1161 gc = XCreateGC (disp, vt, 1579 gc = XCreateGC (dpy, vt,
1162 GCForeground | GCBackground | GCGraphicsExposures, 1580 GCForeground | GCBackground | GCGraphicsExposures,
1163 &gcvalue); 1581 &gcvalue);
1164 1582
1165 drawable = new rxvt_drawable (display, vt); 1583 drawable = new rxvt_drawable (this, vt);
1166
1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1168 gcvalue.foreground = pix_colors[Color_topShadow];
1169 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[Color_bottomShadow];
1171 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1173 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174#endif
1175 1584
1176#ifdef OFF_FOCUS_FADING 1585#ifdef OFF_FOCUS_FADING
1177 // initially we are in unfocused state 1586 // initially we are in unfocused state
1178 if (rs[Rs_fade]) 1587 if (rs[Rs_fade])
1179 pix_colors = pix_colors_unfocused; 1588 pix_colors = pix_colors_unfocused;
1180#endif 1589#endif
1181 1590
1182 pointer_unblank (); 1591 pointer_unblank ();
1183 scr_recolour (); 1592 scr_recolour ();
1184
1185#if ENABLE_XEMBED
1186 if (rs[Rs_embed])
1187 {
1188 long info[2] = { 0, XEMBED_MAPPED };
1189
1190 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1191 32, PropModeReplace, (unsigned char *)&info, 2);
1192 }
1193#endif
1194}
1195
1196/* ------------------------------------------------------------------------- *
1197 * GET TTY CURRENT STATE *
1198 * ------------------------------------------------------------------------- */
1199void
1200rxvt_get_ttymode (ttymode_t *tio, int erase)
1201{
1202#ifdef HAVE_TERMIOS_H
1203 /*
1204 * standard System V termios interface
1205 */
1206 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1207 {
1208 // return error - use system defaults,
1209 // where possible, and zero elsewhere
1210 memset (tio, 0, sizeof (ttymode_t));
1211
1212 tio->c_cc[VINTR] = CINTR;
1213 tio->c_cc[VQUIT] = CQUIT;
1214 tio->c_cc[VERASE] = CERASE;
1215#ifdef VERASE2
1216 tio->c_cc[VERASE2] = CERASE2;
1217#endif
1218 tio->c_cc[VKILL] = CKILL;
1219 tio->c_cc[VSTART] = CSTART;
1220 tio->c_cc[VSTOP] = CSTOP;
1221 tio->c_cc[VSUSP] = CSUSP;
1222# ifdef VDSUSP
1223 tio->c_cc[VDSUSP] = CDSUSP;
1224# endif
1225# ifdef VREPRINT
1226 tio->c_cc[VREPRINT] = CRPRNT;
1227# endif
1228# ifdef VDISCRD
1229 tio->c_cc[VDISCRD] = CFLUSH;
1230# endif
1231# ifdef VWERSE
1232 tio->c_cc[VWERSE] = CWERASE;
1233# endif
1234# ifdef VLNEXT
1235 tio->c_cc[VLNEXT] = CLNEXT;
1236# endif
1237 }
1238
1239 tio->c_cc[VEOF] = CEOF;
1240 tio->c_cc[VEOL] = VDISABLE;
1241# ifdef VEOL2
1242 tio->c_cc[VEOL2] = VDISABLE;
1243# endif
1244# ifdef VSWTC
1245 tio->c_cc[VSWTC] = VDISABLE;
1246# endif
1247# ifdef VSWTCH
1248 tio->c_cc[VSWTCH] = VDISABLE;
1249# endif
1250# if VMIN != VEOF
1251 tio->c_cc[VMIN] = 1;
1252# endif
1253# if VTIME != VEOL
1254 tio->c_cc[VTIME] = 0;
1255# endif
1256
1257 if (erase != -1)
1258 tio->c_cc[VERASE] = (char)erase;
1259
1260 /* input modes */
1261 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1262# ifdef IMAXBEL
1263 | IMAXBEL
1264# endif
1265 | IXON);
1266
1267 /* output modes */
1268 tio->c_oflag = (OPOST | ONLCR);
1269
1270 /* control modes */
1271 tio->c_cflag = (CS8 | CREAD);
1272
1273 /* line discipline modes */
1274 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1275# if defined (ECHOCTL) && defined (ECHOKE)
1276 | ECHOCTL | ECHOKE
1277# endif
1278 | ECHOE | ECHOK);
1279# else /* HAVE_TERMIOS_H */
1280
1281 /*
1282 * sgtty interface
1283 */
1284
1285 /* get parameters -- gtty */
1286 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1287 {
1288 tio->sg.sg_erase = CERASE; /* ^H */
1289 tio->sg.sg_kill = CKILL; /* ^U */
1290 }
1291
1292 if (erase != -1)
1293 tio->sg.sg_erase = (char)erase;
1294
1295 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1296
1297 /* get special characters */
1298 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1299 {
1300 tio->tc.t_intrc = CINTR; /* ^C */
1301 tio->tc.t_quitc = CQUIT; /* ^\ */
1302 tio->tc.t_startc = CSTART; /* ^Q */
1303 tio->tc.t_stopc = CSTOP; /* ^S */
1304 tio->tc.t_eofc = CEOF; /* ^D */
1305 tio->tc.t_brkc = -1;
1306 }
1307
1308 /* get local special chars */
1309 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1310 {
1311 tio->lc.t_suspc = CSUSP; /* ^Z */
1312 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1313 tio->lc.t_rprntc = CRPRNT; /* ^R */
1314 tio->lc.t_flushc = CFLUSH; /* ^O */
1315 tio->lc.t_werasc = CWERASE; /* ^W */
1316 tio->lc.t_lnextc = CLNEXT; /* ^V */
1317 }
1318 /* get line discipline */
1319 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1320# ifdef NTTYDISC
1321 tio->line = NTTYDISC;
1322# endif /* NTTYDISC */
1323
1324 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1325#endif /* HAVE_TERMIOS_H */
1326
1327 /*
1328 * Debugging
1329 */
1330#ifdef DEBUG_TTYMODE
1331#ifdef HAVE_TERMIOS_H
1332 /* c_iflag bits */
1333 fprintf (stderr, "Input flags\n");
1334
1335 /* cpp token stringize doesn't work on all machines <sigh> */
1336# define FOO(flag,name) \
1337 if ((tio->c_iflag) & flag) \
1338 fprintf (stderr, "%s ", name)
1339
1340 /* c_iflag bits */
1341 FOO (IGNBRK, "IGNBRK");
1342 FOO (BRKINT, "BRKINT");
1343 FOO (IGNPAR, "IGNPAR");
1344 FOO (PARMRK, "PARMRK");
1345 FOO (INPCK, "INPCK");
1346 FOO (ISTRIP, "ISTRIP");
1347 FOO (INLCR, "INLCR");
1348 FOO (IGNCR, "IGNCR");
1349 FOO (ICRNL, "ICRNL");
1350 FOO (IXON, "IXON");
1351 FOO (IXOFF, "IXOFF");
1352# ifdef IUCLC
1353 FOO (IUCLC, "IUCLC");
1354# endif
1355# ifdef IXANY
1356 FOO (IXANY, "IXANY");
1357# endif
1358# ifdef IMAXBEL
1359 FOO (IMAXBEL, "IMAXBEL");
1360# endif
1361
1362 fprintf (stderr, "\n");
1363
1364# undef FOO
1365# define FOO(entry, name) \
1366 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1367
1368 FOO (VINTR, "VINTR");
1369 FOO (VQUIT, "VQUIT");
1370 FOO (VERASE, "VERASE");
1371 FOO (VKILL, "VKILL");
1372 FOO (VEOF, "VEOF");
1373 FOO (VEOL, "VEOL");
1374# ifdef VEOL2
1375 FOO (VEOL2, "VEOL2");
1376# endif
1377# ifdef VSWTC
1378 FOO (VSWTC, "VSWTC");
1379# endif
1380# ifdef VSWTCH
1381 FOO (VSWTCH, "VSWTCH");
1382# endif
1383 FOO (VSTART, "VSTART");
1384 FOO (VSTOP, "VSTOP");
1385 FOO (VSUSP, "VSUSP");
1386# ifdef VDSUSP
1387 FOO (VDSUSP, "VDSUSP");
1388# endif
1389# ifdef VREPRINT
1390 FOO (VREPRINT, "VREPRINT");
1391# endif
1392# ifdef VDISCRD
1393 FOO (VDISCRD, "VDISCRD");
1394# endif
1395# ifdef VWERSE
1396 FOO (VWERSE, "VWERSE");
1397# endif
1398# ifdef VLNEXT
1399 FOO (VLNEXT, "VLNEXT");
1400# endif
1401
1402 fprintf (stderr, "\n");
1403# undef FOO
1404# endif /* HAVE_TERMIOS_H */
1405#endif /* DEBUG_TTYMODE */
1406} 1593}
1407 1594
1408/*----------------------------------------------------------------------*/ 1595/*----------------------------------------------------------------------*/
1409/* 1596/*
1410 * Run the command in a subprocess and return a file descriptor for the 1597 * Run the command in a subprocess and return a file descriptor for the
… …
1412 * the slave. 1599 * the slave.
1413 */ 1600 */
1414void 1601void
1415rxvt_term::run_command (const char *const *argv) 1602rxvt_term::run_command (const char *const *argv)
1416{ 1603{
1417 TEMP_ENV; // not very temporary...
1418
1419#if ENABLE_FRILLS 1604#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1605 if (rs[Rs_pty_fd])
1421 { 1606 {
1422 pty.pty = atoi (rs[Rs_pty_fd]); 1607 pty->pty = atoi (rs[Rs_pty_fd]);
1423 1608
1424 if (pty.pty >= 0) 1609 if (pty->pty >= 0)
1425 { 1610 {
1426 if (getfd_hook) 1611 if (getfd_hook)
1427 pty.pty = (*getfd_hook) (pty.pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1428 1613
1429 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1430 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1431 } 1616 }
1432 } 1617 }
1433 else 1618 else
1434#endif 1619#endif
1435 if (!pty.get ()) 1620 if (!pty->get ())
1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1621 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1437 1622
1623 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1624
1625 struct termios tio = def_tio;
1626
1627#ifndef NO_BACKSPACE_KEY
1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1629 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1630 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1631 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1632#endif
1633
1634 /* init terminal attributes */
1635 cfsetospeed (&tio, BAUDRATE);
1636 cfsetispeed (&tio, BAUDRATE);
1637 tcsetattr (pty->tty, TCSANOW, &tio);
1438 pty.set_utf8_mode (enc_utf8); 1638 pty->set_utf8_mode (enc_utf8);
1439 1639
1440 /* set initial window size */ 1640 /* set initial window size */
1441 tt_winch (); 1641 tt_winch ();
1442
1443 int er;
1444
1445#ifndef NO_BACKSPACE_KEY
1446 if (key_backspace[0] && !key_backspace[1])
1447 er = key_backspace[0];
1448 else if (strcmp (key_backspace, "DEC") == 0)
1449 er = '\177'; /* the initial state anyway */
1450 else
1451#endif
1452 er = -1;
1453
1454 rxvt_get_ttymode (&tio, er);
1455 1642
1456#if ENABLE_FRILLS 1643#if ENABLE_FRILLS
1457 if (rs[Rs_pty_fd]) 1644 if (rs[Rs_pty_fd])
1458 return; 1645 return;
1459#endif 1646#endif
1460 1647
1461#ifndef __QNX__
1462 /* spin off the command interpreter */ 1648 /* spin off the command interpreter */
1463 switch (cmd_pid = fork ()) 1649 switch (cmd_pid = fork ())
1464 { 1650 {
1465 case -1: 1651 case -1:
1466 { 1652 {
… …
1468 rxvt_fatal ("can't fork, aborting.\n"); 1654 rxvt_fatal ("can't fork, aborting.\n");
1469 } 1655 }
1470 case 0: 1656 case 0:
1471 init_env (); 1657 init_env ();
1472 1658
1473 if (!pty.make_controlling_tty ()) 1659 if (!pty->make_controlling_tty ())
1474 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1660 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1475 else 1661 else
1476 { 1662 {
1477 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1663 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1478 dup2 (pty.tty, STDIN_FILENO); 1664 dup2 (pty->tty, STDIN_FILENO);
1479 dup2 (pty.tty, STDOUT_FILENO); 1665 dup2 (pty->tty, STDOUT_FILENO);
1480 dup2 (pty.tty, STDERR_FILENO); 1666 dup2 (pty->tty, STDERR_FILENO);
1481 1667
1482 // close all our file handles that we do no longer need 1668 // close all our file handles that we do no longer need
1483 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1669 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1484 { 1670 {
1485 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1671 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1486 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1672 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1487 } 1673 }
1488 1674
1489 run_child (argv); 1675 run_child (argv);
1490 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1676 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1491 } 1677 }
1492 1678
1493 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1494 1680
1495 default: 1681 default:
1682 if (!option (Opt_utmpInhibit))
1496 { 1683 {
1497#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1684#ifdef LOG_ONLY_ON_LOGIN
1498 int fdstdin; 1685 bool login_shell = option (Opt_loginShell);
1499 1686#else
1500 fdstdin = dup (STDIN_FILENO); 1687 bool login_shell = true;
1501 dup2 (pty.tty, STDIN_FILENO);
1502#endif 1688#endif
1503 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1504#ifdef UTMP_SUPPORT
1505 privileged_utmp (SAVE);
1506#endif
1507
1508#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1509
1510 dup2 (fdstdin, STDIN_FILENO);
1511 close (fdstdin);
1512#endif
1513 } 1690 }
1514 1691
1515 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1692 pty->close_tty ();
1693
1694 child_ev.start (cmd_pid);
1695
1696 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1516 break; 1697 break;
1517 } 1698 }
1518#else /* __QNX__ uses qnxspawn () */
1519 fchmod (pty.tty, 0622);
1520 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1521 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1522
1523 if (run_child (argv) == -1)
1524 exit (EXIT_FAILURE);
1525#endif
1526} 1699}
1527 1700
1528/* ------------------------------------------------------------------------- * 1701/* ------------------------------------------------------------------------- *
1529 * CHILD PROCESS OPERATIONS * 1702 * CHILD PROCESS OPERATIONS *
1530 * ------------------------------------------------------------------------- */ 1703 * ------------------------------------------------------------------------- */
… …
1535int 1708int
1536rxvt_term::run_child (const char *const *argv) 1709rxvt_term::run_child (const char *const *argv)
1537{ 1710{
1538 char *login; 1711 char *login;
1539 1712
1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541
1542 if (OPTION (Opt_console)) 1713 if (option (Opt_console))
1714 {
1543 { /* be virtual console, fail silently */ 1715 /* be virtual console, fail silently */
1544#ifdef TIOCCONS 1716#ifdef TIOCCONS
1545 unsigned int on = 1; 1717 unsigned int on = 1;
1546 1718
1547 ioctl (STDIN_FILENO, TIOCCONS, &on); 1719 ioctl (STDIN_FILENO, TIOCCONS, &on);
1548#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1549 int fd; 1721 int fd;
1550 1722
1551 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1552 if (fd >= 0) 1724 if (fd >= 0)
1553 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1554 close (fd); 1727 close (fd);
1555#endif /* SRIOCSREDIR */ 1728 }
1729#endif /* SRIOCSREDIR */
1556 } 1730 }
1557 1731
1558 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1559 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);
1560 signal (SIGQUIT, SIG_DFL); 1734 signal (SIGQUIT, SIG_DFL);
1561 signal (SIGCHLD, SIG_DFL); 1735 signal (SIGCHLD, SIG_DFL);
1562 signal (SIGHUP, SIG_DFL); 1736 signal (SIGHUP, SIG_DFL);
1563 signal (SIGPIPE, SIG_DFL); 1737 signal (SIGPIPE, SIG_DFL);
1564 /* 1738 /*
1565 * mimick login's behavior by disabling the job control signals 1739 * mimic login's behavior by disabling the job control signals
1566 * a shell that wants them can turn them back on 1740 * a shell that wants them can turn them back on
1567 */ 1741 */
1568#ifdef SIGTSTP 1742#ifdef SIGTSTP
1569 signal (SIGTSTP, SIG_IGN); 1743 signal (SIGTSTP, SIG_IGN);
1570 signal (SIGTTIN, SIG_IGN); 1744 signal (SIGTTIN, SIG_IGN);
1571 signal (SIGTTOU, SIG_IGN); 1745 signal (SIGTTOU, SIG_IGN);
1572#endif /* SIGTSTP */ 1746#endif /* SIGTSTP */
1573 1747
1574 // unblock signals (signals are blocked by iom.C
1575 sigset_t ss;
1576 sigemptyset (&ss);
1577 sigprocmask (SIG_SETMASK, &ss, 0);
1578
1579#ifndef __QNX__
1580 /* command interpreter path */ 1748 /* command interpreter path */
1581 if (argv != NULL) 1749 if (argv)
1582 { 1750 {
1583# ifdef DEBUG_CMD 1751# ifdef DEBUG_CMD
1584 int i; 1752 int i;
1585 1753
1586 for (i = 0; argv[i]; i++) 1754 for (i = 0; argv[i]; i++)
… …
1595 const char *argv0, *shell; 1763 const char *argv0, *shell;
1596 1764
1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1765 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1598 shell = "/bin/sh"; 1766 shell = "/bin/sh";
1599 1767
1600 argv0 = (const char *)rxvt_r_basename (shell); 1768 argv0 = rxvt_basename (shell);
1601 1769
1602 if (OPTION (Opt_loginShell)) 1770 if (option (Opt_loginShell))
1603 { 1771 {
1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1772 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1605 1773
1606 login[0] = '-'; 1774 login[0] = '-';
1607 strcpy (&login[1], argv0); 1775 strcpy (&login[1], argv0);
1608 argv0 = login; 1776 argv0 = login;
1609 } 1777 }
1610 1778
1611 execlp (shell, argv0, NULL); 1779 execlp (shell, argv0, (char *)0);
1612 /* no error message: STDERR is closed! */ 1780 /* no error message: STDERR is closed! */
1613 } 1781 }
1614
1615#else /* __QNX__ uses qnxspawn () */
1616
1617 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1618 char *command = NULL, fullcommand[_MAX_PATH];
1619 char **arg_v, *arg_a[2] = { NULL, NULL };
1620
1621 if (argv != NULL)
1622 {
1623 if (access (argv[0], X_OK) == -1)
1624 {
1625 if (strchr (argv[0], '/') == NULL)
1626 {
1627 searchenv (argv[0], "PATH", fullcommand);
1628
1629 if (fullcommand[0] != '\0')
1630 command = fullcommand;
1631 }
1632
1633 if (access (command, X_OK) == -1)
1634 return -1;
1635 }
1636 else
1637 command = argv[0];
1638
1639 arg_v = argv;
1640 }
1641 else
1642 {
1643 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1644 command = "/bin/sh";
1645
1646 arg_a[0] = my_basename (command);
1647
1648 if (OPTION (Opt_loginShell))
1649 {
1650 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1651
1652 login[0] = '-';
1653 strcpy (&login[1], arg_a[0]);
1654 arg_a[0] = login;
1655 }
1656
1657 arg_v = arg_a;
1658 }
1659
1660 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1661 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1662 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1663 command, arg_v, environ, iov_a, 0);
1664 if (login)
1665 free (login);
1666
1667 pty.close_tty ();
1668 return pty.pty;
1669#endif
1670 1782
1671 return -1; 1783 return -1;
1672} 1784}
1673 1785
1674/*----------------------- end-of-file (C source) -----------------------*/ 1786/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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