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.156 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.265 by root, Sun May 23 00:02:52 2010 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 <pcg@goof.com>
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>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 153 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 154 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 155 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 168# else
64 "Grey25", /* 8: bright black (#404040) */ 169 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 170# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 171 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 172 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 173 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
179#if !USE_256_COLORS
74 // 88 xterm colours 180 // 88 xterm colours
75 "rgb:00/00/00", 181 "rgb:00/00/00",
76 "rgb:00/00/8b", 182 "rgb:00/00/8b",
77 "rgb:00/00/cd", 183 "rgb:00/00/cd",
78 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
147 496
148#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 503 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 510#if ENABLE_FRILLS
162 NULL, // Color_underline 511 NULL, // Color_underline
163#endif 512#endif
164#ifdef OPTION_HC 513#ifdef OPTION_HC
165 NULL, 514 NULL,
515 NULL,
166#endif 516#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 520#endif
171#if TINTING 521#if ENABLE_TRANSPARENCY
172 NULL, 522 NULL,
173#endif 523#endif
174#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
175 "black", 525 "rgb:00/00/00",
176#endif 526#endif
177 }; 527 };
178 528
179bool 529void
180rxvt_term::init_vars () 530rxvt_term::init_vars ()
181{ 531{
182 pix_colors = // 532 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 533
192 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 536 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 538 ncol = 80;
198 nrow = 24; 539 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 544 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 545
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
207 547
208 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 549
215 last_bot = last_state = -1; 550 set_option (Opt_scrollBar);
216 551 set_option (Opt_scrollTtyOutput);
217 return true; 552 set_option (Opt_jumpScroll);
553 set_option (Opt_skipScroll);
554 set_option (Opt_secondaryScreen);
555 set_option (Opt_secondaryScroll);
556 set_option (Opt_pastableTabs);
557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered);
218} 561}
219 562
220void 563static void
221rxvt_term::init_secondary () 564init_secondary ()
222{ 565{
223 int i; 566 int i;
224 567
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 569 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 570 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 571 }
234 else if (i > STDIN_FILENO) 572 else if (i != STDIN_FILENO)
235 { 573 {
236 dup2 (i, STDIN_FILENO); 574 dup2 (i, STDIN_FILENO);
237 close (i); 575 close (i);
238 } 576 }
239 577
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 578 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 579}
253 580
254/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
255const char ** 582const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 583rxvt_term::init_resources (int argc, const char *const *argv)
257{ 584{
258 int i, r_argc; 585 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 586 const char **cmd_argv, **r_argv;
261 587
262 /* 588 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 589 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 590 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 591 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 592 if (!strcmp (argv[r_argc], "-e"))
267 break; 593 break;
594
595 if (r_argc == argc)
596 cmd_argv = NULL;
597 else if (!argv[r_argc + 1])
598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599 else
600 {
601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
602
603 for (i = 0; i < argc - r_argc - 1; i++)
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605
606 cmd_argv[i] = NULL;
607 }
268 608
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 610
271 for (i = 0; i < r_argc; i++) 611 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 612 r_argv[i] = (const char *)argv[i];
273 613
274 r_argv[i] = NULL; 614 r_argv[i] = NULL;
275 615
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 616 rs[Rs_name] = rxvt_basename (argv[0]);
289 617
290 /* 618 /*
291 * Open display, get options/resources and create the window 619 * Open display, get options/resources and create the window
292 */ 620 */
293 621
… …
295 rs[Rs_display_name] = ":0"; 623 rs[Rs_display_name] = ":0";
296 624
297 get_options (r_argc, r_argv); 625 get_options (r_argc, r_argv);
298 626
299 if (!(display = displays.get (rs[Rs_display_name]))) 627 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
301 632
633 // using a local pointer decreases code size a lot
634 xa = display->xa;
635
636 set (display);
302 extract_resources (); 637 extract_resources ();
303 638
639#if XFT
640 if (rs[Rs_depth])
641 select_visual (strtol (rs[Rs_depth], 0, 0));
642#endif
643
304 free (r_argv); 644 free (r_argv);
645
646 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef)
648 rs [i] = 0;
649
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
305 654
306#if ENABLE_PERL 655#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 656 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 657 rs[Rs_perl_ext_1] = "default";
309 658
… …
313 { 662 {
314 rxvt_perl.init (this); 663 rxvt_perl.init (this);
315 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 664 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
316 } 665 }
317#endif 666#endif
318
319 xa = display->xa;
320
321#if ENABLE_FRILLS
322 if (rs[Rs_depth])
323 set (display, strtol (rs[Rs_depth], 0, 0));
324 else
325#endif
326 set (display);
327 667
328 /* 668 /*
329 * set any defaults not already set 669 * set any defaults not already set
330 */ 670 */
331 if (cmd_argv && cmd_argv[0]) 671 if (cmd_argv && cmd_argv[0])
332 { 672 {
333 if (!rs[Rs_title]) 673 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 674 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
675
335 if (!rs[Rs_iconName]) 676 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 677 rs[Rs_iconName] = rs[Rs_title];
337 } 678 }
338 else 679 else
339 { 680 {
340 if (!rs[Rs_title]) 681 if (!rs[Rs_title])
341 rs[Rs_title] = rs[Rs_name]; 682 rs[Rs_title] = rs[Rs_name];
683
342 if (!rs[Rs_iconName]) 684 if (!rs[Rs_iconName])
343 rs[Rs_iconName] = rs[Rs_name]; 685 rs[Rs_iconName] = rs[Rs_name];
344 } 686 }
345 687
346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 688 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 695 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 696 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355 697
356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 698 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
357 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 699 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
700
701 if (rs[Rs_letterSpace])
702 letterSpace = atoi (rs[Rs_letterSpace]);
358#endif 703#endif
359 704
360#ifdef POINTER_BLANK 705#ifdef POINTER_BLANK
361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
362 pointerBlankDelay = i; 707 pointerBlankDelay = i;
… …
366 711
367 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 713 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
370 715
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
378 718
379#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 720 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 721# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 722 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 723# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 724 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 725# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 726#endif
394 727
395#ifndef NO_DELETE_KEY 728#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 729 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 730# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 731 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 732# else
400 key_delete = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
401# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 734# endif
410 if (rs[Rs_answerbackstring])
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415
416#ifdef HAVE_SCROLLBARS
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 735#endif
736
737 scrollBar.setup (this);
419 738
420#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 741 if (option (Opt_reverseVideo))
423 { 742 {
424 if (!rs[Rs_color + Color_fg]) 743 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 744 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
745
426 if (!rs[Rs_color + Color_bg]) 746 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 747 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 748 }
429#endif 749#endif
430 750
… …
432 if (!rs[Rs_color + i]) 752 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 753 rs[Rs_color + i] = def_colorName[i];
434 754
435#ifndef XTERM_REVERSE_VIDEO 755#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 756 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 757 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 758 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 759#endif
440 760
441 /* convenient aliases for setting fg/bg to colors */ 761 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 762 color_aliases (Color_fg);
443 color_aliases (Color_bg); 763 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 764#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 765 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 766 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 767#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 768 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 769 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 770 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 771#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 772 color_aliases (Color_BD);
453 color_aliases (Color_UL); 773 color_aliases (Color_UL);
454 color_aliases (Color_RV); 774 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 775#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 776
457 if (!rs[Rs_color + Color_border]) 777 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 778 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 779
460 return cmd_argv; 780 return cmd_argv;
781}
782
783/*----------------------------------------------------------------------*/
784void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
786{
787 this->envv = envv;
788
789 SET_R (this);
790 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :(
792
793 init_vars ();
794
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv);
798
799#ifdef KEYSYM_RESOURCE
800 keyboard->register_done ();
801#endif
802
803 if (const char *path = rs[Rs_chdir])
804 if (*path) // ignored if empty
805 {
806 if (*path != '/')
807 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
808
809 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 }
812
813 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
815
816 pty = ptytty::create ();
817
818 create_windows (argc, argv);
819
820 init_xlocale ();
821
822 scr_poweron (); // initialize screen
823
824#if 0
825 XSynchronize (dpy, True);
826#endif
827
828 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP
831 {
832 bgPixmap.set_target (this);
833 bgPixmap.invalidate ();
834
835#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent))
837 {
838 bgPixmap.set_transparent ();
839
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843#endif
844 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846
847 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]);
849
850 bgPixmap.set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root);
853 }
854#endif
855
856#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ())
871 update_background ();
872 }
873#endif
874 }
875#endif
876
877#if ENABLE_PERL
878 rootwin_ev.start (display, display->root);
879#endif
880
881 set_colorfgbg ();
882
883 init_command (cmd_argv);
884
885 free (cmd_argv);
886
887 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ);
889
890 HOOK_INVOKE ((this, HOOK_START, DT_END));
891
892#if ENABLE_XEMBED
893 if (rs[Rs_embed])
894 {
895 long info[2] = { 0, XEMBED_MAPPED };
896
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2);
899 }
900#endif
901
902 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]);
904
905 refresh_check ();
461} 906}
462 907
463/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
464void 909void
465rxvt_term::init_env () 910rxvt_term::init_env ()
466{ 911{
467 int i; 912 int i;
468 unsigned int u;
469 char *val; 913 char *val;
470 914
471#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 916 /* Fixup display_name for export over pty to any interested terminal
473 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 925 */
482 val = rxvt_network_display (rs[Rs_display_name]); 926 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 927 rs[Rs_display_name] = (const char *)val;
484 928
485 if (val == NULL) 929 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 930#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (display->display); 931 val = XDisplayString (dpy);
488 932
489 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
491 935
492 i = strlen (val); 936 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 937 env_display = (char *)rxvt_malloc (i + 9);
494 938
495 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
496 940
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 942
… …
519 else 963 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 964 putenv ("COLORTERM=" COLORTERMENVFULL);
521 965
522 if (rs[Rs_term_name] != NULL) 966 if (rs[Rs_term_name] != NULL)
523 { 967 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 968 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 969 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 970 putenv (env_term);
527 } 971 }
528 else 972 else
529 putenv ("TERM=" TERMENV); 973 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 975#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 976 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 977 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 978 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 979 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 980#endif /* HAVE_UNSETENV */
537} 981}
538 982
539/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
540/* 984/*
541 * This is more or less stolen straight from XFree86 xterm. 985 * This is more or less stolen straight from XFree86 xterm.
… …
562 1006
563 this->locale = "C"; 1007 this->locale = "C";
564 } 1008 }
565 1009
566 1010
567 this->locale = rxvt_strdup (this->locale); 1011 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 1012 SET_LOCALE (this->locale);
569 mbstate.reset (); 1013 mbstate.reset ();
570#endif 1014#endif
571 1015
572#if HAVE_NL_LANGINFO 1016#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 1060 * Initialize the command connection.
617 * This should be called after the X server connection is established. 1061 * This should be called after the X server connection is established.
618 */ 1062 */
619 1063
620#ifdef META8_OPTION 1064#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1065 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 1066#endif
623 1067
624 get_ourmods (); 1068 get_ourmods ();
625 1069
626 if (!OPTION (Opt_scrollTtyOutput)) 1070 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 1071 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 1072 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 1073 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 1074 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 1075 priv_modes |= PrivMode_smoothScroll;
632 1076
633#ifndef NO_BACKSPACE_KEY 1077#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 1078 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 1079 priv_modes |= PrivMode_HaveBackSpace;
636#endif 1080#endif
637 1081
638 /* add value for scrollBar */ 1082 /* add value for scrollBar */
639 if (scrollBar.state) 1083 if (scrollBar.state)
… …
645 run_command (argv); 1089 run_command (argv);
646} 1090}
647 1091
648/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
649void 1093void
650rxvt_term::Get_Colours () 1094rxvt_term::get_colours ()
651{ 1095{
652 int i; 1096 int i;
653 1097
654#ifdef OFF_FOCUS_FADING 1098#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 1099 pix_colors = pix_colors_focused;
656#endif 1100#endif
657 1101
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 1103 {
1104 const char *name = rs[Rs_color + i];
1105
1106 if (!name)
1107 continue;
1108
660 rxvt_color xcol; 1109 rxvt_color xcol;
661 1110
662 if (!rs[Rs_color + i]) 1111 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 1112 {
667#ifndef XTERM_REVERSE_VIDEO 1113#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 1114 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 1115 name = def_colorName [1 - i];
670 else 1116 else
671#endif 1117#endif
672 rs[Rs_color + i] = def_colorName[i]; 1118 name = def_colorName [i];
673 1119
674 if (!rs[Rs_color + i]) 1120 if (!name)
675 continue; 1121 continue;
676 1122
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1123 if (!set_color (xcol, name))
678 { 1124 {
679 switch (i) 1125 switch (i)
680 { 1126 {
681 case Color_fg: 1127 case Color_fg:
682 case Color_bg: 1128 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 1129 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 1130 name = "";
686 break; 1131 break;
687#ifndef NO_CURSORCOLOR 1132#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 1133 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 1134#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 1135 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 1136 name = rs[Rs_color + Color_fg];
1137 xcol.set (this, name);
694 break; 1138 break;
695 default: 1139 default:
696 xcol = pix_colors[Color_bg]; /* None */ 1140 name = rs[Rs_color + Color_bg];
1141 xcol.set (this, name);
697 break; 1142 break;
698 } 1143 }
699 } 1144 }
700 } 1145 }
701 1146
702 pix_colors[i] = xcol; 1147 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 1148 rs[Rs_color + i] = name;
704 } 1149 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 1150
712 if (depth <= 2) 1151 if (depth <= 2)
713 { 1152 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1153 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 1154 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 1155 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 1156 }
718 1157
719 /* 1158 /*
720 * get scrollBar shadow colors 1159 * get scrollBar shadow colors
721 * 1160 *
722 * The calculations of topShadow/bottomShadow values are adapted 1161 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 1162 * from the fvwm window manager.
724 */ 1163 */
725#ifdef KEEP_SCROLLCOLOR 1164#ifdef RXVT_SCROLLBAR
726
727 if (depth <= 2) 1165 if (depth <= 2)
728 { 1166 {
729 /* Monochrome */ 1167 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1168 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1169 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1170 alias_color (Color_bottomShadow, Color_bg);
733 } 1171 }
734 else 1172 else
735 { 1173 {
736 rxvt_color xcol[2]; 1174 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737 /* xcol[0] == white
738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */
740 1175
741 xcol[1] = pix_colors[Color_scroll]; 1176 rgba cscroll;
742 xcol[0].set (this, 65535, 65535, 65535); 1177 pix_colors [Color_scroll].get (cscroll);
743
744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
745
746 xcol[0].get (this, pr0, pg0, pb0);
747 xcol[1].get (this, pr1, pg1, pb1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 1178
751 /* topShadowColor */ 1179 /* topShadowColor */
752 if (!xcol[1].set (this, 1180 if (!pix_colors[Color_topShadow].set (this,
753 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1181 rgba (
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1182 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1183 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 xcol[1] = pix_colors[Color_White]; 1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 1185 cscroll.a)
758 pix_colors[Color_topShadow] = xcol[1]; 1186 ))
1187 alias_color (Color_topShadow, Color_White);
759 } 1188 }
760#endif /* KEEP_SCROLLCOLOR */ 1189#endif
1190
1191#ifdef OFF_FOCUS_FADING
1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1193 update_fade_color (i);
1194#endif
761} 1195}
762 1196
763/*----------------------------------------------------------------------*/ 1197/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 1198/* color aliases, fg/bg bright-bold */
765void 1199void
… …
768 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
769 { 1203 {
770 int i = atoi (rs[Rs_color + idx]); 1204 int i = atoi (rs[Rs_color + idx]);
771 1205
772 if (i >= 8 && i <= 15) 1206 if (i >= 8 && i <= 15)
773 { /* bright colors */ 1207 /* bright colors */
774 i -= 8;
775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1208 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
776 return; 1209 else if (i >= 0 && i <= 7)
777 } 1210 /* normal colors */
778
779 if (i >= 0 && i <= 7) /* normal colors */
780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1211 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
781 } 1212 }
782} 1213}
783 1214
784/*----------------------------------------------------------------------*/ 1215/*----------------------------------------------------------------------*/
… …
804 1235
805 if (rsmod 1236 if (rsmod
806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1237 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
807 requestedmeta = rsmod[3] - '0'; 1238 requestedmeta = rsmod[3] - '0';
808 1239
809 map = XGetModifierMapping (display->display); 1240 map = XGetModifierMapping (dpy);
810 kc = map->modifiermap; 1241 kc = map->modifiermap;
811 1242
812 for (i = 1; i < 6; i++) 1243 for (i = 1; i < 6; i++)
813 { 1244 {
814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1245 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
816 for (j = map->max_keypermod; j--; k++) 1247 for (j = map->max_keypermod; j--; k++)
817 { 1248 {
818 if (kc[k] == 0) 1249 if (kc[k] == 0)
819 break; 1250 break;
820 1251
821 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1252 switch (XKeycodeToKeysym (dpy, kc[k], 0))
822 { 1253 {
823 case XK_Num_Lock: 1254 case XK_Num_Lock:
824 ModNumLockMask = modmasks[i - 1]; 1255 ModNumLockMask = modmasks[i - 1];
825 continue; 1256 continue;
826 1257
… …
876rxvt_term::create_windows (int argc, const char *const *argv) 1307rxvt_term::create_windows (int argc, const char *const *argv)
877{ 1308{
878 XClassHint classHint; 1309 XClassHint classHint;
879 XWMHints wmHint; 1310 XWMHints wmHint;
880#if ENABLE_FRILLS 1311#if ENABLE_FRILLS
881 MWMHints mwmhints; 1312 MWMHints mwmhints = { };
882#endif 1313#endif
883 XGCValues gcvalue; 1314 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 1315 XSetWindowAttributes attributes;
885 Window top, parent; 1316 Window top, parent;
886 1317
887 dLocal (Display *, xdisp); 1318 dLocal (Display *, dpy);
888 1319
889 /* grab colors before netscape does */ 1320 /* grab colors before netscape does */
890 Get_Colours (); 1321 get_colours ();
891 1322
892 if (!set_fonts ()) 1323 if (!set_fonts ())
893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
894 1325
895 parent = display->root; 1326 parent = display->root;
896 1327
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1328 attributes.override_redirect = !!option (Opt_override_redirect);
898 1329
899#if ENABLE_FRILLS 1330#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 1331 if (option (Opt_borderLess))
901 { 1332 {
902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1333 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 1334 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1335 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
905 attributes.override_redirect = TRUE; 1336 attributes.override_redirect = true;
906 mwmhints.flags = 0;
907 } 1337 }
908 else 1338 else
909 { 1339 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 1340 mwmhints.flags = MWM_HINTS_DECORATIONS;
911 mwmhints.decorations = 0;
912 } 1341 }
913 } 1342 }
914 else
915 mwmhints.flags = 0;
916#endif 1343#endif
917 1344
918#if ENABLE_XEMBED 1345#if ENABLE_XEMBED
919 if (rs[Rs_embed]) 1346 if (rs[Rs_embed])
920 { 1347 {
921 XWindowAttributes wattr; 1348 XWindowAttributes wattr;
922 1349
923 parent = strtol (rs[Rs_embed], 0, 0); 1350 parent = strtol (rs[Rs_embed], 0, 0);
924 1351
925 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1352 if (!XGetWindowAttributes (dpy, parent, &wattr))
926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1353 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
927 1354
928 window_calc (wattr.width, wattr.height); 1355 window_calc (wattr.width, wattr.height);
929 } 1356 }
930#endif 1357#endif
… …
934 /* sub-window placement & size in rxvt_resize_subwindows () */ 1361 /* sub-window placement & size in rxvt_resize_subwindows () */
935 attributes.background_pixel = pix_colors_focused [Color_border]; 1362 attributes.background_pixel = pix_colors_focused [Color_border];
936 attributes.border_pixel = pix_colors_focused [Color_border]; 1363 attributes.border_pixel = pix_colors_focused [Color_border];
937 attributes.colormap = cmap; 1364 attributes.colormap = cmap;
938 1365
939 top = XCreateWindow (xdisp, parent, 1366 top = XCreateWindow (dpy, parent,
940 szHint.x, szHint.y, 1367 szHint.x, szHint.y,
941 szHint.width, szHint.height, 1368 szHint.width, szHint.height,
942 ext_bwidth, 1369 ext_bwidth,
943 depth, InputOutput, visual, 1370 depth, InputOutput, visual,
944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
947 this->parent[0] = top; 1374 this->parent[0] = top;
948 1375
949 old_width = szHint.width; 1376 old_width = szHint.width;
950 old_height = szHint.height; 1377 old_height = szHint.height;
951 1378
952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1379 set_title (rs [Rs_title]);
953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1380 set_icon_name (rs [Rs_iconName]);
954 1381
955 classHint.res_name = (char *)rs[Rs_name]; 1382 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 1383 classHint.res_class = (char *)RESCLASS;
957 1384
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1385 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 1386 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 1388 wmHint.window_group = top;
962 1389
963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 1391 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /*
1395 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1397 */
1398
1399 if (rs [Rs_iconfile])
1400 {
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif
965 1442
966#if ENABLE_FRILLS 1443#if ENABLE_FRILLS
967 if (mwmhints.flags) 1444 if (mwmhints.flags)
968 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1446 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif 1447#endif
971 1448
972 Atom protocols[] = { 1449 Atom protocols[] = {
973 xa[XA_WM_DELETE_WINDOW], 1450 xa[XA_WM_DELETE_WINDOW],
974#if ENABLE_EWMH 1451#if ENABLE_EWMH
975 xa[XA_NET_WM_PING], 1452 xa[XA_NET_WM_PING],
976#endif 1453#endif
977 }; 1454 };
978 1455
979 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
980 1457
981#if ENABLE_FRILLS 1458#if ENABLE_FRILLS
982 if (rs[Rs_transient_for]) 1459 if (rs[Rs_transient_for])
983 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
984#endif 1461#endif
985 1462
986#if ENABLE_EWMH 1463#if ENABLE_EWMH
987 long pid = getpid (); 1464 long pid = getpid ();
988 1465
989 XChangeProperty (xdisp, top, 1466 XChangeProperty (dpy, top,
990 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1467 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
991 PropModeReplace, (unsigned char *)&pid, 1); 1468 PropModeReplace, (unsigned char *)&pid, 1);
992 1469
993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1470 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
994#endif 1471#endif
995 1472
996 XSelectInput (xdisp, top, 1473 XSelectInput (dpy, top,
997 KeyPressMask 1474 KeyPressMask
998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1475#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
999 | KeyReleaseMask 1476 | KeyReleaseMask
1000#endif 1477#endif
1001 | FocusChangeMask | VisibilityChangeMask 1478 | FocusChangeMask | VisibilityChangeMask
1002 | ExposureMask | StructureNotifyMask); 1479 | ExposureMask | StructureNotifyMask);
1003 1480
1004 termwin_ev.start (display, top); 1481 termwin_ev.start (display, top);
1005 1482
1006 /* vt cursor: Black-on-White is standard, but this is more popular */ 1483 /* vt cursor: Black-on-White is standard, but this is more popular */
1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1008
1009#ifdef HAVE_SCROLLBARS
1010 /* cursor scrollBar: Black-on-White */
1011 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1012#endif
1013 1485
1014 /* the vt window */ 1486 /* the vt window */
1015 vt = XCreateSimpleWindow (xdisp, top, 1487 vt = XCreateSimpleWindow (dpy, top,
1016 window_vt_x, window_vt_y, 1488 window_vt_x, window_vt_y,
1017 width, height, 1489 width, height,
1018 0, 1490 0,
1019 pix_colors_focused[Color_fg], 1491 pix_colors_focused[Color_fg],
1020 pix_colors_focused[Color_bg]); 1492 pix_colors_focused[Color_bg]);
1021 1493
1022 attributes.bit_gravity = NorthWestGravity; 1494 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1495 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1496
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1497 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1498
1027 if (OPTION (Opt_pointerBlank)) 1499 if (option (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1500 vt_emask |= PointerMotionMask;
1029 else 1501 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1502 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1503
1032 vt_select_input (); 1504 vt_select_input ();
1033 1505
1034 vt_ev.start (display, vt); 1506 vt_ev.start (display, vt);
1035 1507
1036#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL
1038 && !OPTION (Opt_transparent))
1039 {
1040 const char *p = rs[Rs_backgroundPixmap];
1041
1042 if ((p = strchr (p, ';')) != NULL)
1043 {
1044 p++;
1045 scale_pixmap (p);
1046 }
1047
1048 set_bgPixmap (rs[Rs_backgroundPixmap]);
1049 scr_touch (true);
1050 }
1051#endif
1052
1053 /* graphics context for the vt window */ 1508 /* graphics context for the vt window */
1054 gcvalue.foreground = pix_colors[Color_fg]; 1509 gcvalue.foreground = pix_colors[Color_fg];
1055 gcvalue.background = pix_colors[Color_bg]; 1510 gcvalue.background = pix_colors[Color_bg];
1056 gcvalue.graphics_exposures = 1; 1511 gcvalue.graphics_exposures = 0;
1057 1512
1058 gc = XCreateGC (xdisp, vt, 1513 gc = XCreateGC (dpy, vt,
1059 GCForeground | GCBackground | GCGraphicsExposures, 1514 GCForeground | GCBackground | GCGraphicsExposures,
1060 &gcvalue); 1515 &gcvalue);
1061 1516
1062 drawable = new rxvt_drawable (this, vt); 1517 drawable = new rxvt_drawable (this, vt);
1063
1064#ifdef RXVT_SCROLLBAR
1065 gcvalue.foreground = pix_colors[Color_topShadow];
1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1071#endif
1072 1518
1073#ifdef OFF_FOCUS_FADING 1519#ifdef OFF_FOCUS_FADING
1074 // initially we are in unfocused state 1520 // initially we are in unfocused state
1075 if (rs[Rs_fade]) 1521 if (rs[Rs_fade])
1076 pix_colors = pix_colors_unfocused; 1522 pix_colors = pix_colors_unfocused;
… …
1082 1528
1083/* ------------------------------------------------------------------------- * 1529/* ------------------------------------------------------------------------- *
1084 * GET TTY CURRENT STATE * 1530 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */ 1531 * ------------------------------------------------------------------------- */
1086void 1532void
1087rxvt_get_ttymode (ttymode_t *tio, int erase) 1533rxvt_get_ttymode (struct termios *tio, int erase)
1088{ 1534{
1089#ifdef HAVE_TERMIOS_H
1090 /* 1535 /*
1091 * standard System V termios interface 1536 * standard System V termios interface
1092 */ 1537 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1538 if (tcgetattr (STDIN_FILENO, tio) < 0)
1094 { 1539 {
1095 // return error - use system defaults, 1540 // return error - use system defaults,
1096 // where possible, and zero elsewhere 1541 // where possible, and zero elsewhere
1097 memset (tio, 0, sizeof (ttymode_t)); 1542 memset (tio, 0, sizeof (struct termios));
1098 1543
1099 tio->c_cc[VINTR] = CINTR; 1544 tio->c_cc[VINTR] = CINTR;
1100 tio->c_cc[VQUIT] = CQUIT; 1545 tio->c_cc[VQUIT] = CQUIT;
1101 tio->c_cc[VERASE] = CERASE; 1546 tio->c_cc[VERASE] = CERASE;
1102#ifdef VERASE2 1547#ifdef VERASE2
… …
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1606 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE) 1607# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE 1608 | ECHOCTL | ECHOKE
1164# endif 1609# endif
1165 | ECHOE | ECHOK); 1610 | ECHOE | ECHOK);
1166# else /* HAVE_TERMIOS_H */
1167
1168 /*
1169 * sgtty interface
1170 */
1171
1172 /* get parameters -- gtty */
1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1174 {
1175 tio->sg.sg_erase = CERASE; /* ^H */
1176 tio->sg.sg_kill = CKILL; /* ^U */
1177 }
1178
1179 if (erase != -1)
1180 tio->sg.sg_erase = (char)erase;
1181
1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1183
1184 /* get special characters */
1185 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1186 {
1187 tio->tc.t_intrc = CINTR; /* ^C */
1188 tio->tc.t_quitc = CQUIT; /* ^\ */
1189 tio->tc.t_startc = CSTART; /* ^Q */
1190 tio->tc.t_stopc = CSTOP; /* ^S */
1191 tio->tc.t_eofc = CEOF; /* ^D */
1192 tio->tc.t_brkc = -1;
1193 }
1194
1195 /* get local special chars */
1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1197 {
1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1200 tio->lc.t_rprntc = CRPRNT; /* ^R */
1201 tio->lc.t_flushc = CFLUSH; /* ^O */
1202 tio->lc.t_werasc = CWERASE; /* ^W */
1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1204 }
1205 /* get line discipline */
1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1207# ifdef NTTYDISC
1208 tio->line = NTTYDISC;
1209# endif /* NTTYDISC */
1210
1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1212#endif /* HAVE_TERMIOS_H */
1213 1611
1214 /* 1612 /*
1215 * Debugging 1613 * Debugging
1216 */ 1614 */
1217#ifdef DEBUG_TTYMODE 1615#ifdef DEBUG_TTYMODE
1218#ifdef HAVE_TERMIOS_H
1219 /* c_iflag bits */ 1616 /* c_iflag bits */
1220 fprintf (stderr, "Input flags\n"); 1617 fprintf (stderr, "Input flags\n");
1221 1618
1222 /* cpp token stringize doesn't work on all machines <sigh> */ 1619 /* cpp token stringize doesn't work on all machines <sigh> */
1223# define FOO(flag,name) \ 1620# define FOO(flag,name) \
… …
1286 FOO (VLNEXT, "VLNEXT"); 1683 FOO (VLNEXT, "VLNEXT");
1287# endif 1684# endif
1288 1685
1289 fprintf (stderr, "\n"); 1686 fprintf (stderr, "\n");
1290# undef FOO 1687# undef FOO
1291# endif /* HAVE_TERMIOS_H */ 1688#endif /* DEBUG_TTYMODE */
1292#endif /* DEBUG_TTYMODE */
1293} 1689}
1294 1690
1295/*----------------------------------------------------------------------*/ 1691/*----------------------------------------------------------------------*/
1296/* 1692/*
1297 * Run the command in a subprocess and return a file descriptor for the 1693 * Run the command in a subprocess and return a file descriptor for the
… …
1318 else 1714 else
1319#endif 1715#endif
1320 if (!pty->get ()) 1716 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1717 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1718
1719 int er;
1720
1721#ifndef NO_BACKSPACE_KEY
1722 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1723 er = rs[Rs_backspace_key][0];
1724 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1725 er = '\177'; /* the initial state anyway */
1726 else
1727#endif
1728 er = -1;
1729
1730 rxvt_get_ttymode (&tio, er);
1731 /* init terminal attributes */
1732 cfsetospeed (&tio, BAUDRATE);
1733 cfsetispeed (&tio, BAUDRATE);
1734 tcsetattr (pty->tty, TCSANOW, &tio);
1323 pty->set_utf8_mode (enc_utf8); 1735 pty->set_utf8_mode (enc_utf8);
1324 1736
1325 /* set initial window size */ 1737 /* set initial window size */
1326 tt_winch (); 1738 tt_winch ();
1327
1328 int er;
1329
1330#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0];
1333 else if (strcmp (key_backspace, "DEC") == 0)
1334 er = '\177'; /* the initial state anyway */
1335 else
1336#endif
1337 er = -1;
1338
1339 rxvt_get_ttymode (&tio, er);
1340 1739
1341#if ENABLE_FRILLS 1740#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1741 if (rs[Rs_pty_fd])
1343 return; 1742 return;
1344#endif 1743#endif
… …
1375 } 1774 }
1376 1775
1377 _exit (EXIT_FAILURE); 1776 _exit (EXIT_FAILURE);
1378 1777
1379 default: 1778 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1779 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1780 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1781
1383 pty->close_tty (); 1782 pty->close_tty ();
1384 1783
1385 child_ev.start (cmd_pid); 1784 child_ev.start (cmd_pid);
1386 1785
… …
1399int 1798int
1400rxvt_term::run_child (const char *const *argv) 1799rxvt_term::run_child (const char *const *argv)
1401{ 1800{
1402 char *login; 1801 char *login;
1403 1802
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1803 if (option (Opt_console))
1804 {
1407 { /* be virtual console, fail silently */ 1805 /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1806#ifdef TIOCCONS
1409 unsigned int on = 1; 1807 unsigned int on = 1;
1410 1808
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1809 ioctl (STDIN_FILENO, TIOCCONS, &on);
1412#elif defined (SRIOCSREDIR) 1810#elif defined (SRIOCSREDIR)
… …
1414 1812
1415 fd = open (CONSOLE, O_WRONLY, 0); 1813 fd = open (CONSOLE, O_WRONLY, 0);
1416 if (fd >= 0) 1814 if (fd >= 0)
1417 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1815 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1418 close (fd); 1816 close (fd);
1419#endif /* SRIOCSREDIR */ 1817#endif /* SRIOCSREDIR */
1420 } 1818 }
1421 1819
1422 /* reset signals and spin off the command interpreter */ 1820 /* reset signals and spin off the command interpreter */
1423 signal (SIGINT, SIG_DFL); 1821 signal (SIGINT, SIG_DFL);
1424 signal (SIGQUIT, SIG_DFL); 1822 signal (SIGQUIT, SIG_DFL);
… …
1431 */ 1829 */
1432#ifdef SIGTSTP 1830#ifdef SIGTSTP
1433 signal (SIGTSTP, SIG_IGN); 1831 signal (SIGTSTP, SIG_IGN);
1434 signal (SIGTTIN, SIG_IGN); 1832 signal (SIGTTIN, SIG_IGN);
1435 signal (SIGTTOU, SIG_IGN); 1833 signal (SIGTTOU, SIG_IGN);
1436#endif /* SIGTSTP */ 1834#endif /* SIGTSTP */
1437
1438 // unblock signals (signals are blocked by iom.C
1439 sigset_t ss;
1440 sigemptyset (&ss);
1441 sigprocmask (SIG_SETMASK, &ss, 0);
1442 1835
1443 /* command interpreter path */ 1836 /* command interpreter path */
1444 if (argv != NULL) 1837 if (argv)
1445 { 1838 {
1446# ifdef DEBUG_CMD 1839# ifdef DEBUG_CMD
1447 int i; 1840 int i;
1448 1841
1449 for (i = 0; argv[i]; i++) 1842 for (i = 0; argv[i]; i++)
… …
1458 const char *argv0, *shell; 1851 const char *argv0, *shell;
1459 1852
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1853 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1854 shell = "/bin/sh";
1462 1855
1463 argv0 = (const char *)rxvt_r_basename (shell); 1856 argv0 = rxvt_basename (shell);
1464 1857
1465 if (OPTION (Opt_loginShell)) 1858 if (option (Opt_loginShell))
1466 { 1859 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1860 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1468 1861
1469 login[0] = '-'; 1862 login[0] = '-';
1470 strcpy (&login[1], argv0); 1863 strcpy (&login[1], argv0);
1471 argv0 = login; 1864 argv0 = login;
1472 } 1865 }
1473 1866
1474 execlp (shell, argv0, NULL); 1867 execlp (shell, argv0, (char *)0);
1475 /* no error message: STDERR is closed! */ 1868 /* no error message: STDERR is closed! */
1476 } 1869 }
1477 1870
1478 return -1; 1871 return -1;
1479} 1872}

Diff Legend

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