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

Diff Legend

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