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.161 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.327 by root, Mon Jun 4 15:18:52 2012 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <signal.h>
42 44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# include <locale.h>
52#endif
53
54#ifdef HAVE_NL_LANGINFO
55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
61#endif
62
63#ifdef DISPLAY_IS_IP
64/* On Solaris link with -lsocket and -lnsl */
65#include <sys/types.h>
66#include <sys/socket.h>
67
68/* these next two are probably only on Sun (not Solaris) */
69#ifdef HAVE_SYS_SOCKIO_H
70#include <sys/sockio.h>
71#endif
72#ifdef HAVE_SYS_BYTEORDER_H
73#include <sys/byteorder.h>
74#endif
75
76#include <netinet/in.h>
77#include <arpa/inet.h>
78#include <net/if.h>
79#include <net/if_arp.h>
80
81static char * ecb_cold
82rxvt_network_display (const char *display)
83{
84 char buffer[1024], *rval = NULL;
85 struct ifconf ifc;
86 struct ifreq *ifr;
87 int i, skfd;
88
89 if (display[0] != ':' && strncmp (display, "unix:", 5))
90 return (char *) display; /* nothing to do */
91
92 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
93 ifc.ifc_buf = buffer;
94
95 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
96 {
97 perror ("socket");
98 return NULL;
99 }
100
101 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
102 {
103 perror ("SIOCGIFCONF");
104 close (skfd);
105 return NULL;
106 }
107
108 for (i = 0, ifr = ifc.ifc_req;
109 i < (ifc.ifc_len / sizeof (struct ifreq));
110 i++, ifr++)
111 {
112 struct ifreq ifr2;
113
114 strcpy (ifr2.ifr_name, ifr->ifr_name);
115
116 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
117 {
118 unsigned long addr;
119 struct sockaddr_in *p_addr;
120
121 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
122 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
123
124 /*
125 * not "0.0.0.0" or "127.0.0.1" - so format the address
126 */
127 if (addr && addr != 0x7F000001)
128 {
129 char *colon = strchr (display, ':');
130
131 if (colon == NULL)
132 colon = ":0.0";
133
134 rval = rxvt_malloc (strlen (colon) + 16);
135 sprintf (rval, "%d.%d.%d.%d%s",
136 (int) ((addr >> 030) & 0xFF),
137 (int) ((addr >> 020) & 0xFF),
138 (int) ((addr >> 010) & 0xFF),
139 (int) (addr & 0xFF), colon);
140 break;
141 }
142 }
143 }
144
145 close (skfd);
146
147 return rval;
148}
149#endif
150
43const char *const def_colorName[] = 151static const char *const def_colorName[] =
44 { 152 {
45 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
47 /* low-intensity colors */ 155 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 157 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 158 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 159 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 160 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 161 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 162 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 163# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 164 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 165# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 166 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 167# endif
60 /* high-intensity colors */ 168 /* high-intensity colors */
61# ifdef XTERM_COLORS 169# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 170 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 181
182#if !USE_256_COLORS
74 // 88 xterm colours 183 // 88 xterm colours
75 "rgb:00/00/00", 184 "rgb:00/00/00",
76 "rgb:00/00/8b", 185 "rgb:00/00/8b",
77 "rgb:00/00/cd", 186 "rgb:00/00/cd",
78 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 251 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 252 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 253 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 254 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 255 "rgb:e7/e7/e7",
256#else
257 // 256 xterm colours
258 "rgb:00/00/00",
259 "rgb:00/00/5f",
260 "rgb:00/00/87",
261 "rgb:00/00/af",
262 "rgb:00/00/d7",
263 "rgb:00/00/ff",
264 "rgb:00/5f/00",
265 "rgb:00/5f/5f",
266 "rgb:00/5f/87",
267 "rgb:00/5f/af",
268 "rgb:00/5f/d7",
269 "rgb:00/5f/ff",
270 "rgb:00/87/00",
271 "rgb:00/87/5f",
272 "rgb:00/87/87",
273 "rgb:00/87/af",
274 "rgb:00/87/d7",
275 "rgb:00/87/ff",
276 "rgb:00/af/00",
277 "rgb:00/af/5f",
278 "rgb:00/af/87",
279 "rgb:00/af/af",
280 "rgb:00/af/d7",
281 "rgb:00/af/ff",
282 "rgb:00/d7/00",
283 "rgb:00/d7/5f",
284 "rgb:00/d7/87",
285 "rgb:00/d7/af",
286 "rgb:00/d7/d7",
287 "rgb:00/d7/ff",
288 "rgb:00/ff/00",
289 "rgb:00/ff/5f",
290 "rgb:00/ff/87",
291 "rgb:00/ff/af",
292 "rgb:00/ff/d7",
293 "rgb:00/ff/ff",
294 "rgb:5f/00/00",
295 "rgb:5f/00/5f",
296 "rgb:5f/00/87",
297 "rgb:5f/00/af",
298 "rgb:5f/00/d7",
299 "rgb:5f/00/ff",
300 "rgb:5f/5f/00",
301 "rgb:5f/5f/5f",
302 "rgb:5f/5f/87",
303 "rgb:5f/5f/af",
304 "rgb:5f/5f/d7",
305 "rgb:5f/5f/ff",
306 "rgb:5f/87/00",
307 "rgb:5f/87/5f",
308 "rgb:5f/87/87",
309 "rgb:5f/87/af",
310 "rgb:5f/87/d7",
311 "rgb:5f/87/ff",
312 "rgb:5f/af/00",
313 "rgb:5f/af/5f",
314 "rgb:5f/af/87",
315 "rgb:5f/af/af",
316 "rgb:5f/af/d7",
317 "rgb:5f/af/ff",
318 "rgb:5f/d7/00",
319 "rgb:5f/d7/5f",
320 "rgb:5f/d7/87",
321 "rgb:5f/d7/af",
322 "rgb:5f/d7/d7",
323 "rgb:5f/d7/ff",
324 "rgb:5f/ff/00",
325 "rgb:5f/ff/5f",
326 "rgb:5f/ff/87",
327 "rgb:5f/ff/af",
328 "rgb:5f/ff/d7",
329 "rgb:5f/ff/ff",
330 "rgb:87/00/00",
331 "rgb:87/00/5f",
332 "rgb:87/00/87",
333 "rgb:87/00/af",
334 "rgb:87/00/d7",
335 "rgb:87/00/ff",
336 "rgb:87/5f/00",
337 "rgb:87/5f/5f",
338 "rgb:87/5f/87",
339 "rgb:87/5f/af",
340 "rgb:87/5f/d7",
341 "rgb:87/5f/ff",
342 "rgb:87/87/00",
343 "rgb:87/87/5f",
344 "rgb:87/87/87",
345 "rgb:87/87/af",
346 "rgb:87/87/d7",
347 "rgb:87/87/ff",
348 "rgb:87/af/00",
349 "rgb:87/af/5f",
350 "rgb:87/af/87",
351 "rgb:87/af/af",
352 "rgb:87/af/d7",
353 "rgb:87/af/ff",
354 "rgb:87/d7/00",
355 "rgb:87/d7/5f",
356 "rgb:87/d7/87",
357 "rgb:87/d7/af",
358 "rgb:87/d7/d7",
359 "rgb:87/d7/ff",
360 "rgb:87/ff/00",
361 "rgb:87/ff/5f",
362 "rgb:87/ff/87",
363 "rgb:87/ff/af",
364 "rgb:87/ff/d7",
365 "rgb:87/ff/ff",
366 "rgb:af/00/00",
367 "rgb:af/00/5f",
368 "rgb:af/00/87",
369 "rgb:af/00/af",
370 "rgb:af/00/d7",
371 "rgb:af/00/ff",
372 "rgb:af/5f/00",
373 "rgb:af/5f/5f",
374 "rgb:af/5f/87",
375 "rgb:af/5f/af",
376 "rgb:af/5f/d7",
377 "rgb:af/5f/ff",
378 "rgb:af/87/00",
379 "rgb:af/87/5f",
380 "rgb:af/87/87",
381 "rgb:af/87/af",
382 "rgb:af/87/d7",
383 "rgb:af/87/ff",
384 "rgb:af/af/00",
385 "rgb:af/af/5f",
386 "rgb:af/af/87",
387 "rgb:af/af/af",
388 "rgb:af/af/d7",
389 "rgb:af/af/ff",
390 "rgb:af/d7/00",
391 "rgb:af/d7/5f",
392 "rgb:af/d7/87",
393 "rgb:af/d7/af",
394 "rgb:af/d7/d7",
395 "rgb:af/d7/ff",
396 "rgb:af/ff/00",
397 "rgb:af/ff/5f",
398 "rgb:af/ff/87",
399 "rgb:af/ff/af",
400 "rgb:af/ff/d7",
401 "rgb:af/ff/ff",
402 "rgb:d7/00/00",
403 "rgb:d7/00/5f",
404 "rgb:d7/00/87",
405 "rgb:d7/00/af",
406 "rgb:d7/00/d7",
407 "rgb:d7/00/ff",
408 "rgb:d7/5f/00",
409 "rgb:d7/5f/5f",
410 "rgb:d7/5f/87",
411 "rgb:d7/5f/af",
412 "rgb:d7/5f/d7",
413 "rgb:d7/5f/ff",
414 "rgb:d7/87/00",
415 "rgb:d7/87/5f",
416 "rgb:d7/87/87",
417 "rgb:d7/87/af",
418 "rgb:d7/87/d7",
419 "rgb:d7/87/ff",
420 "rgb:d7/af/00",
421 "rgb:d7/af/5f",
422 "rgb:d7/af/87",
423 "rgb:d7/af/af",
424 "rgb:d7/af/d7",
425 "rgb:d7/af/ff",
426 "rgb:d7/d7/00",
427 "rgb:d7/d7/5f",
428 "rgb:d7/d7/87",
429 "rgb:d7/d7/af",
430 "rgb:d7/d7/d7",
431 "rgb:d7/d7/ff",
432 "rgb:d7/ff/00",
433 "rgb:d7/ff/5f",
434 "rgb:d7/ff/87",
435 "rgb:d7/ff/af",
436 "rgb:d7/ff/d7",
437 "rgb:d7/ff/ff",
438 "rgb:ff/00/00",
439 "rgb:ff/00/5f",
440 "rgb:ff/00/87",
441 "rgb:ff/00/af",
442 "rgb:ff/00/d7",
443 "rgb:ff/00/ff",
444 "rgb:ff/5f/00",
445 "rgb:ff/5f/5f",
446 "rgb:ff/5f/87",
447 "rgb:ff/5f/af",
448 "rgb:ff/5f/d7",
449 "rgb:ff/5f/ff",
450 "rgb:ff/87/00",
451 "rgb:ff/87/5f",
452 "rgb:ff/87/87",
453 "rgb:ff/87/af",
454 "rgb:ff/87/d7",
455 "rgb:ff/87/ff",
456 "rgb:ff/af/00",
457 "rgb:ff/af/5f",
458 "rgb:ff/af/87",
459 "rgb:ff/af/af",
460 "rgb:ff/af/d7",
461 "rgb:ff/af/ff",
462 "rgb:ff/d7/00",
463 "rgb:ff/d7/5f",
464 "rgb:ff/d7/87",
465 "rgb:ff/d7/af",
466 "rgb:ff/d7/d7",
467 "rgb:ff/d7/ff",
468 "rgb:ff/ff/00",
469 "rgb:ff/ff/5f",
470 "rgb:ff/ff/87",
471 "rgb:ff/ff/af",
472 "rgb:ff/ff/d7",
473 "rgb:ff/ff/ff",
474 "rgb:08/08/08",
475 "rgb:12/12/12",
476 "rgb:1c/1c/1c",
477 "rgb:26/26/26",
478 "rgb:30/30/30",
479 "rgb:3a/3a/3a",
480 "rgb:44/44/44",
481 "rgb:4e/4e/4e",
482 "rgb:58/58/58",
483 "rgb:62/62/62",
484 "rgb:6c/6c/6c",
485 "rgb:76/76/76",
486 "rgb:80/80/80",
487 "rgb:8a/8a/8a",
488 "rgb:94/94/94",
489 "rgb:9e/9e/9e",
490 "rgb:a8/a8/a8",
491 "rgb:b2/b2/b2",
492 "rgb:bc/bc/bc",
493 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0",
495 "rgb:da/da/da",
496 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee",
498#endif
147 499
148#ifndef NO_CURSORCOLOR 500#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 501 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 502 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 503#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 504 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 505 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 506 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 507#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 508 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 509 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 510 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 511 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 512#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 513#if ENABLE_FRILLS
162 NULL, // Color_underline 514 NULL, // Color_underline
163#endif 515#endif
164#ifdef OPTION_HC 516#ifdef OPTION_HC
165 NULL, 517 NULL,
518 NULL,
166#endif 519#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 523#endif
171#if TINTING 524#if ENABLE_TRANSPARENCY
172 NULL, 525 NULL,
173#endif 526#endif
174#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 528 "rgb:00/00/00",
176#endif 529#endif
177 }; 530 };
178 531
179bool 532void
180rxvt_term::init_vars () 533rxvt_term::init_vars ()
181{ 534{
182 pix_colors = // 535 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 536
192 MEvent.time = CurrentTime; 537 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 538 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 539 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 540 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 541 ncol = 80;
198 nrow = 24; 542 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 547 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 548
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
207 550
208 oldcursor.row = oldcursor.col = -1; 551 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 552
215 last_bot = last_state = -1; 553 set_option (Opt_scrollBar);
216 554 set_option (Opt_scrollTtyOutput);
217 return true; 555 set_option (Opt_jumpScroll);
218} 556 set_option (Opt_skipScroll);
219 557 set_option (Opt_secondaryScreen);
220void 558 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 559 set_option (Opt_pastableTabs);
222{ 560 set_option (Opt_intensityStyles);
223 int i; 561 set_option (Opt_iso14755);
224 562 set_option (Opt_iso14755_52);
225 /* 563 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} 564}
253 565
254/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
255const char ** 567const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
257{ 569{
258 int i, r_argc; 570 int i;
259 char *val;
260 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
261 572
262 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args
264 */
265 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
267 break;
268
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270
271 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i];
273
274 r_argv[i] = NULL;
275
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]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
289 574
290 /* 575 /*
291 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
292 */ 577 */
293 578
294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
295 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
296 581
297 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
298 583
299 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 586
587 // using a local pointer decreases code size a lot
302 xa = display->xa; 588 xa = display->xa;
589
590 set (display);
591 extract_resources ();
303 592
304#if XFT 593#if XFT
305 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 596#endif
309 set (display);
310 597
311 extract_resources (); 598 for (int i = NUM_RESOURCES; i--; )
312 599 if (rs [i] == resval_undef)
313 free (r_argv); 600 rs [i] = 0;
314 601
315#if ENABLE_PERL 602#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 603 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 604 rs[Rs_perl_ext_1] = "default";
318 605
… …
322 { 609 {
323 rxvt_perl.init (this); 610 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 } 612 }
326#endif 613#endif
614
615 // must be called after initialising the perl interpreter as it
616 // may invoke the `on_register_command' hook
617 extract_keysym_resources ();
327 618
328 /* 619 /*
329 * set any defaults not already set 620 * set any defaults not already set
330 */ 621 */
331 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
332 { 623 {
333 if (!rs[Rs_title]) 624 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 625 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
626
335 if (!rs[Rs_iconName]) 627 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 628 rs[Rs_iconName] = rs[Rs_title];
337 } 629 }
338 else 630 else
339 { 631 {
340 if (!rs[Rs_title]) 632 if (!rs[Rs_title])
341 rs[Rs_title] = rs[Rs_name]; 633 rs[Rs_title] = rs[Rs_name];
634
342 if (!rs[Rs_iconName]) 635 if (!rs[Rs_iconName])
343 rs[Rs_iconName] = rs[Rs_name]; 636 rs[Rs_iconName] = rs[Rs_name];
344 } 637 }
345 638
346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 639 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 646 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355 648
356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
357 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 650 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
651
652 if (rs[Rs_letterSpace])
653 letterSpace = atoi (rs[Rs_letterSpace]);
358#endif 654#endif
359 655
360#ifdef POINTER_BLANK 656#ifdef POINTER_BLANK
361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
362 pointerBlankDelay = i; 658 pointerBlankDelay = i;
… …
366 662
367 /* no point having a scrollbar without having any scrollback! */ 663 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 664 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 665 set_option (Opt_scrollBar, 0);
370 666
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 667 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 668 rs[Rs_cutchars] = CUTCHARS;
378 669
379#ifndef NO_BACKSPACE_KEY 670#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 671 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 672# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 673 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 674# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 675 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 676# 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 677#endif
394 678
395#ifndef NO_DELETE_KEY 679#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 680 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 681# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 682 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 683# else
400 key_delete = "\033[3~"; 684 rs[Rs_delete_key] = "\033[3~";
401# endif 685# 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 686#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 687
416#ifdef HAVE_SCROLLBARS 688 scrollBar.setup (this);
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif
419 689
420#ifdef XTERM_REVERSE_VIDEO 690#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 691 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 692 if (option (Opt_reverseVideo))
423 { 693 {
424 if (!rs[Rs_color + Color_fg]) 694 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 695 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
696
426 if (!rs[Rs_color + Color_bg]) 697 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 698 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 699 }
429#endif 700#endif
430 701
… …
432 if (!rs[Rs_color + i]) 703 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 704 rs[Rs_color + i] = def_colorName[i];
434 705
435#ifndef XTERM_REVERSE_VIDEO 706#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 707 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 708 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 709 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 710#endif
440 711
441 /* convenient aliases for setting fg/bg to colors */ 712 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 713 color_aliases (Color_fg);
443 color_aliases (Color_bg); 714 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 715#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 716 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 717 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 718#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 719 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 720 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 721 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 722#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 723 color_aliases (Color_BD);
453 color_aliases (Color_UL); 724 color_aliases (Color_UL);
454 color_aliases (Color_RV); 725 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 726#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 727
457 if (!rs[Rs_color + Color_border]) 728 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 729 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 730
460 return cmd_argv; 731 return cmd_argv;
732}
733
734/*----------------------------------------------------------------------*/
735void
736rxvt_term::init (stringvec *argv, stringvec *envv)
737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
742 this->envv = envv;
743
744 init2 (argv->size () - 1, argv->begin ());
745}
746
747void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
749{
750#if ENABLE_PERL
751 // perl might want to access the stringvecs later, so we need to copy them
752 stringvec *args = new stringvec;
753 for (int i = 0; i < argc; i++)
754 args->push_back (strdup (argv [i]));
755
756 stringvec *envs = new stringvec;
757 for (const char *const *var = envv; *var; var++)
758 envs->push_back (strdup (*var));
759
760 init (args, envs);
761#else
762 init2 (argc, argv);
763#endif
764}
765
766void
767rxvt_term::init2 (int argc, const char *const *argv)
768{
769 SET_R (this);
770 set_locale ("");
771 set_environ (envv); // a few things in X do not call setlocale :(
772
773 init_vars ();
774
775 const char **cmd_argv = init_resources (argc, argv);
776
777#ifdef KEYSYM_RESOURCE
778 keyboard->register_done ();
779#endif
780
781 if (const char *path = rs[Rs_chdir])
782 if (*path) // ignored if empty
783 {
784 if (*path != '/')
785 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
786
787 if (chdir (path))
788 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
789 }
790
791 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793
794 pty = ptytty::create ();
795
796 create_windows (argc, argv);
797
798 init_xlocale ();
799
800 scr_poweron (); // initialize screen
801
802#if 0
803 XSynchronize (dpy, True);
804#endif
805
806 if (option (Opt_scrollBar))
807 scrollBar.resize (); /* create and map scrollbar */
808#ifdef HAVE_BG_PIXMAP
809 {
810 bg_init ();
811
812#if ENABLE_TRANSPARENCY
813 if (option (Opt_transparent))
814 {
815 bg_set_transparent ();
816
817 if (rs [Rs_blurradius])
818 root_effects.set_blur (rs [Rs_blurradius]);
819
820 if (ISSET_PIXCOLOR (Color_tint))
821 root_effects.set_tint (pix_colors_focused [Color_tint]);
822
823 if (rs [Rs_shade])
824 root_effects.set_shade (rs [Rs_shade]);
825
826 bg_set_root_pixmap ();
827 XSelectInput (dpy, display->root, PropertyChangeMask);
828 rootwin_ev.start (display, display->root);
829 }
830#endif
831 }
832#endif
833
834#if ENABLE_PERL
835 rootwin_ev.start (display, display->root);
836#endif
837
838 init_done = 1;
839
840 init_command (cmd_argv);
841
842 if (pty->pty >= 0)
843 pty_ev.start (pty->pty, ev::READ);
844
845 HOOK_INVOKE ((this, HOOK_START, DT_END));
846
847#if ENABLE_XEMBED
848 if (rs[Rs_embed])
849 {
850 long info[2] = { 0, XEMBED_MAPPED };
851
852 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
853 32, PropModeReplace, (unsigned char *)&info, 2);
854 }
855#endif
856
857#if HAVE_STARTUP_NOTIFICATION
858 SnDisplay *snDisplay;
859 SnLauncheeContext *snContext;
860
861 snDisplay = sn_display_new (dpy, NULL, NULL);
862 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
863
864 /* Tell the window manager that this window is part of the startup context */
865 if (snContext)
866 sn_launchee_context_setup_window (snContext, parent);
867#endif
868
869 XMapWindow (dpy, vt);
870 XMapWindow (dpy, parent);
871
872#if HAVE_STARTUP_NOTIFICATION
873 if (snContext)
874 {
875 /* Mark the startup process as complete */
876 sn_launchee_context_complete (snContext);
877
878 sn_launchee_context_unref (snContext);
879 }
880
881 sn_display_unref (snDisplay);
882#endif
883
884 refresh_check ();
461} 885}
462 886
463/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
464void 888void
465rxvt_term::init_env () 889rxvt_term::init_env ()
466{ 890{
467 int i;
468 unsigned int u;
469 char *val; 891 char *val;
892 char *env_display;
893 char *env_windowid;
894 char *env_colorfgbg;
895 char *env_term;
470 896
471#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 898 /* 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 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
474 * (for the first non-loopback interface) that we get from 900 * (for the first non-loopback interface) that we get from
… …
481 */ 907 */
482 val = rxvt_network_display (rs[Rs_display_name]); 908 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 909 rs[Rs_display_name] = (const char *)val;
484 910
485 if (val == NULL) 911 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 912#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 913 val = XDisplayString (dpy);
488 914
489 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
491 917
492 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
494 919
495 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
496 921
922 env_windowid = (char *)rxvt_malloc (21);
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 923 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
498 924
499 /* add entries to the environment: 925 /* add entries to the environment:
500 * @ DISPLAY: in case we started with -display 926 * @ DISPLAY: in case we started with -display
501 * @ WINDOWID: X window id number of the window 927 * @ WINDOWID: X window id number of the window
502 * @ COLORTERM: terminal sub-name and also indicates its color 928 * @ COLORTERM: terminal sub-name and also indicates its color
… …
505 * @ COLORFGBG: fg;bg color codes 931 * @ COLORFGBG: fg;bg color codes
506 */ 932 */
507 putenv (env_display); 933 putenv (env_display);
508 putenv (env_windowid); 934 putenv (env_windowid);
509 935
510 if (env_colorfgbg) 936 env_colorfgbg = get_colorfgbg ();
511 putenv (env_colorfgbg); 937 putenv (env_colorfgbg);
512 938
513#ifdef RXVT_TERMINFO 939#ifdef RXVT_TERMINFO
514 putenv ("TERMINFO=" RXVT_TERMINFO); 940 putenv ("TERMINFO=" RXVT_TERMINFO);
515#endif 941#endif
516 942
… …
519 else 945 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 946 putenv ("COLORTERM=" COLORTERMENVFULL);
521 947
522 if (rs[Rs_term_name] != NULL) 948 if (rs[Rs_term_name] != NULL)
523 { 949 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 950 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 951 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 952 putenv (env_term);
527 } 953 }
528 else 954 else
529 putenv ("TERM=" TERMENV); 955 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 957#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 958 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 959 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 960 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 961 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 962#endif /* HAVE_UNSETENV */
537} 963}
538 964
539/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
540/*
541 * This is more or less stolen straight from XFree86 xterm.
542 * This should support all European type languages.
543 */
544void 966void
545rxvt_term::set_locale (const char *locale) 967rxvt_term::set_locale (const char *locale)
546{ 968{
547 set_environ (envv); 969 set_environ (envv);
548 970
549#if HAVE_XSETLOCALE || HAVE_SETLOCALE
550 free (this->locale); 971 free (this->locale);
551 this->locale = setlocale (LC_CTYPE, locale); 972 this->locale = setlocale (LC_CTYPE, locale);
552 973
553 if (!this->locale) 974 if (!this->locale)
554 { 975 {
… …
562 983
563 this->locale = "C"; 984 this->locale = "C";
564 } 985 }
565 986
566 987
567 this->locale = rxvt_strdup (this->locale); 988 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 989 SET_LOCALE (this->locale);
569 mbstate.reset (); 990 mbstate.reset ();
570#endif
571 991
572#if HAVE_NL_LANGINFO 992#if HAVE_NL_LANGINFO
573 char *codeset = strdup (nl_langinfo (CODESET)); 993 char *codeset = nl_langinfo (CODESET);
574 // /^UTF.?8/i 994 // /^UTF.?8/i
575 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 995 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
576 && (codeset[1] == 'T' || codeset[1] == 't') 996 && (codeset[1] == 'T' || codeset[1] == 't')
577 && (codeset[2] == 'F' || codeset[2] == 'f') 997 && (codeset[2] == 'F' || codeset[2] == 'f')
578 && (codeset[3] == '8' || codeset[4] == '8'); 998 && (codeset[3] == '8' || codeset[4] == '8');
579 free (codeset);
580#else 999#else
581 enc_utf8 = 0; 1000 enc_utf8 = 0;
582#endif 1001#endif
583} 1002}
584 1003
585void 1004void
586rxvt_term::init_xlocale () 1005rxvt_term::init_xlocale ()
587{ 1006{
588 set_environ (envv); 1007 set_environ (envv);
589 1008
590#ifdef USE_XIM 1009#if USE_XIM
591 if (!locale) 1010 if (!locale)
592 rxvt_warn ("setting locale failed, working without locale support.\n"); 1011 rxvt_warn ("setting locale failed, continuing without locale support.\n");
593 else 1012 else
594 { 1013 {
595 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1014 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
596 1015
597 if (!XSupportsLocale ()) 1016 if (!XSupportsLocale ())
598 { 1017 {
599 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1018 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
600 return; 1019 return;
601 } 1020 }
602 1021
603 im_ev.start (display); 1022 im_ev.start (display);
604 1023
… …
616 * Initialize the command connection. 1035 * Initialize the command connection.
617 * This should be called after the X server connection is established. 1036 * This should be called after the X server connection is established.
618 */ 1037 */
619 1038
620#ifdef META8_OPTION 1039#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1040 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 1041#endif
623 1042
624 get_ourmods (); 1043 get_ourmods ();
625 1044
626 if (!OPTION (Opt_scrollTtyOutput)) 1045 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 1046 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 1047 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 1048 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 1049 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 1050 priv_modes |= PrivMode_smoothScroll;
632 1051
633#ifndef NO_BACKSPACE_KEY 1052#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 1053 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 1054 priv_modes |= PrivMode_HaveBackSpace;
636#endif 1055#endif
637 1056
638 /* add value for scrollBar */ 1057 /* add value for scrollBar */
639 if (scrollBar.state) 1058 if (scrollBar.state)
… …
645 run_command (argv); 1064 run_command (argv);
646} 1065}
647 1066
648/*----------------------------------------------------------------------*/ 1067/*----------------------------------------------------------------------*/
649void 1068void
650rxvt_term::Get_Colours () 1069rxvt_term::get_colours ()
651{ 1070{
652 int i; 1071 int i;
653 1072
654#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 1074 pix_colors = pix_colors_focused;
656#endif 1075#endif
657 1076
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1077 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 1078 {
1079 const char *name = rs[Rs_color + i];
1080
1081 if (!name)
1082 continue;
1083
660 rxvt_color xcol; 1084 rxvt_color xcol;
661 1085
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 1086 if (!set_color (xcol, name))
666 { 1087 {
667#ifndef XTERM_REVERSE_VIDEO 1088#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 1089 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 1090 name = def_colorName [1 - i];
670 else 1091 else
671#endif 1092#endif
672 rs[Rs_color + i] = def_colorName[i]; 1093 name = def_colorName [i];
673 1094
674 if (!rs[Rs_color + i]) 1095 if (!name)
675 continue; 1096 continue;
676 1097
677 if (!set_color (xcol, rs[Rs_color + i])) 1098 if (!set_color (xcol, name))
678 { 1099 {
679 switch (i) 1100 switch (i)
680 { 1101 {
681 case Color_fg: 1102 case Color_fg:
682 case Color_bg: 1103 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 1104 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1105 name = "";
685 break; 1106 break;
686#ifndef NO_CURSORCOLOR 1107#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 1108 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 1109#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 1110 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 1111 name = rs[Rs_color + Color_fg];
1112 xcol.set (this, name);
693 break; 1113 break;
694 default: 1114 default:
695 xcol = pix_colors[Color_bg]; /* None */ 1115 name = rs[Rs_color + Color_bg];
1116 xcol.set (this, name);
696 break; 1117 break;
697 } 1118 }
698 } 1119 }
699 } 1120 }
700 1121
701 pix_colors[i] = xcol; 1122 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 1123 rs[Rs_color + i] = name;
703 } 1124 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
709#endif
710 1125
711 if (depth <= 2) 1126 if (depth <= 2)
712 { 1127 {
713 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1128 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
714 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 1129 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
715 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 1130 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
716 } 1131 }
717 1132
718 /* 1133 /*
719 * get scrollBar shadow colors 1134 * get scrollBar shadow colors
720 * 1135 *
721 * The calculations of topShadow/bottomShadow values are adapted 1136 * The calculations of topShadow/bottomShadow values are adapted
722 * from the fvwm window manager. 1137 * from the fvwm window manager.
723 */ 1138 */
724#ifdef KEEP_SCROLLCOLOR 1139#ifdef RXVT_SCROLLBAR
725
726 if (depth <= 2) 1140 if (depth <= 2)
727 { 1141 {
728 /* Monochrome */ 1142 /* Monochrome */
729 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1143 alias_color (Color_scroll, Color_fg);
730 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1144 alias_color (Color_topShadow, Color_bg);
731 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1145 alias_color (Color_bottomShadow, Color_bg);
732 } 1146 }
733 else 1147 else
734 { 1148 {
735 rxvt_color xcol[2]; 1149 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
736 /* xcol[0] == white
737 * xcol[1] == top shadow
738 * xcol[2] == bot shadow */
739 1150
740 xcol[1] = pix_colors[Color_scroll]; 1151 rgba cscroll;
741 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 1152 pix_colors [Color_scroll].get (cscroll);
742
743 rxvt_rgba c0, c1;
744
745 xcol[0].get (this, c0);
746 xcol[1].get (this, c1);
747
748 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
749 1153
750 /* topShadowColor */ 1154 /* topShadowColor */
751 if (!xcol[1].set (this, 1155 if (!pix_colors[Color_topShadow].set (this,
752 rxvt_rgba ( 1156 rgba (
753 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 1157 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
754 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 1158 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
755 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 1159 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
756 c1.a) // pa1 vs. pa0: arbitrary 1160 cscroll.a)
757 )); 1161 ))
758 xcol[1] = pix_colors[Color_White]; 1162 alias_color (Color_topShadow, Color_White);
759
760 pix_colors[Color_topShadow] = xcol[1];
761 } 1163 }
762#endif /* KEEP_SCROLLCOLOR */ 1164#endif
1165
1166#ifdef OFF_FOCUS_FADING
1167 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1168 update_fade_color (i);
1169#endif
763} 1170}
764 1171
765/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
766/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
767void 1174void
768rxvt_term::color_aliases (int idx) 1175rxvt_term::color_aliases (int idx)
769{ 1176{
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1177 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
771 { 1178 {
772 int i = atoi (rs[Rs_color + idx]); 1179 int i = atoi (rs[Rs_color + idx]);
773 1180
774 if (i >= 8 && i <= 15) 1181 if (i >= 8 && i <= 15)
775 { /* bright colors */ 1182 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1183 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 1184 else if (i >= 0 && i <= 7)
779 } 1185 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1186 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 1187 }
784} 1188}
785 1189
786/*----------------------------------------------------------------------*/ 1190/*----------------------------------------------------------------------*/
… …
806 1210
807 if (rsmod 1211 if (rsmod
808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1212 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
809 requestedmeta = rsmod[3] - '0'; 1213 requestedmeta = rsmod[3] - '0';
810 1214
811 map = XGetModifierMapping (xdisp); 1215 map = XGetModifierMapping (dpy);
812 kc = map->modifiermap; 1216 kc = map->modifiermap;
813 1217
814 for (i = 1; i < 6; i++) 1218 for (i = 1; i < 6; i++)
815 { 1219 {
816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1220 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
818 for (j = map->max_keypermod; j--; k++) 1222 for (j = map->max_keypermod; j--; k++)
819 { 1223 {
820 if (kc[k] == 0) 1224 if (kc[k] == 0)
821 break; 1225 break;
822 1226
823 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1227 switch (XKeycodeToKeysym (dpy, kc[k], 0))
824 { 1228 {
825 case XK_Num_Lock: 1229 case XK_Num_Lock:
826 ModNumLockMask = modmasks[i - 1]; 1230 ModNumLockMask = modmasks[i - 1];
827 continue; 1231 continue;
828 1232
… …
870 1274
871 if (i) 1275 if (i)
872 ModMetaMask = modmasks[i - 1]; 1276 ModMetaMask = modmasks[i - 1];
873} 1277}
874 1278
1279void
1280rxvt_term::set_icon (const char *file)
1281{
1282#if HAVE_PIXBUF
1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1284 if (!pixbuf)
1285 {
1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1287 return;
1288 }
1289
1290 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1291 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1292
1293 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1294 {
1295 rxvt_warn ("Icon image too big, continuing without.\n");
1296 g_object_unref (pixbuf);
1297 return;
1298 }
1299
1300 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1301 {
1302 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1303 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1304 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1305
1306 buffer [0] = w;
1307 buffer [1] = h;
1308 for (int i = 0; i < h; i++)
1309 {
1310 for (int j = 0; j < w; j++)
1311 {
1312 unsigned char *pixel = row + j * channels;
1313 long value;
1314
1315 if (channels == 4)
1316 value = pixel[3];
1317 else
1318 value = (unsigned char)0x00ff;
1319
1320 value = (value << 8) + pixel[0];
1321 value = (value << 8) + pixel[1];
1322 value = (value << 8) + pixel[2];
1323 buffer[(i * w + j) + 2] = value;
1324 }
1325
1326 row += rowstride;
1327 }
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 g_object_unref (pixbuf);
1337#endif
1338}
1339
875/*----------------------------------------------------------------------*/ 1340/*----------------------------------------------------------------------*/
876/* rxvt_Create_Windows () - Open and map the window */ 1341/* Open and map the window */
877void 1342void
878rxvt_term::create_windows (int argc, const char *const *argv) 1343rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1344{
880 XClassHint classHint; 1345 XClassHint classHint;
881 XWMHints wmHint; 1346 XWMHints wmHint;
882#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
883 MWMHints mwmhints; 1348 MWMHints mwmhints = { };
884#endif 1349#endif
885 XGCValues gcvalue; 1350 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1351 XSetWindowAttributes attributes;
887 Window top, parent; 1352 Window top, parent;
888 1353
889 dLocal (Display *, xdisp); 1354 dLocal (Display *, dpy);
890 1355
891 /* grab colors before netscape does */ 1356 /* grab colors before netscape does */
892 Get_Colours (); 1357 get_colours ();
893 1358
894 if (!set_fonts ()) 1359 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 1361
897 parent = display->root; 1362 parent = display->root;
898 1363
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1364 attributes.override_redirect = !!option (Opt_override_redirect);
900 1365
901#if ENABLE_FRILLS 1366#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 1367 if (option (Opt_borderLess))
903 { 1368 {
904 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1369 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1370 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1371 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1372 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1373 }
910 else 1374 else
911 { 1375 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1376 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1377 }
915 } 1378 }
916 else
917 mwmhints.flags = 0;
918#endif 1379#endif
919 1380
920#if ENABLE_XEMBED 1381#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1382 if (rs[Rs_embed])
922 { 1383 {
923 XWindowAttributes wattr; 1384 XWindowAttributes wattr;
924 1385
925 parent = strtol (rs[Rs_embed], 0, 0); 1386 parent = strtol (rs[Rs_embed], 0, 0);
926 1387
927 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1388 if (!XGetWindowAttributes (dpy, parent, &wattr))
928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1389 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
929 1390
930 window_calc (wattr.width, wattr.height); 1391 window_calc (wattr.width, wattr.height);
931 } 1392 }
932#endif 1393#endif
933 1394
934 window_calc (0, 0); 1395 window_calc (0, 0);
935 1396
936 /* sub-window placement & size in rxvt_resize_subwindows () */ 1397 /* sub-window placement & size in rxvt_term::resize_all_windows () */
937 attributes.background_pixel = pix_colors_focused [Color_border]; 1398 attributes.background_pixel = pix_colors_focused [Color_border];
938 attributes.border_pixel = pix_colors_focused [Color_border]; 1399 attributes.border_pixel = pix_colors_focused [Color_border];
939 attributes.colormap = cmap; 1400 attributes.colormap = cmap;
940 1401
941 top = XCreateWindow (xdisp, parent, 1402 top = XCreateWindow (dpy, parent,
942 szHint.x, szHint.y, 1403 szHint.x, szHint.y,
943 szHint.width, szHint.height, 1404 szHint.width, szHint.height,
944 ext_bwidth, 1405 ext_bwidth,
945 depth, InputOutput, visual, 1406 depth, InputOutput, visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1407 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
947 &attributes); 1408 &attributes);
948 1409
949 this->parent[0] = top; 1410 this->parent = top;
950 1411
951 old_width = szHint.width; 1412 set_title (rs [Rs_title]);
952 old_height = szHint.height; 1413 set_icon_name (rs [Rs_iconName]);
953
954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
956 1414
957 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1416 classHint.res_class = (char *)RESCLASS;
959 1417
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1418 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 1419 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1420 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1421 wmHint.window_group = top;
964 1422
965 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1423 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1424 &szHint, &wmHint, &classHint);
1425#if ENABLE_EWMH
1426 /*
1427 * set up icon hint
1428 * rs [Rs_iconfile] is path to icon
1429 */
1430
1431 if (rs [Rs_iconfile])
1432 {
1433 set_icon (rs [Rs_iconfile]);
1434 }
1435#endif
967 1436
968#if ENABLE_FRILLS 1437#if ENABLE_FRILLS
969 if (mwmhints.flags) 1438 if (mwmhints.flags)
970 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1440 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 1441#endif
973 1442
974 Atom protocols[] = { 1443 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 1444 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 1445#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 1446 xa[XA_NET_WM_PING],
978#endif 1447#endif
979 }; 1448 };
980 1449
981 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1450 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
982 1451
983#if ENABLE_FRILLS 1452#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 1453 if (rs[Rs_transient_for])
985 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1454 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 1455#endif
987 1456
988#if ENABLE_EWMH 1457#if ENABLE_EWMH
989 long pid = getpid (); 1458 long pid = getpid ();
990 1459
991 XChangeProperty (xdisp, top, 1460 XChangeProperty (dpy, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1461 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 1462 PropModeReplace, (unsigned char *)&pid, 1);
994 1463
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1464 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 1465#endif
997 1466
998 XSelectInput (xdisp, top, 1467 XSelectInput (dpy, top,
999 KeyPressMask 1468 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1469#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1470 | KeyReleaseMask
1002#endif 1471#endif
1003 | FocusChangeMask | VisibilityChangeMask 1472 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 1473 | ExposureMask | StructureNotifyMask);
1005 1474
1006 termwin_ev.start (display, top); 1475 termwin_ev.start (display, top);
1007 1476
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1477 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1478 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1014#endif
1015 1479
1016 /* the vt window */ 1480 /* the vt window */
1017 vt = XCreateSimpleWindow (xdisp, top, 1481 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1482 window_vt_x, window_vt_y,
1019 width, height, 1483 vt_width, vt_height,
1020 0, 1484 0,
1021 pix_colors_focused[Color_fg], 1485 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 1486 pix_colors_focused[Color_bg]);
1023 1487
1024 attributes.bit_gravity = NorthWestGravity; 1488 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1489 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1490
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1491 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1492
1029 if (OPTION (Opt_pointerBlank)) 1493 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1494 vt_emask |= PointerMotionMask;
1031 else 1495 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1496 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1497
1034 vt_select_input (); 1498 vt_select_input ();
1035 1499
1036 vt_ev.start (display, vt); 1500 vt_ev.start (display, vt);
1037 1501
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054
1055 /* graphics context for the vt window */ 1502 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1503 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1504 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1505 gcvalue.graphics_exposures = 0;
1059 1506
1060 gc = XCreateGC (xdisp, vt, 1507 gc = XCreateGC (dpy, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1508 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1509 &gcvalue);
1063 1510
1064 drawable = new rxvt_drawable (this, vt); 1511 drawable = new rxvt_drawable (this, vt);
1065
1066#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1073#endif
1074 1512
1075#ifdef OFF_FOCUS_FADING 1513#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1514 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1515 if (rs[Rs_fade])
1078 pix_colors = pix_colors_unfocused; 1516 pix_colors = pix_colors_unfocused;
1079#endif 1517#endif
1080 1518
1081 pointer_unblank (); 1519 pointer_unblank ();
1082 scr_recolour (); 1520 scr_recolour ();
1083}
1084
1085/* ------------------------------------------------------------------------- *
1086 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */
1088void
1089rxvt_get_ttymode (ttymode_t *tio, int erase)
1090{
1091#ifdef HAVE_TERMIOS_H
1092 /*
1093 * standard System V termios interface
1094 */
1095 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1096 {
1097 // return error - use system defaults,
1098 // where possible, and zero elsewhere
1099 memset (tio, 0, sizeof (ttymode_t));
1100
1101 tio->c_cc[VINTR] = CINTR;
1102 tio->c_cc[VQUIT] = CQUIT;
1103 tio->c_cc[VERASE] = CERASE;
1104#ifdef VERASE2
1105 tio->c_cc[VERASE2] = CERASE2;
1106#endif
1107 tio->c_cc[VKILL] = CKILL;
1108 tio->c_cc[VSTART] = CSTART;
1109 tio->c_cc[VSTOP] = CSTOP;
1110 tio->c_cc[VSUSP] = CSUSP;
1111# ifdef VDSUSP
1112 tio->c_cc[VDSUSP] = CDSUSP;
1113# endif
1114# ifdef VREPRINT
1115 tio->c_cc[VREPRINT] = CRPRNT;
1116# endif
1117# ifdef VDISCRD
1118 tio->c_cc[VDISCRD] = CFLUSH;
1119# endif
1120# ifdef VWERSE
1121 tio->c_cc[VWERSE] = CWERASE;
1122# endif
1123# ifdef VLNEXT
1124 tio->c_cc[VLNEXT] = CLNEXT;
1125# endif
1126 }
1127
1128 tio->c_cc[VEOF] = CEOF;
1129 tio->c_cc[VEOL] = VDISABLE;
1130# ifdef VEOL2
1131 tio->c_cc[VEOL2] = VDISABLE;
1132# endif
1133# ifdef VSWTC
1134 tio->c_cc[VSWTC] = VDISABLE;
1135# endif
1136# ifdef VSWTCH
1137 tio->c_cc[VSWTCH] = VDISABLE;
1138# endif
1139# if VMIN != VEOF
1140 tio->c_cc[VMIN] = 1;
1141# endif
1142# if VTIME != VEOL
1143 tio->c_cc[VTIME] = 0;
1144# endif
1145
1146 if (erase != -1)
1147 tio->c_cc[VERASE] = (char)erase;
1148
1149 /* input modes */
1150 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1151# ifdef IMAXBEL
1152 | IMAXBEL
1153# endif
1154 | IXON);
1155
1156 /* output modes */
1157 tio->c_oflag = (OPOST | ONLCR);
1158
1159 /* control modes */
1160 tio->c_cflag = (CS8 | CREAD);
1161
1162 /* line discipline modes */
1163 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1164# if defined (ECHOCTL) && defined (ECHOKE)
1165 | ECHOCTL | ECHOKE
1166# endif
1167 | ECHOE | ECHOK);
1168# else /* HAVE_TERMIOS_H */
1169
1170 /*
1171 * sgtty interface
1172 */
1173
1174 /* get parameters -- gtty */
1175 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1176 {
1177 tio->sg.sg_erase = CERASE; /* ^H */
1178 tio->sg.sg_kill = CKILL; /* ^U */
1179 }
1180
1181 if (erase != -1)
1182 tio->sg.sg_erase = (char)erase;
1183
1184 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1185
1186 /* get special characters */
1187 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1188 {
1189 tio->tc.t_intrc = CINTR; /* ^C */
1190 tio->tc.t_quitc = CQUIT; /* ^\ */
1191 tio->tc.t_startc = CSTART; /* ^Q */
1192 tio->tc.t_stopc = CSTOP; /* ^S */
1193 tio->tc.t_eofc = CEOF; /* ^D */
1194 tio->tc.t_brkc = -1;
1195 }
1196
1197 /* get local special chars */
1198 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1199 {
1200 tio->lc.t_suspc = CSUSP; /* ^Z */
1201 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1202 tio->lc.t_rprntc = CRPRNT; /* ^R */
1203 tio->lc.t_flushc = CFLUSH; /* ^O */
1204 tio->lc.t_werasc = CWERASE; /* ^W */
1205 tio->lc.t_lnextc = CLNEXT; /* ^V */
1206 }
1207 /* get line discipline */
1208 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1209# ifdef NTTYDISC
1210 tio->line = NTTYDISC;
1211# endif /* NTTYDISC */
1212
1213 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1214#endif /* HAVE_TERMIOS_H */
1215
1216 /*
1217 * Debugging
1218 */
1219#ifdef DEBUG_TTYMODE
1220#ifdef HAVE_TERMIOS_H
1221 /* c_iflag bits */
1222 fprintf (stderr, "Input flags\n");
1223
1224 /* cpp token stringize doesn't work on all machines <sigh> */
1225# define FOO(flag,name) \
1226 if ((tio->c_iflag) & flag) \
1227 fprintf (stderr, "%s ", name)
1228
1229 /* c_iflag bits */
1230 FOO (IGNBRK, "IGNBRK");
1231 FOO (BRKINT, "BRKINT");
1232 FOO (IGNPAR, "IGNPAR");
1233 FOO (PARMRK, "PARMRK");
1234 FOO (INPCK, "INPCK");
1235 FOO (ISTRIP, "ISTRIP");
1236 FOO (INLCR, "INLCR");
1237 FOO (IGNCR, "IGNCR");
1238 FOO (ICRNL, "ICRNL");
1239 FOO (IXON, "IXON");
1240 FOO (IXOFF, "IXOFF");
1241# ifdef IUCLC
1242 FOO (IUCLC, "IUCLC");
1243# endif
1244# ifdef IXANY
1245 FOO (IXANY, "IXANY");
1246# endif
1247# ifdef IMAXBEL
1248 FOO (IMAXBEL, "IMAXBEL");
1249# endif
1250
1251 fprintf (stderr, "\n");
1252
1253# undef FOO
1254# define FOO(entry, name) \
1255 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1256
1257 FOO (VINTR, "VINTR");
1258 FOO (VQUIT, "VQUIT");
1259 FOO (VERASE, "VERASE");
1260 FOO (VKILL, "VKILL");
1261 FOO (VEOF, "VEOF");
1262 FOO (VEOL, "VEOL");
1263# ifdef VEOL2
1264 FOO (VEOL2, "VEOL2");
1265# endif
1266# ifdef VSWTC
1267 FOO (VSWTC, "VSWTC");
1268# endif
1269# ifdef VSWTCH
1270 FOO (VSWTCH, "VSWTCH");
1271# endif
1272 FOO (VSTART, "VSTART");
1273 FOO (VSTOP, "VSTOP");
1274 FOO (VSUSP, "VSUSP");
1275# ifdef VDSUSP
1276 FOO (VDSUSP, "VDSUSP");
1277# endif
1278# ifdef VREPRINT
1279 FOO (VREPRINT, "VREPRINT");
1280# endif
1281# ifdef VDISCRD
1282 FOO (VDISCRD, "VDISCRD");
1283# endif
1284# ifdef VWERSE
1285 FOO (VWERSE, "VWERSE");
1286# endif
1287# ifdef VLNEXT
1288 FOO (VLNEXT, "VLNEXT");
1289# endif
1290
1291 fprintf (stderr, "\n");
1292# undef FOO
1293# endif /* HAVE_TERMIOS_H */
1294#endif /* DEBUG_TTYMODE */
1295} 1521}
1296 1522
1297/*----------------------------------------------------------------------*/ 1523/*----------------------------------------------------------------------*/
1298/* 1524/*
1299 * Run the command in a subprocess and return a file descriptor for the 1525 * Run the command in a subprocess and return a file descriptor for the
… …
1311 if (pty->pty >= 0) 1537 if (pty->pty >= 0)
1312 { 1538 {
1313 if (getfd_hook) 1539 if (getfd_hook)
1314 pty->pty = (*getfd_hook) (pty->pty); 1540 pty->pty = (*getfd_hook) (pty->pty);
1315 1541
1316 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1542 if (pty->pty < 0)
1317 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1543 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1318 } 1544 }
1319 } 1545 }
1320 else 1546 else
1321#endif 1547#endif
1322 if (!pty->get ()) 1548 if (!pty->get ())
1323 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1324 1550
1551 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552
1553 struct termios tio = def_tio;
1554
1555#ifndef NO_BACKSPACE_KEY
1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1557 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1558 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1559 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1560#endif
1561
1562 /* init terminal attributes */
1563 cfsetospeed (&tio, BAUDRATE);
1564 cfsetispeed (&tio, BAUDRATE);
1565 tcsetattr (pty->tty, TCSANOW, &tio);
1325 pty->set_utf8_mode (enc_utf8); 1566 pty->set_utf8_mode (enc_utf8);
1326 1567
1327 /* set initial window size */ 1568 /* set initial window size */
1328 tt_winch (); 1569 tt_winch ();
1329
1330 int er;
1331
1332#ifndef NO_BACKSPACE_KEY
1333 if (key_backspace[0] && !key_backspace[1])
1334 er = key_backspace[0];
1335 else if (strcmp (key_backspace, "DEC") == 0)
1336 er = '\177'; /* the initial state anyway */
1337 else
1338#endif
1339 er = -1;
1340
1341 rxvt_get_ttymode (&tio, er);
1342 1570
1343#if ENABLE_FRILLS 1571#if ENABLE_FRILLS
1344 if (rs[Rs_pty_fd]) 1572 if (rs[Rs_pty_fd])
1345 return; 1573 return;
1346#endif 1574#endif
… …
1377 } 1605 }
1378 1606
1379 _exit (EXIT_FAILURE); 1607 _exit (EXIT_FAILURE);
1380 1608
1381 default: 1609 default:
1382 if (!OPTION (Opt_utmpInhibit)) 1610 if (!option (Opt_utmpInhibit))
1611 {
1612#ifdef LOG_ONLY_ON_LOGIN
1613 bool login_shell = option (Opt_loginShell);
1614#else
1615 bool login_shell = true;
1616#endif
1383 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1617 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1618 }
1384 1619
1385 pty->close_tty (); 1620 pty->close_tty ();
1386 1621
1387 child_ev.start (cmd_pid); 1622 child_ev.start (cmd_pid);
1388 1623
… …
1401int 1636int
1402rxvt_term::run_child (const char *const *argv) 1637rxvt_term::run_child (const char *const *argv)
1403{ 1638{
1404 char *login; 1639 char *login;
1405 1640
1406 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1407
1408 if (OPTION (Opt_console)) 1641 if (option (Opt_console))
1642 {
1409 { /* be virtual console, fail silently */ 1643 /* be virtual console, fail silently */
1410#ifdef TIOCCONS 1644#ifdef TIOCCONS
1411 unsigned int on = 1; 1645 unsigned int on = 1;
1412 1646
1413 ioctl (STDIN_FILENO, TIOCCONS, &on); 1647 ioctl (STDIN_FILENO, TIOCCONS, &on);
1414#elif defined (SRIOCSREDIR) 1648#elif defined (SRIOCSREDIR)
1415 int fd; 1649 int fd;
1416 1650
1417 fd = open (CONSOLE, O_WRONLY, 0); 1651 fd = open (CONSOLE, O_WRONLY, 0);
1418 if (fd >= 0) 1652 if (fd >= 0)
1419 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1653 {
1654 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1420 close (fd); 1655 close (fd);
1421#endif /* SRIOCSREDIR */ 1656 }
1657#endif /* SRIOCSREDIR */
1422 } 1658 }
1423 1659
1424 /* reset signals and spin off the command interpreter */ 1660 /* reset signals and spin off the command interpreter */
1425 signal (SIGINT, SIG_DFL); 1661 signal (SIGINT, SIG_DFL);
1426 signal (SIGQUIT, SIG_DFL); 1662 signal (SIGQUIT, SIG_DFL);
1427 signal (SIGCHLD, SIG_DFL); 1663 signal (SIGCHLD, SIG_DFL);
1428 signal (SIGHUP, SIG_DFL); 1664 signal (SIGHUP, SIG_DFL);
1429 signal (SIGPIPE, SIG_DFL); 1665 signal (SIGPIPE, SIG_DFL);
1430 /* 1666 /*
1431 * mimick login's behavior by disabling the job control signals 1667 * mimic login's behavior by disabling the job control signals
1432 * a shell that wants them can turn them back on 1668 * a shell that wants them can turn them back on
1433 */ 1669 */
1434#ifdef SIGTSTP 1670#ifdef SIGTSTP
1435 signal (SIGTSTP, SIG_IGN); 1671 signal (SIGTSTP, SIG_IGN);
1436 signal (SIGTTIN, SIG_IGN); 1672 signal (SIGTTIN, SIG_IGN);
1437 signal (SIGTTOU, SIG_IGN); 1673 signal (SIGTTOU, SIG_IGN);
1438#endif /* SIGTSTP */ 1674#endif /* SIGTSTP */
1439
1440 // unblock signals (signals are blocked by iom.C
1441 sigset_t ss;
1442 sigemptyset (&ss);
1443 sigprocmask (SIG_SETMASK, &ss, 0);
1444 1675
1445 /* command interpreter path */ 1676 /* command interpreter path */
1446 if (argv != NULL) 1677 if (argv)
1447 { 1678 {
1448# ifdef DEBUG_CMD 1679# ifdef DEBUG_CMD
1449 int i; 1680 int i;
1450 1681
1451 for (i = 0; argv[i]; i++) 1682 for (i = 0; argv[i]; i++)
… …
1460 const char *argv0, *shell; 1691 const char *argv0, *shell;
1461 1692
1462 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1693 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1463 shell = "/bin/sh"; 1694 shell = "/bin/sh";
1464 1695
1465 argv0 = (const char *)rxvt_r_basename (shell); 1696 argv0 = rxvt_basename (shell);
1466 1697
1467 if (OPTION (Opt_loginShell)) 1698 if (option (Opt_loginShell))
1468 { 1699 {
1469 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1700 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1470 1701
1471 login[0] = '-'; 1702 login[0] = '-';
1472 strcpy (&login[1], argv0); 1703 strcpy (&login[1], argv0);
1473 argv0 = login; 1704 argv0 = login;
1474 } 1705 }
1475 1706
1476 execlp (shell, argv0, NULL); 1707 execlp (shell, argv0, (char *)0);
1477 /* no error message: STDERR is closed! */ 1708 /* no error message: STDERR is closed! */
1478 } 1709 }
1479 1710
1480 return -1; 1711 return -1;
1481} 1712}

Diff Legend

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