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.159 by root, Mon Jan 30 02:21:20 2006 UTC vs.
Revision 1.283 by sf-exg, Wed Oct 13 23:04:57 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 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 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 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 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 "rgb:00/00/00", 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);
218} 553 set_option (Opt_skipScroll);
219 554 set_option (Opt_secondaryScreen);
220void 555 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 556 set_option (Opt_pastableTabs);
222{ 557 set_option (Opt_intensityStyles);
223 int i; 558 set_option (Opt_iso14755);
224 559 set_option (Opt_iso14755_52);
225 /* 560 set_option (Opt_buffered);
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)
230 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO);
233 }
234 else if (i > STDIN_FILENO)
235 {
236 dup2 (i, STDIN_FILENO);
237 close (i);
238 }
239
240 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} 561}
253 562
254/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
255const char ** 564const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
257{ 566{
258 int i, r_argc; 567 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
261 569
262 /* 570 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 571 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 572 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 574 if (!strcmp (argv[r_argc], "-e"))
267 break; 575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
268 590
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 592
271 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
273 595
274 r_argv[i] = NULL; 596 r_argv[i] = NULL;
275 597
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]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
289 599
290 /* 600 /*
291 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
292 */ 602 */
293 603
… …
295 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
296 606
297 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
298 608
299 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
301 614
615 // using a local pointer decreases code size a lot
302 xa = display->xa; 616 xa = display->xa;
303 617
304#if ENABLE_FRILLS 618 set (display);
619 extract_resources ();
620
621#if XFT
305 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 624#endif
309 set (display);
310
311 extract_resources ();
312 625
313 free (r_argv); 626 free (r_argv);
627
628 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef)
630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639 gdk_pixbuf_xlib_init (dpy, display->screen);
640#endif
314 641
315#if ENABLE_PERL 642#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 643 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 644 rs[Rs_perl_ext_1] = "default";
318 645
… …
329 * set any defaults not already set 656 * set any defaults not already set
330 */ 657 */
331 if (cmd_argv && cmd_argv[0]) 658 if (cmd_argv && cmd_argv[0])
332 { 659 {
333 if (!rs[Rs_title]) 660 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 661 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
662
335 if (!rs[Rs_iconName]) 663 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 664 rs[Rs_iconName] = rs[Rs_title];
337 } 665 }
338 else 666 else
339 { 667 {
340 if (!rs[Rs_title]) 668 if (!rs[Rs_title])
341 rs[Rs_title] = rs[Rs_name]; 669 rs[Rs_title] = rs[Rs_name];
670
342 if (!rs[Rs_iconName]) 671 if (!rs[Rs_iconName])
343 rs[Rs_iconName] = rs[Rs_name]; 672 rs[Rs_iconName] = rs[Rs_name];
344 } 673 }
345 674
346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 675 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 682 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 683 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355 684
356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 685 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
357 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 686 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
687
688 if (rs[Rs_letterSpace])
689 letterSpace = atoi (rs[Rs_letterSpace]);
358#endif 690#endif
359 691
360#ifdef POINTER_BLANK 692#ifdef POINTER_BLANK
361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 693 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
362 pointerBlankDelay = i; 694 pointerBlankDelay = i;
… …
366 698
367 /* no point having a scrollbar without having any scrollback! */ 699 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 700 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 701 set_option (Opt_scrollBar, 0);
370 702
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 703 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 704 rs[Rs_cutchars] = CUTCHARS;
378 705
379#ifndef NO_BACKSPACE_KEY 706#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 707 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 708# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 709 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 710# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 711 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 712# 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 713#endif
394 714
395#ifndef NO_DELETE_KEY 715#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 716 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 717# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 718 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 719# else
400 key_delete = "\033[3~"; 720 rs[Rs_delete_key] = "\033[3~";
401# endif 721# 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 722#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 723
416#ifdef HAVE_SCROLLBARS 724 scrollBar.setup (this);
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif
419 725
420#ifdef XTERM_REVERSE_VIDEO 726#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 727 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 728 if (option (Opt_reverseVideo))
423 { 729 {
424 if (!rs[Rs_color + Color_fg]) 730 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 731 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
732
426 if (!rs[Rs_color + Color_bg]) 733 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 734 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 735 }
429#endif 736#endif
430 737
… …
432 if (!rs[Rs_color + i]) 739 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 740 rs[Rs_color + i] = def_colorName[i];
434 741
435#ifndef XTERM_REVERSE_VIDEO 742#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 743 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 744 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 745 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 746#endif
440 747
441 /* convenient aliases for setting fg/bg to colors */ 748 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 749 color_aliases (Color_fg);
443 color_aliases (Color_bg); 750 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 751#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 752 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 753 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 754#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 755 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 756 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 757 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 758#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 759 color_aliases (Color_BD);
453 color_aliases (Color_UL); 760 color_aliases (Color_UL);
454 color_aliases (Color_RV); 761 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 762#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 763
457 if (!rs[Rs_color + Color_border]) 764 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 765 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 766
460 return cmd_argv; 767 return cmd_argv;
768}
769
770/*----------------------------------------------------------------------*/
771void
772rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
773{
774 this->envv = envv;
775
776 SET_R (this);
777 set_locale ("");
778 set_environ (envv); // a few things in X do not call setlocale :(
779
780 init_vars ();
781
782 const char **cmd_argv = init_resources (argc, argv);
783
784#ifdef KEYSYM_RESOURCE
785 keyboard->register_done ();
786#endif
787
788 if (const char *path = rs[Rs_chdir])
789 if (*path) // ignored if empty
790 {
791 if (*path != '/')
792 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
793
794 if (chdir (path))
795 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
796 }
797
798 if (option (Opt_scrollBar))
799 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
800
801 pty = ptytty::create ();
802
803 create_windows (argc, argv);
804
805 init_xlocale ();
806
807 scr_poweron (); // initialize screen
808
809#if 0
810 XSynchronize (dpy, True);
811#endif
812
813 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */
815#ifdef HAVE_BG_PIXMAP
816 {
817 bgPixmap.set_target (this);
818 bgPixmap.invalidate ();
819
820#ifdef ENABLE_TRANSPARENCY
821 if (option (Opt_transparent))
822 {
823 bgPixmap.set_transparent ();
824
825 if (rs [Rs_blurradius])
826 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
827
828 if (ISSET_PIXCOLOR (Color_tint))
829 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
830
831 if (rs [Rs_shade])
832 bgPixmap.set_shade (rs [Rs_shade]);
833
834 bgPixmap.set_root_pixmap ();
835 XSelectInput (dpy, display->root, PropertyChangeMask);
836 rootwin_ev.start (display, display->root);
837 }
838#endif
839
840#ifdef BG_IMAGE_FROM_FILE
841 if (rs[Rs_backgroundPixmap])
842 {
843 const char *p = rs[Rs_backgroundPixmap];
844
845 if ((p = strchr (p, ';')) != 0)
846 {
847 p++;
848 bgPixmap.set_geometry (p);
849 }
850 else
851 bgPixmap.set_defaultGeometry ();
852
853 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
854 if (!bgPixmap.window_position_sensitive ())
855 update_background ();
856 }
857#endif
858 }
859#endif
860
861#if ENABLE_PERL
862 rootwin_ev.start (display, display->root);
863#endif
864
865 set_colorfgbg ();
866
867 init_command (cmd_argv);
868
869 free (cmd_argv);
870
871 if (pty->pty >= 0)
872 pty_ev.start (pty->pty, ev::READ);
873
874 HOOK_INVOKE ((this, HOOK_START, DT_END));
875
876#if ENABLE_XEMBED
877 if (rs[Rs_embed])
878 {
879 long info[2] = { 0, XEMBED_MAPPED };
880
881 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
882 32, PropModeReplace, (unsigned char *)&info, 2);
883 }
884#endif
885
886 XMapWindow (dpy, vt);
887 XMapWindow (dpy, parent[0]);
888
889 refresh_check ();
461} 890}
462 891
463/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
464void 893void
465rxvt_term::init_env () 894rxvt_term::init_env ()
466{ 895{
467 int i; 896 int i;
468 unsigned int u;
469 char *val; 897 char *val;
470 898
471#ifdef DISPLAY_IS_IP 899#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 900 /* 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 901 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 909 */
482 val = rxvt_network_display (rs[Rs_display_name]); 910 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 911 rs[Rs_display_name] = (const char *)val;
484 912
485 if (val == NULL) 913 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 914#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 915 val = XDisplayString (dpy);
488 916
489 if (rs[Rs_display_name] == NULL) 917 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 918 rs[Rs_display_name] = val; /* use broken `:0' value */
491 919
492 i = strlen (val); 920 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 921 env_display = (char *)rxvt_malloc (i + 9);
494 922
495 sprintf (env_display, "DISPLAY=%s", val); 923 sprintf (env_display, "DISPLAY=%s", val);
496 924
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 926
… …
519 else 947 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 948 putenv ("COLORTERM=" COLORTERMENVFULL);
521 949
522 if (rs[Rs_term_name] != NULL) 950 if (rs[Rs_term_name] != NULL)
523 { 951 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 952 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 953 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 954 putenv (env_term);
527 } 955 }
528 else 956 else
529 putenv ("TERM=" TERMENV); 957 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 959#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 960 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 961 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 962 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 963 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 964#endif /* HAVE_UNSETENV */
537} 965}
538 966
539/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
540/* 968/*
541 * This is more or less stolen straight from XFree86 xterm. 969 * This is more or less stolen straight from XFree86 xterm.
… …
562 990
563 this->locale = "C"; 991 this->locale = "C";
564 } 992 }
565 993
566 994
567 this->locale = rxvt_strdup (this->locale); 995 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 996 SET_LOCALE (this->locale);
569 mbstate.reset (); 997 mbstate.reset ();
570#endif 998#endif
571 999
572#if HAVE_NL_LANGINFO 1000#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 1044 * Initialize the command connection.
617 * This should be called after the X server connection is established. 1045 * This should be called after the X server connection is established.
618 */ 1046 */
619 1047
620#ifdef META8_OPTION 1048#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1049 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 1050#endif
623 1051
624 get_ourmods (); 1052 get_ourmods ();
625 1053
626 if (!OPTION (Opt_scrollTtyOutput)) 1054 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 1055 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 1056 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 1057 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 1058 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 1059 priv_modes |= PrivMode_smoothScroll;
632 1060
633#ifndef NO_BACKSPACE_KEY 1061#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 1062 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 1063 priv_modes |= PrivMode_HaveBackSpace;
636#endif 1064#endif
637 1065
638 /* add value for scrollBar */ 1066 /* add value for scrollBar */
639 if (scrollBar.state) 1067 if (scrollBar.state)
… …
645 run_command (argv); 1073 run_command (argv);
646} 1074}
647 1075
648/*----------------------------------------------------------------------*/ 1076/*----------------------------------------------------------------------*/
649void 1077void
650rxvt_term::Get_Colours () 1078rxvt_term::get_colours ()
651{ 1079{
652 int i; 1080 int i;
653 1081
654#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 1083 pix_colors = pix_colors_focused;
656#endif 1084#endif
657 1085
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1086 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 1087 {
1088 const char *name = rs[Rs_color + i];
1089
1090 if (!name)
1091 continue;
1092
660 rxvt_color xcol; 1093 rxvt_color xcol;
661 1094
662 if (!rs[Rs_color + i]) 1095 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 1096 {
667#ifndef XTERM_REVERSE_VIDEO 1097#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 1098 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 1099 name = def_colorName [1 - i];
670 else 1100 else
671#endif 1101#endif
672 rs[Rs_color + i] = def_colorName[i]; 1102 name = def_colorName [i];
673 1103
674 if (!rs[Rs_color + i]) 1104 if (!name)
675 continue; 1105 continue;
676 1106
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1107 if (!set_color (xcol, name))
678 { 1108 {
679 switch (i) 1109 switch (i)
680 { 1110 {
681 case Color_fg: 1111 case Color_fg:
682 case Color_bg: 1112 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 1113 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 1114 name = "";
686 break; 1115 break;
687#ifndef NO_CURSORCOLOR 1116#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 1117 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 1118#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 1119 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 1120 name = rs[Rs_color + Color_fg];
1121 xcol.set (this, name);
694 break; 1122 break;
695 default: 1123 default:
696 xcol = pix_colors[Color_bg]; /* None */ 1124 name = rs[Rs_color + Color_bg];
1125 xcol.set (this, name);
697 break; 1126 break;
698 } 1127 }
699 } 1128 }
700 } 1129 }
701 1130
702 pix_colors[i] = xcol; 1131 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 1132 rs[Rs_color + i] = name;
704 } 1133 }
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 1134
712 if (depth <= 2) 1135 if (depth <= 2)
713 { 1136 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1137 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]; 1138 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]; 1139 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 1140 }
718 1141
719 /* 1142 /*
720 * get scrollBar shadow colors 1143 * get scrollBar shadow colors
721 * 1144 *
722 * The calculations of topShadow/bottomShadow values are adapted 1145 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 1146 * from the fvwm window manager.
724 */ 1147 */
725#ifdef KEEP_SCROLLCOLOR 1148#ifdef RXVT_SCROLLBAR
726
727 if (depth <= 2) 1149 if (depth <= 2)
728 { 1150 {
729 /* Monochrome */ 1151 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1152 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1153 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1154 alias_color (Color_bottomShadow, Color_bg);
733 } 1155 }
734 else 1156 else
735 { 1157 {
736 rxvt_color xcol[2]; 1158 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 1159
741 xcol[1] = pix_colors[Color_scroll]; 1160 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 1161 pix_colors [Color_scroll].get (cscroll);
743
744 rxvt_rgba c0, c1;
745
746 xcol[0].get (this, c0);
747 xcol[1].get (this, c1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 1162
751 /* topShadowColor */ 1163 /* topShadowColor */
752 if (!xcol[1].set (this, 1164 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 1165 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 1166 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 1167 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 1168 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 1169 cscroll.a)
758 )); 1170 ))
759 xcol[1] = pix_colors[Color_White]; 1171 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 1172 }
763#endif /* KEEP_SCROLLCOLOR */ 1173#endif
1174
1175#ifdef OFF_FOCUS_FADING
1176 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1177 update_fade_color (i);
1178#endif
764} 1179}
765 1180
766/*----------------------------------------------------------------------*/ 1181/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 1182/* color aliases, fg/bg bright-bold */
768void 1183void
… …
771 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1186 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772 { 1187 {
773 int i = atoi (rs[Rs_color + idx]); 1188 int i = atoi (rs[Rs_color + idx]);
774 1189
775 if (i >= 8 && i <= 15) 1190 if (i >= 8 && i <= 15)
776 { /* bright colors */ 1191 /* bright colors */
777 i -= 8;
778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1192 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779 return; 1193 else if (i >= 0 && i <= 7)
780 } 1194 /* normal colors */
781
782 if (i >= 0 && i <= 7) /* normal colors */
783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1195 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784 } 1196 }
785} 1197}
786 1198
787/*----------------------------------------------------------------------*/ 1199/*----------------------------------------------------------------------*/
… …
807 1219
808 if (rsmod 1220 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1221 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 1222 requestedmeta = rsmod[3] - '0';
811 1223
812 map = XGetModifierMapping (xdisp); 1224 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 1225 kc = map->modifiermap;
814 1226
815 for (i = 1; i < 6; i++) 1227 for (i = 1; i < 6; i++)
816 { 1228 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1229 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 1231 for (j = map->max_keypermod; j--; k++)
820 { 1232 {
821 if (kc[k] == 0) 1233 if (kc[k] == 0)
822 break; 1234 break;
823 1235
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1236 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 1237 {
826 case XK_Num_Lock: 1238 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 1239 ModNumLockMask = modmasks[i - 1];
828 continue; 1240 continue;
829 1241
… …
869 : realalt ? realalt 1281 : realalt ? realalt
870 : 0; 1282 : 0;
871 1283
872 if (i) 1284 if (i)
873 ModMetaMask = modmasks[i - 1]; 1285 ModMetaMask = modmasks[i - 1];
1286}
1287
1288void
1289rxvt_term::set_icon (const char *file)
1290{
1291#ifdef HAVE_AFTERIMAGE
1292 init_asv ();
1293
1294 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1295 if (!im)
1296 {
1297 rxvt_warn ("Loading image icon failed, continuing without.\n");
1298 return;
1299 }
1300
1301 unsigned int w = im->width;
1302 unsigned int h = im->height;
1303
1304 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1305 {
1306 rxvt_warn ("Icon image too big, continuing without.\n");
1307 destroy_asimage (&im);
1308 return;
1309 }
1310
1311 ASImage *result = scale_asimage (asv, im,
1312 w, h, ASA_ARGB32,
1313 100, ASIMAGE_QUALITY_DEFAULT);
1314 destroy_asimage (&im);
1315
1316 if (!result)
1317 {
1318 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1319 return;
1320 }
1321
1322 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1323 if (buffer)
1324 {
1325 ARGB32 *asbuf = result->alt.argb32;
1326 buffer [0] = w;
1327 buffer [1] = h;
1328
1329 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i];
1331
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer);
1335 }
1336 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1338
1339 destroy_asimage (&result);
1340#endif
1341
1342#ifdef HAVE_PIXBUF
1343 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1344 if (!pixbuf)
1345 {
1346 rxvt_warn ("Loading image icon failed, continuing without.\n");
1347 return;
1348 }
1349
1350 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1351 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1352
1353 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1354 {
1355 rxvt_warn ("Icon image too big, continuing without.\n");
1356 g_object_unref (pixbuf);
1357 return;
1358 }
1359
1360 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1361 {
1362 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1363 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1364 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1365
1366 buffer [0] = w;
1367 buffer [1] = h;
1368 for (int i = 0; i < h; i++)
1369 {
1370 for (int j = 0; j < w; j++)
1371 {
1372 unsigned char *pixel = row + j * channels;
1373 long value;
1374
1375 if (channels == 4)
1376 value = pixel[3];
1377 else
1378 value = (unsigned char)0x00ff;
1379
1380 value = (value << 8) + pixel[0];
1381 value = (value << 8) + pixel[1];
1382 value = (value << 8) + pixel[2];
1383 buffer[(i * w + j) + 2] = value;
1384 }
1385
1386 row += rowstride;
1387 }
1388
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer);
1392 }
1393 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1395
1396 g_object_unref (pixbuf);
1397#endif
874} 1398}
875 1399
876/*----------------------------------------------------------------------*/ 1400/*----------------------------------------------------------------------*/
877/* rxvt_Create_Windows () - Open and map the window */ 1401/* rxvt_Create_Windows () - Open and map the window */
878void 1402void
879rxvt_term::create_windows (int argc, const char *const *argv) 1403rxvt_term::create_windows (int argc, const char *const *argv)
880{ 1404{
881 XClassHint classHint; 1405 XClassHint classHint;
882 XWMHints wmHint; 1406 XWMHints wmHint;
883#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
884 MWMHints mwmhints; 1408 MWMHints mwmhints = { };
885#endif 1409#endif
886 XGCValues gcvalue; 1410 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 1411 XSetWindowAttributes attributes;
888 Window top, parent; 1412 Window top, parent;
889 1413
890 dLocal (Display *, xdisp); 1414 dLocal (Display *, dpy);
891 1415
892 /* grab colors before netscape does */ 1416 /* grab colors before netscape does */
893 Get_Colours (); 1417 get_colours ();
894 1418
895 if (!set_fonts ()) 1419 if (!set_fonts ())
896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1420 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897 1421
898 parent = display->root; 1422 parent = display->root;
899 1423
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1424 attributes.override_redirect = !!option (Opt_override_redirect);
901 1425
902#if ENABLE_FRILLS 1426#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 1427 if (option (Opt_borderLess))
904 { 1428 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1429 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 1430 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1431 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908 attributes.override_redirect = true; 1432 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 1433 }
911 else 1434 else
912 { 1435 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 1436 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 1437 }
916 } 1438 }
917 else
918 mwmhints.flags = 0;
919#endif 1439#endif
920 1440
921#if ENABLE_XEMBED 1441#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 1442 if (rs[Rs_embed])
923 { 1443 {
924 XWindowAttributes wattr; 1444 XWindowAttributes wattr;
925 1445
926 parent = strtol (rs[Rs_embed], 0, 0); 1446 parent = strtol (rs[Rs_embed], 0, 0);
927 1447
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1448 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1449 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 1450
931 window_calc (wattr.width, wattr.height); 1451 window_calc (wattr.width, wattr.height);
932 } 1452 }
933#endif 1453#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 1457 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 1458 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 1459 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 1460 attributes.colormap = cmap;
941 1461
942 top = XCreateWindow (xdisp, parent, 1462 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 1463 szHint.x, szHint.y,
944 szHint.width, szHint.height, 1464 szHint.width, szHint.height,
945 ext_bwidth, 1465 ext_bwidth,
946 depth, InputOutput, visual, 1466 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1467 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
950 this->parent[0] = top; 1470 this->parent[0] = top;
951 1471
952 old_width = szHint.width; 1472 old_width = szHint.width;
953 old_height = szHint.height; 1473 old_height = szHint.height;
954 1474
955 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1475 set_title (rs [Rs_title]);
956 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1476 set_icon_name (rs [Rs_iconName]);
957 1477
958 classHint.res_name = (char *)rs[Rs_name]; 1478 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 1479 classHint.res_class = (char *)RESCLASS;
960 1480
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1481 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 1482 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1483 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 1484 wmHint.window_group = top;
965 1485
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1486 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 1487 &szHint, &wmHint, &classHint);
1488#if ENABLE_EWMH
1489 /*
1490 * set up icon hint
1491 * rs [Rs_iconfile] is path to icon
1492 */
1493
1494 if (rs [Rs_iconfile])
1495 {
1496 set_icon (rs [Rs_iconfile]);
1497 }
1498#endif
968 1499
969#if ENABLE_FRILLS 1500#if ENABLE_FRILLS
970 if (mwmhints.flags) 1501 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1502 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1503 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 1504#endif
974 1505
975 Atom protocols[] = { 1506 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 1507 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 1508#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 1509 xa[XA_NET_WM_PING],
979#endif 1510#endif
980 }; 1511 };
981 1512
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1513 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 1514
984#if ENABLE_FRILLS 1515#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 1516 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1517 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 1518#endif
988 1519
989#if ENABLE_EWMH 1520#if ENABLE_EWMH
990 long pid = getpid (); 1521 long pid = getpid ();
991 1522
992 XChangeProperty (xdisp, top, 1523 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1524 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 1525 PropModeReplace, (unsigned char *)&pid, 1);
995 1526
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1527 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 1528#endif
998 1529
999 XSelectInput (xdisp, top, 1530 XSelectInput (dpy, top,
1000 KeyPressMask 1531 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1532#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1533 | KeyReleaseMask
1003#endif 1534#endif
1004 | FocusChangeMask | VisibilityChangeMask 1535 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1536 | ExposureMask | StructureNotifyMask);
1006 1537
1007 termwin_ev.start (display, top); 1538 termwin_ev.start (display, top);
1008 1539
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1540 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1541 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011
1012#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1015#endif
1016 1542
1017 /* the vt window */ 1543 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1544 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1545 window_vt_x, window_vt_y,
1020 width, height, 1546 width, height,
1021 0, 1547 0,
1022 pix_colors_focused[Color_fg], 1548 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1549 pix_colors_focused[Color_bg]);
1024 1550
1025 attributes.bit_gravity = NorthWestGravity; 1551 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1552 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1553
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1554 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1555
1030 if (OPTION (Opt_pointerBlank)) 1556 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1557 vt_emask |= PointerMotionMask;
1032 else 1558 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1559 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1560
1035 vt_select_input (); 1561 vt_select_input ();
1036 1562
1037 vt_ev.start (display, vt); 1563 vt_ev.start (display, vt);
1038 1564
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041 && !OPTION (Opt_transparent))
1042 {
1043 const char *p = rs[Rs_backgroundPixmap];
1044
1045 if ((p = strchr (p, ';')) != NULL)
1046 {
1047 p++;
1048 scale_pixmap (p);
1049 }
1050
1051 set_bgPixmap (rs[Rs_backgroundPixmap]);
1052 scr_touch (true);
1053 }
1054#endif
1055
1056 /* graphics context for the vt window */ 1565 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1566 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1567 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1568 gcvalue.graphics_exposures = 0;
1060 1569
1061 gc = XCreateGC (xdisp, vt, 1570 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1571 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1572 &gcvalue);
1064 1573
1065 drawable = new rxvt_drawable (this, vt); 1574 drawable = new rxvt_drawable (this, vt);
1066
1067#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1074#endif
1075 1575
1076#ifdef OFF_FOCUS_FADING 1576#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1577 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1578 if (rs[Rs_fade])
1079 pix_colors = pix_colors_unfocused; 1579 pix_colors = pix_colors_unfocused;
1080#endif 1580#endif
1081 1581
1082 pointer_unblank (); 1582 pointer_unblank ();
1083 scr_recolour (); 1583 scr_recolour ();
1084}
1085
1086/* ------------------------------------------------------------------------- *
1087 * GET TTY CURRENT STATE *
1088 * ------------------------------------------------------------------------- */
1089void
1090rxvt_get_ttymode (ttymode_t *tio, int erase)
1091{
1092#ifdef HAVE_TERMIOS_H
1093 /*
1094 * standard System V termios interface
1095 */
1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1097 {
1098 // return error - use system defaults,
1099 // where possible, and zero elsewhere
1100 memset (tio, 0, sizeof (ttymode_t));
1101
1102 tio->c_cc[VINTR] = CINTR;
1103 tio->c_cc[VQUIT] = CQUIT;
1104 tio->c_cc[VERASE] = CERASE;
1105#ifdef VERASE2
1106 tio->c_cc[VERASE2] = CERASE2;
1107#endif
1108 tio->c_cc[VKILL] = CKILL;
1109 tio->c_cc[VSTART] = CSTART;
1110 tio->c_cc[VSTOP] = CSTOP;
1111 tio->c_cc[VSUSP] = CSUSP;
1112# ifdef VDSUSP
1113 tio->c_cc[VDSUSP] = CDSUSP;
1114# endif
1115# ifdef VREPRINT
1116 tio->c_cc[VREPRINT] = CRPRNT;
1117# endif
1118# ifdef VDISCRD
1119 tio->c_cc[VDISCRD] = CFLUSH;
1120# endif
1121# ifdef VWERSE
1122 tio->c_cc[VWERSE] = CWERASE;
1123# endif
1124# ifdef VLNEXT
1125 tio->c_cc[VLNEXT] = CLNEXT;
1126# endif
1127 }
1128
1129 tio->c_cc[VEOF] = CEOF;
1130 tio->c_cc[VEOL] = VDISABLE;
1131# ifdef VEOL2
1132 tio->c_cc[VEOL2] = VDISABLE;
1133# endif
1134# ifdef VSWTC
1135 tio->c_cc[VSWTC] = VDISABLE;
1136# endif
1137# ifdef VSWTCH
1138 tio->c_cc[VSWTCH] = VDISABLE;
1139# endif
1140# if VMIN != VEOF
1141 tio->c_cc[VMIN] = 1;
1142# endif
1143# if VTIME != VEOL
1144 tio->c_cc[VTIME] = 0;
1145# endif
1146
1147 if (erase != -1)
1148 tio->c_cc[VERASE] = (char)erase;
1149
1150 /* input modes */
1151 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1152# ifdef IMAXBEL
1153 | IMAXBEL
1154# endif
1155 | IXON);
1156
1157 /* output modes */
1158 tio->c_oflag = (OPOST | ONLCR);
1159
1160 /* control modes */
1161 tio->c_cflag = (CS8 | CREAD);
1162
1163 /* line discipline modes */
1164 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1165# if defined (ECHOCTL) && defined (ECHOKE)
1166 | ECHOCTL | ECHOKE
1167# endif
1168 | ECHOE | ECHOK);
1169# else /* HAVE_TERMIOS_H */
1170
1171 /*
1172 * sgtty interface
1173 */
1174
1175 /* get parameters -- gtty */
1176 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1177 {
1178 tio->sg.sg_erase = CERASE; /* ^H */
1179 tio->sg.sg_kill = CKILL; /* ^U */
1180 }
1181
1182 if (erase != -1)
1183 tio->sg.sg_erase = (char)erase;
1184
1185 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1186
1187 /* get special characters */
1188 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1189 {
1190 tio->tc.t_intrc = CINTR; /* ^C */
1191 tio->tc.t_quitc = CQUIT; /* ^\ */
1192 tio->tc.t_startc = CSTART; /* ^Q */
1193 tio->tc.t_stopc = CSTOP; /* ^S */
1194 tio->tc.t_eofc = CEOF; /* ^D */
1195 tio->tc.t_brkc = -1;
1196 }
1197
1198 /* get local special chars */
1199 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1200 {
1201 tio->lc.t_suspc = CSUSP; /* ^Z */
1202 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1203 tio->lc.t_rprntc = CRPRNT; /* ^R */
1204 tio->lc.t_flushc = CFLUSH; /* ^O */
1205 tio->lc.t_werasc = CWERASE; /* ^W */
1206 tio->lc.t_lnextc = CLNEXT; /* ^V */
1207 }
1208 /* get line discipline */
1209 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1210# ifdef NTTYDISC
1211 tio->line = NTTYDISC;
1212# endif /* NTTYDISC */
1213
1214 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1215#endif /* HAVE_TERMIOS_H */
1216
1217 /*
1218 * Debugging
1219 */
1220#ifdef DEBUG_TTYMODE
1221#ifdef HAVE_TERMIOS_H
1222 /* c_iflag bits */
1223 fprintf (stderr, "Input flags\n");
1224
1225 /* cpp token stringize doesn't work on all machines <sigh> */
1226# define FOO(flag,name) \
1227 if ((tio->c_iflag) & flag) \
1228 fprintf (stderr, "%s ", name)
1229
1230 /* c_iflag bits */
1231 FOO (IGNBRK, "IGNBRK");
1232 FOO (BRKINT, "BRKINT");
1233 FOO (IGNPAR, "IGNPAR");
1234 FOO (PARMRK, "PARMRK");
1235 FOO (INPCK, "INPCK");
1236 FOO (ISTRIP, "ISTRIP");
1237 FOO (INLCR, "INLCR");
1238 FOO (IGNCR, "IGNCR");
1239 FOO (ICRNL, "ICRNL");
1240 FOO (IXON, "IXON");
1241 FOO (IXOFF, "IXOFF");
1242# ifdef IUCLC
1243 FOO (IUCLC, "IUCLC");
1244# endif
1245# ifdef IXANY
1246 FOO (IXANY, "IXANY");
1247# endif
1248# ifdef IMAXBEL
1249 FOO (IMAXBEL, "IMAXBEL");
1250# endif
1251
1252 fprintf (stderr, "\n");
1253
1254# undef FOO
1255# define FOO(entry, name) \
1256 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1257
1258 FOO (VINTR, "VINTR");
1259 FOO (VQUIT, "VQUIT");
1260 FOO (VERASE, "VERASE");
1261 FOO (VKILL, "VKILL");
1262 FOO (VEOF, "VEOF");
1263 FOO (VEOL, "VEOL");
1264# ifdef VEOL2
1265 FOO (VEOL2, "VEOL2");
1266# endif
1267# ifdef VSWTC
1268 FOO (VSWTC, "VSWTC");
1269# endif
1270# ifdef VSWTCH
1271 FOO (VSWTCH, "VSWTCH");
1272# endif
1273 FOO (VSTART, "VSTART");
1274 FOO (VSTOP, "VSTOP");
1275 FOO (VSUSP, "VSUSP");
1276# ifdef VDSUSP
1277 FOO (VDSUSP, "VDSUSP");
1278# endif
1279# ifdef VREPRINT
1280 FOO (VREPRINT, "VREPRINT");
1281# endif
1282# ifdef VDISCRD
1283 FOO (VDISCRD, "VDISCRD");
1284# endif
1285# ifdef VWERSE
1286 FOO (VWERSE, "VWERSE");
1287# endif
1288# ifdef VLNEXT
1289 FOO (VLNEXT, "VLNEXT");
1290# endif
1291
1292 fprintf (stderr, "\n");
1293# undef FOO
1294# endif /* HAVE_TERMIOS_H */
1295#endif /* DEBUG_TTYMODE */
1296} 1584}
1297 1585
1298/*----------------------------------------------------------------------*/ 1586/*----------------------------------------------------------------------*/
1299/* 1587/*
1300 * Run the command in a subprocess and return a file descriptor for the 1588 * Run the command in a subprocess and return a file descriptor for the
… …
1321 else 1609 else
1322#endif 1610#endif
1323 if (!pty->get ()) 1611 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1612 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 1613
1614 struct termios tio = def_tio;
1615
1616#ifndef NO_BACKSPACE_KEY
1617 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1618 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1619 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1620 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1621#endif
1622
1623 /* init terminal attributes */
1624 cfsetospeed (&tio, BAUDRATE);
1625 cfsetispeed (&tio, BAUDRATE);
1626 tcsetattr (pty->tty, TCSANOW, &tio);
1326 pty->set_utf8_mode (enc_utf8); 1627 pty->set_utf8_mode (enc_utf8);
1327 1628
1328 /* set initial window size */ 1629 /* set initial window size */
1329 tt_winch (); 1630 tt_winch ();
1330
1331 int er;
1332
1333#ifndef NO_BACKSPACE_KEY
1334 if (key_backspace[0] && !key_backspace[1])
1335 er = key_backspace[0];
1336 else if (strcmp (key_backspace, "DEC") == 0)
1337 er = '\177'; /* the initial state anyway */
1338 else
1339#endif
1340 er = -1;
1341
1342 rxvt_get_ttymode (&tio, er);
1343 1631
1344#if ENABLE_FRILLS 1632#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1633 if (rs[Rs_pty_fd])
1346 return; 1634 return;
1347#endif 1635#endif
… …
1378 } 1666 }
1379 1667
1380 _exit (EXIT_FAILURE); 1668 _exit (EXIT_FAILURE);
1381 1669
1382 default: 1670 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1671 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1672 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1673
1386 pty->close_tty (); 1674 pty->close_tty ();
1387 1675
1388 child_ev.start (cmd_pid); 1676 child_ev.start (cmd_pid);
1389 1677
… …
1402int 1690int
1403rxvt_term::run_child (const char *const *argv) 1691rxvt_term::run_child (const char *const *argv)
1404{ 1692{
1405 char *login; 1693 char *login;
1406 1694
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1695 if (option (Opt_console))
1696 {
1410 { /* be virtual console, fail silently */ 1697 /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1698#ifdef TIOCCONS
1412 unsigned int on = 1; 1699 unsigned int on = 1;
1413 1700
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1701 ioctl (STDIN_FILENO, TIOCCONS, &on);
1415#elif defined (SRIOCSREDIR) 1702#elif defined (SRIOCSREDIR)
… …
1417 1704
1418 fd = open (CONSOLE, O_WRONLY, 0); 1705 fd = open (CONSOLE, O_WRONLY, 0);
1419 if (fd >= 0) 1706 if (fd >= 0)
1420 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1707 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1421 close (fd); 1708 close (fd);
1422#endif /* SRIOCSREDIR */ 1709#endif /* SRIOCSREDIR */
1423 } 1710 }
1424 1711
1425 /* reset signals and spin off the command interpreter */ 1712 /* reset signals and spin off the command interpreter */
1426 signal (SIGINT, SIG_DFL); 1713 signal (SIGINT, SIG_DFL);
1427 signal (SIGQUIT, SIG_DFL); 1714 signal (SIGQUIT, SIG_DFL);
1428 signal (SIGCHLD, SIG_DFL); 1715 signal (SIGCHLD, SIG_DFL);
1429 signal (SIGHUP, SIG_DFL); 1716 signal (SIGHUP, SIG_DFL);
1430 signal (SIGPIPE, SIG_DFL); 1717 signal (SIGPIPE, SIG_DFL);
1431 /* 1718 /*
1432 * mimick login's behavior by disabling the job control signals 1719 * mimic login's behavior by disabling the job control signals
1433 * a shell that wants them can turn them back on 1720 * a shell that wants them can turn them back on
1434 */ 1721 */
1435#ifdef SIGTSTP 1722#ifdef SIGTSTP
1436 signal (SIGTSTP, SIG_IGN); 1723 signal (SIGTSTP, SIG_IGN);
1437 signal (SIGTTIN, SIG_IGN); 1724 signal (SIGTTIN, SIG_IGN);
1438 signal (SIGTTOU, SIG_IGN); 1725 signal (SIGTTOU, SIG_IGN);
1439#endif /* SIGTSTP */ 1726#endif /* SIGTSTP */
1440
1441 // unblock signals (signals are blocked by iom.C
1442 sigset_t ss;
1443 sigemptyset (&ss);
1444 sigprocmask (SIG_SETMASK, &ss, 0);
1445 1727
1446 /* command interpreter path */ 1728 /* command interpreter path */
1447 if (argv != NULL) 1729 if (argv)
1448 { 1730 {
1449# ifdef DEBUG_CMD 1731# ifdef DEBUG_CMD
1450 int i; 1732 int i;
1451 1733
1452 for (i = 0; argv[i]; i++) 1734 for (i = 0; argv[i]; i++)
… …
1461 const char *argv0, *shell; 1743 const char *argv0, *shell;
1462 1744
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1745 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1746 shell = "/bin/sh";
1465 1747
1466 argv0 = (const char *)rxvt_r_basename (shell); 1748 argv0 = rxvt_basename (shell);
1467 1749
1468 if (OPTION (Opt_loginShell)) 1750 if (option (Opt_loginShell))
1469 { 1751 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1752 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1471 1753
1472 login[0] = '-'; 1754 login[0] = '-';
1473 strcpy (&login[1], argv0); 1755 strcpy (&login[1], argv0);
1474 argv0 = login; 1756 argv0 = login;
1475 } 1757 }
1476 1758
1477 execlp (shell, argv0, NULL); 1759 execlp (shell, argv0, (char *)0);
1478 /* no error message: STDERR is closed! */ 1760 /* no error message: STDERR is closed! */
1479 } 1761 }
1480 1762
1481 return -1; 1763 return -1;
1482} 1764}

Diff Legend

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