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.171 by root, Mon Feb 20 20:44:22 2006 UTC vs.
Revision 1.329 by sf-exg, Mon Jun 11 14:56:33 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 -e 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"))
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
302 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
303 xa = display->xa; 588 xa = display->xa;
304 589
305#if XFT
306 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0));
308 else
309#endif
310 set (display); 590 set (display);
311
312 extract_resources (); 591 extract_resources ();
313 592
314 free (r_argv); 593#if ENABLE_FRILLS
594 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
598#endif
315 599
316 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
318 rs [i] = 0; 602 rs [i] = 0;
319 603
… …
327 { 611 {
328 rxvt_perl.init (this); 612 rxvt_perl.init (this);
329 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
330 } 614 }
331#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
332 620
333 /* 621 /*
334 * set any defaults not already set 622 * set any defaults not already set
335 */ 623 */
336 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
337 { 625 {
338 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
340 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
342 } 631 }
343 else 632 else
344 { 633 {
345 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
346 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
347 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
349 } 639 }
350 640
351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 648 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
360 650
361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
362 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 652 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
653
654 if (rs[Rs_letterSpace])
655 letterSpace = atoi (rs[Rs_letterSpace]);
363#endif 656#endif
364 657
365#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
367 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
371 664
372 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
373 if (!saveLines) 666 if (!saveLines)
374 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
375 668
376#ifdef PRINTPIPE
377 if (!rs[Rs_print_pipe])
378 rs[Rs_print_pipe] = PRINTPIPE;
379#endif
380
381 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
382 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
383 671
384#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 673 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 674# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 675 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 676# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 677 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 678# endif
391 else
392 {
393 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val;
397 }
398#endif 679#endif
399 680
400#ifndef NO_DELETE_KEY 681#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 682 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 683# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 684 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 685# else
405 key_delete = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
406# endif 687# endif
407 else
408 {
409 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val;
413 }
414#endif 688#endif
415 if (rs[Rs_answerbackstring])
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 689
421#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif
424 691
425#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
428 { 695 {
429 if (!rs[Rs_color + Color_fg]) 696 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 697 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 698
432 if (!rs[Rs_color + Color_bg]) 699 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 705 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 706 rs[Rs_color + i] = def_colorName[i];
440 707
441#ifndef XTERM_REVERSE_VIDEO 708#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 709 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 710 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 711 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 712#endif
446 713
447 /* convenient aliases for setting fg/bg to colors */ 714 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 715 color_aliases (Color_fg);
449 color_aliases (Color_bg); 716 color_aliases (Color_bg);
450#ifndef NO_CURSORCOLOR 717#ifndef NO_CURSORCOLOR
451 color_aliases (Color_cursor); 718 color_aliases (Color_cursor);
452 color_aliases (Color_cursor2); 719 color_aliases (Color_cursor2);
453#endif /* NO_CURSORCOLOR */ 720#endif /* NO_CURSORCOLOR */
454 color_aliases (Color_pointer_fg); 721 color_aliases (Color_pointer_fg);
455 color_aliases (Color_pointer_bg); 722 color_aliases (Color_pointer_bg);
456 color_aliases (Color_border); 723 color_aliases (Color_border);
457#ifndef NO_BOLD_UNDERLINE_REVERSE 724#ifndef NO_BOLD_UNDERLINE_REVERSE
458 color_aliases (Color_BD); 725 color_aliases (Color_BD);
459 color_aliases (Color_UL); 726 color_aliases (Color_UL);
460 color_aliases (Color_RV); 727 color_aliases (Color_RV);
461#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 728#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
462 729
463 if (!rs[Rs_color + Color_border]) 730 if (!rs[Rs_color + Color_border])
464 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 731 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
465 732
466 return cmd_argv; 733 return cmd_argv;
734}
735
736/*----------------------------------------------------------------------*/
737void
738rxvt_term::init (stringvec *argv, stringvec *envv)
739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
744 this->envv = envv;
745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
771 SET_R (this);
772 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :(
774
775 init_vars ();
776
777 const char **cmd_argv = init_resources (argc, argv);
778
779#ifdef KEYSYM_RESOURCE
780 keyboard->register_done ();
781#endif
782
783 if (const char *path = rs[Rs_chdir])
784 if (*path) // ignored if empty
785 {
786 if (*path != '/')
787 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
788
789 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 }
792
793 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810
811#ifdef HAVE_BG_PIXMAP
812 bg_init ();
813#endif
814
815#if ENABLE_PERL
816 rootwin_ev.start (display, display->root);
817#endif
818
819 init_done = 1;
820
821 init_command (cmd_argv);
822
823 if (pty->pty >= 0)
824 pty_ev.start (pty->pty, ev::READ);
825
826 HOOK_INVOKE ((this, HOOK_START, DT_END));
827
828#if ENABLE_XEMBED
829 if (rs[Rs_embed])
830 {
831 long info[2] = { 0, XEMBED_MAPPED };
832
833 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
834 32, PropModeReplace, (unsigned char *)&info, 2);
835 }
836#endif
837
838#if HAVE_STARTUP_NOTIFICATION
839 SnDisplay *snDisplay;
840 SnLauncheeContext *snContext;
841
842 snDisplay = sn_display_new (dpy, NULL, NULL);
843 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
844
845 /* Tell the window manager that this window is part of the startup context */
846 if (snContext)
847 sn_launchee_context_setup_window (snContext, parent);
848#endif
849
850 XMapWindow (dpy, vt);
851 XMapWindow (dpy, parent);
852
853#if HAVE_STARTUP_NOTIFICATION
854 if (snContext)
855 {
856 /* Mark the startup process as complete */
857 sn_launchee_context_complete (snContext);
858
859 sn_launchee_context_unref (snContext);
860 }
861
862 sn_display_unref (snDisplay);
863#endif
864
865 refresh_check ();
467} 866}
468 867
469/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
470void 869void
471rxvt_term::init_env () 870rxvt_term::init_env ()
472{ 871{
473 int i;
474 unsigned int u;
475 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
476 877
477#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
479 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
480 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
487 */ 888 */
488 val = rxvt_network_display (rs[Rs_display_name]); 889 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 890 rs[Rs_display_name] = (const char *)val;
490 891
491 if (val == NULL) 892 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 893#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (dpy); 894 val = XDisplayString (dpy);
494 895
495 if (rs[Rs_display_name] == NULL) 896 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 897 rs[Rs_display_name] = val; /* use broken `:0' value */
497 898
498 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
500 900
501 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
502 902
903 env_windowid = (char *)rxvt_malloc (21);
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
504 905
505 /* add entries to the environment: 906 /* add entries to the environment:
506 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
507 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
508 * @ COLORTERM: terminal sub-name and also indicates its color 909 * @ COLORTERM: terminal sub-name and also indicates its color
… …
511 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
512 */ 913 */
513 putenv (env_display); 914 putenv (env_display);
514 putenv (env_windowid); 915 putenv (env_windowid);
515 916
516 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
517 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
518 919
519#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
520 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
521#endif 922#endif
522 923
… …
525 else 926 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 927 putenv ("COLORTERM=" COLORTERMENVFULL);
527 928
528 if (rs[Rs_term_name] != NULL) 929 if (rs[Rs_term_name] != NULL)
529 { 930 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 931 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 932 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 933 putenv (env_term);
533 } 934 }
534 else 935 else
535 putenv ("TERM=" TERMENV); 936 putenv ("TERM=" TERMENV);
… …
537#ifdef HAVE_UNSETENV 938#ifdef HAVE_UNSETENV
538 /* avoid passing old settings and confusing term size */ 939 /* avoid passing old settings and confusing term size */
539 unsetenv ("LINES"); 940 unsetenv ("LINES");
540 unsetenv ("COLUMNS"); 941 unsetenv ("COLUMNS");
541 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
542#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
543} 944}
544 945
545/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
546/*
547 * This is more or less stolen straight from XFree86 xterm.
548 * This should support all European type languages.
549 */
550void 947void
551rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
552{ 949{
553 set_environ (envv); 950 set_environ (envv);
554 951
555#if HAVE_XSETLOCALE || HAVE_SETLOCALE
556 free (this->locale); 952 free (this->locale);
557 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
558 954
559 if (!this->locale) 955 if (!this->locale)
560 { 956 {
… …
568 964
569 this->locale = "C"; 965 this->locale = "C";
570 } 966 }
571 967
572 968
573 this->locale = rxvt_strdup (this->locale); 969 this->locale = strdup (this->locale);
574 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
575 mbstate.reset (); 971 mbstate.reset ();
576#endif
577 972
578#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
579 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
580 // /^UTF.?8/i 975 // /^UTF.?8/i
581 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
582 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
583 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
584 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
585 free (codeset);
586#else 980#else
587 enc_utf8 = 0; 981 enc_utf8 = 0;
588#endif 982#endif
589} 983}
590 984
591void 985void
592rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
593{ 987{
594 set_environ (envv); 988 set_environ (envv);
595 989
596#ifdef USE_XIM 990#if USE_XIM
597 if (!locale) 991 if (!locale)
598 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
599 else 993 else
600 { 994 {
601 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
602 996
603 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
604 { 998 {
605 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
606 return; 1000 return;
607 } 1001 }
608 1002
609 im_ev.start (display); 1003 im_ev.start (display);
610 1004
… …
622 * Initialize the command connection. 1016 * Initialize the command connection.
623 * This should be called after the X server connection is established. 1017 * This should be called after the X server connection is established.
624 */ 1018 */
625 1019
626#ifdef META8_OPTION 1020#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1021 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 1022#endif
629 1023
630 get_ourmods (); 1024 get_ourmods ();
631 1025
632 if (!OPTION (Opt_scrollTtyOutput)) 1026 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 1027 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 1028 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 1029 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 1030 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 1031 priv_modes |= PrivMode_smoothScroll;
638 1032
639#ifndef NO_BACKSPACE_KEY 1033#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 1034 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 1035 priv_modes |= PrivMode_HaveBackSpace;
642#endif 1036#endif
643 1037
644 /* add value for scrollBar */ 1038 /* add value for scrollBar */
645 if (scrollBar.state) 1039 if (scrollBar.state)
… …
651 run_command (argv); 1045 run_command (argv);
652} 1046}
653 1047
654/*----------------------------------------------------------------------*/ 1048/*----------------------------------------------------------------------*/
655void 1049void
656rxvt_term::Get_Colours () 1050rxvt_term::get_colours ()
657{ 1051{
658 int i; 1052 int i;
659 1053
660#ifdef OFF_FOCUS_FADING 1054#ifdef OFF_FOCUS_FADING
661 pix_colors = pix_colors_focused; 1055 pix_colors = pix_colors_focused;
662#endif 1056#endif
663 1057
664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1058 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
665 { 1059 {
666 const char *name = rs[Rs_color + i]; 1060 const char *name = rs[Rs_color + i];
667 1061
668 if (!name) 1062 if (!name)
… …
671 rxvt_color xcol; 1065 rxvt_color xcol;
672 1066
673 if (!set_color (xcol, name)) 1067 if (!set_color (xcol, name))
674 { 1068 {
675#ifndef XTERM_REVERSE_VIDEO 1069#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 1070 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 1071 name = def_colorName [1 - i];
678 else 1072 else
679#endif 1073#endif
680 name = def_colorName [i]; 1074 name = def_colorName [i];
681 1075
… …
721 * get scrollBar shadow colors 1115 * get scrollBar shadow colors
722 * 1116 *
723 * The calculations of topShadow/bottomShadow values are adapted 1117 * The calculations of topShadow/bottomShadow values are adapted
724 * from the fvwm window manager. 1118 * from the fvwm window manager.
725 */ 1119 */
726#ifdef KEEP_SCROLLCOLOR 1120#ifdef RXVT_SCROLLBAR
727 if (depth <= 2) 1121 if (depth <= 2)
728 { 1122 {
729 /* Monochrome */ 1123 /* Monochrome */
730 alias_color (Color_scroll, Color_fg); 1124 alias_color (Color_scroll, Color_fg);
731 alias_color (Color_topShadow, Color_bg); 1125 alias_color (Color_topShadow, Color_bg);
… …
746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1140 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
747 cscroll.a) 1141 cscroll.a)
748 )) 1142 ))
749 alias_color (Color_topShadow, Color_White); 1143 alias_color (Color_topShadow, Color_White);
750 } 1144 }
751#endif /* KEEP_SCROLLCOLOR */ 1145#endif
752 1146
753#ifdef OFF_FOCUS_FADING 1147#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1148 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 1149 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 1150#endif
762} 1151}
763 1152
764/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
766void 1155void
767rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
768{ 1157{
769 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
770 { 1159 {
771 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
772 1161
773 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
774 { /* bright colors */ 1163 /* bright colors */
775 i -= 8;
776 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1164 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
777 return; 1165 else if (i >= 0 && i <= 7)
778 } 1166 /* normal colors */
779
780 if (i >= 0 && i <= 7) /* normal colors */
781 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1167 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
782 } 1168 }
783} 1169}
784 1170
785/*----------------------------------------------------------------------*/ 1171/*----------------------------------------------------------------------*/
… …
869 1255
870 if (i) 1256 if (i)
871 ModMetaMask = modmasks[i - 1]; 1257 ModMetaMask = modmasks[i - 1];
872} 1258}
873 1259
1260void
1261rxvt_term::set_icon (const char *file)
1262{
1263#if HAVE_PIXBUF
1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1265 if (!pixbuf)
1266 {
1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1268 return;
1269 }
1270
1271 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1272 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1273
1274 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1275 {
1276 rxvt_warn ("Icon image too big, continuing without.\n");
1277 g_object_unref (pixbuf);
1278 return;
1279 }
1280
1281 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1282 {
1283 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1284 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1285 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1286
1287 buffer [0] = w;
1288 buffer [1] = h;
1289 for (int i = 0; i < h; i++)
1290 {
1291 for (int j = 0; j < w; j++)
1292 {
1293 unsigned char *pixel = row + j * channels;
1294 long value;
1295
1296 if (channels == 4)
1297 value = pixel[3];
1298 else
1299 value = (unsigned char)0x00ff;
1300
1301 value = (value << 8) + pixel[0];
1302 value = (value << 8) + pixel[1];
1303 value = (value << 8) + pixel[2];
1304 buffer[(i * w + j) + 2] = value;
1305 }
1306
1307 row += rowstride;
1308 }
1309
1310 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1311 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1312 free (buffer);
1313 }
1314 else
1315 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1316
1317 g_object_unref (pixbuf);
1318#endif
1319}
1320
874/*----------------------------------------------------------------------*/ 1321/*----------------------------------------------------------------------*/
875/* rxvt_Create_Windows () - Open and map the window */ 1322/* Open and map the window */
876void 1323void
877rxvt_term::create_windows (int argc, const char *const *argv) 1324rxvt_term::create_windows (int argc, const char *const *argv)
878{ 1325{
879 XClassHint classHint; 1326 XClassHint classHint;
880 XWMHints wmHint; 1327 XWMHints wmHint;
881#if ENABLE_FRILLS 1328#if ENABLE_FRILLS
882 MWMHints mwmhints; 1329 MWMHints mwmhints = { };
883#endif 1330#endif
884 XGCValues gcvalue; 1331 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 1332 XSetWindowAttributes attributes;
886 Window top, parent; 1333 Window top, parent;
887 1334
888 dLocal (Display *, dpy); 1335 dLocal (Display *, dpy);
889 1336
890 /* grab colors before netscape does */ 1337 /* grab colors before netscape does */
891 Get_Colours (); 1338 get_colours ();
892 1339
893 if (!set_fonts ()) 1340 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1341 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 1342
896 parent = display->root; 1343 parent = display->root;
897 1344
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1345 attributes.override_redirect = !!option (Opt_override_redirect);
899 1346
900#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 1348 if (option (Opt_borderLess))
902 { 1349 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1350 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 1351 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1352 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 1353 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 1354 }
909 else 1355 else
910 { 1356 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 1357 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 1358 }
914 } 1359 }
915 else
916 mwmhints.flags = 0;
917#endif 1360#endif
918 1361
919#if ENABLE_XEMBED 1362#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 1363 if (rs[Rs_embed])
921 { 1364 {
… …
930 } 1373 }
931#endif 1374#endif
932 1375
933 window_calc (0, 0); 1376 window_calc (0, 0);
934 1377
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 1378 /* sub-window placement & size in rxvt_term::resize_all_windows () */
936 attributes.background_pixel = pix_colors_focused [Color_border]; 1379 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused [Color_border]; 1380 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = cmap; 1381 attributes.colormap = cmap;
939 1382
940 top = XCreateWindow (dpy, parent, 1383 top = XCreateWindow (dpy, parent,
… …
943 ext_bwidth, 1386 ext_bwidth,
944 depth, InputOutput, visual, 1387 depth, InputOutput, visual,
945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
946 &attributes); 1389 &attributes);
947 1390
948 this->parent[0] = top; 1391 this->parent = top;
949 1392
950 old_width = szHint.width; 1393 set_title (rs [Rs_title]);
951 old_height = szHint.height; 1394 set_icon_name (rs [Rs_iconName]);
952
953 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
954 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
955 1395
956 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
958 1398
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 1400 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 1402 wmHint.window_group = top;
963 1403
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH
1407 /*
1408 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon
1410 */
1411
1412 if (rs [Rs_iconfile])
1413 {
1414 set_icon (rs [Rs_iconfile]);
1415 }
1416#endif
966 1417
967#if ENABLE_FRILLS 1418#if ENABLE_FRILLS
968 if (mwmhints.flags) 1419 if (mwmhints.flags)
969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1421 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
975#if ENABLE_EWMH 1426#if ENABLE_EWMH
976 xa[XA_NET_WM_PING], 1427 xa[XA_NET_WM_PING],
977#endif 1428#endif
978 }; 1429 };
979 1430
980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1431 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
981 1432
982#if ENABLE_FRILLS 1433#if ENABLE_FRILLS
983 if (rs[Rs_transient_for]) 1434 if (rs[Rs_transient_for])
984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1435 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
985#endif 1436#endif
… …
1005 termwin_ev.start (display, top); 1456 termwin_ev.start (display, top);
1006 1457
1007 /* vt cursor: Black-on-White is standard, but this is more popular */ 1458 /* vt cursor: Black-on-White is standard, but this is more popular */
1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1009 1460
1010#ifdef HAVE_SCROLLBARS
1011 /* cursor scrollBar: Black-on-White */
1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1013#endif
1014
1015 /* the vt window */ 1461 /* the vt window */
1016 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1017 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1018 width, height, 1464 vt_width, vt_height,
1019 0, 1465 0,
1020 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1021 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1022 1468
1023 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1470 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1471
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1472 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1473
1028 if (OPTION (Opt_pointerBlank)) 1474 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1475 vt_emask |= PointerMotionMask;
1030 else 1476 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1477 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1478
1033 vt_select_input (); 1479 vt_select_input ();
1034 1480
1035 vt_ev.start (display, vt); 1481 vt_ev.start (display, vt);
1036
1037#ifdef XPM_BACKGROUND
1038 if (rs[Rs_backgroundPixmap] != NULL
1039 && !OPTION (Opt_transparent))
1040 {
1041 const char *p = rs[Rs_backgroundPixmap];
1042
1043 if ((p = strchr (p, ';')) != NULL)
1044 {
1045 p++;
1046 scale_pixmap (p);
1047 }
1048
1049 set_bgPixmap (rs[Rs_backgroundPixmap]);
1050 scr_touch (true);
1051 }
1052#endif
1053 1482
1054 /* graphics context for the vt window */ 1483 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1484 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1485 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1486 gcvalue.graphics_exposures = 0;
… …
1060 GCForeground | GCBackground | GCGraphicsExposures, 1489 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1490 &gcvalue);
1062 1491
1063 drawable = new rxvt_drawable (this, vt); 1492 drawable = new rxvt_drawable (this, vt);
1064 1493
1065#ifdef RXVT_SCROLLBAR
1066 gcvalue.foreground = pix_colors[Color_topShadow];
1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072#endif
1073
1074#ifdef OFF_FOCUS_FADING 1494#ifdef OFF_FOCUS_FADING
1075 // initially we are in unfocused state 1495 // initially we are in unfocused state
1076 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1077 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1078#endif 1498#endif
1079 1499
1080 pointer_unblank (); 1500 pointer_unblank ();
1081 scr_recolour (); 1501 scr_recolour ();
1082}
1083
1084/* ------------------------------------------------------------------------- *
1085 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */
1087void
1088rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{
1090#ifdef HAVE_TERMIOS_H
1091 /*
1092 * standard System V termios interface
1093 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 {
1096 // return error - use system defaults,
1097 // where possible, and zero elsewhere
1098 memset (tio, 0, sizeof (ttymode_t));
1099
1100 tio->c_cc[VINTR] = CINTR;
1101 tio->c_cc[VQUIT] = CQUIT;
1102 tio->c_cc[VERASE] = CERASE;
1103#ifdef VERASE2
1104 tio->c_cc[VERASE2] = CERASE2;
1105#endif
1106 tio->c_cc[VKILL] = CKILL;
1107 tio->c_cc[VSTART] = CSTART;
1108 tio->c_cc[VSTOP] = CSTOP;
1109 tio->c_cc[VSUSP] = CSUSP;
1110# ifdef VDSUSP
1111 tio->c_cc[VDSUSP] = CDSUSP;
1112# endif
1113# ifdef VREPRINT
1114 tio->c_cc[VREPRINT] = CRPRNT;
1115# endif
1116# ifdef VDISCRD
1117 tio->c_cc[VDISCRD] = CFLUSH;
1118# endif
1119# ifdef VWERSE
1120 tio->c_cc[VWERSE] = CWERASE;
1121# endif
1122# ifdef VLNEXT
1123 tio->c_cc[VLNEXT] = CLNEXT;
1124# endif
1125 }
1126
1127 tio->c_cc[VEOF] = CEOF;
1128 tio->c_cc[VEOL] = VDISABLE;
1129# ifdef VEOL2
1130 tio->c_cc[VEOL2] = VDISABLE;
1131# endif
1132# ifdef VSWTC
1133 tio->c_cc[VSWTC] = VDISABLE;
1134# endif
1135# ifdef VSWTCH
1136 tio->c_cc[VSWTCH] = VDISABLE;
1137# endif
1138# if VMIN != VEOF
1139 tio->c_cc[VMIN] = 1;
1140# endif
1141# if VTIME != VEOL
1142 tio->c_cc[VTIME] = 0;
1143# endif
1144
1145 if (erase != -1)
1146 tio->c_cc[VERASE] = (char)erase;
1147
1148 /* input modes */
1149 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1150# ifdef IMAXBEL
1151 | IMAXBEL
1152# endif
1153 | IXON);
1154
1155 /* output modes */
1156 tio->c_oflag = (OPOST | ONLCR);
1157
1158 /* control modes */
1159 tio->c_cflag = (CS8 | CREAD);
1160
1161 /* line discipline modes */
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE
1165# endif
1166 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214
1215 /*
1216 * Debugging
1217 */
1218#ifdef DEBUG_TTYMODE
1219#ifdef HAVE_TERMIOS_H
1220 /* c_iflag bits */
1221 fprintf (stderr, "Input flags\n");
1222
1223 /* cpp token stringize doesn't work on all machines <sigh> */
1224# define FOO(flag,name) \
1225 if ((tio->c_iflag) & flag) \
1226 fprintf (stderr, "%s ", name)
1227
1228 /* c_iflag bits */
1229 FOO (IGNBRK, "IGNBRK");
1230 FOO (BRKINT, "BRKINT");
1231 FOO (IGNPAR, "IGNPAR");
1232 FOO (PARMRK, "PARMRK");
1233 FOO (INPCK, "INPCK");
1234 FOO (ISTRIP, "ISTRIP");
1235 FOO (INLCR, "INLCR");
1236 FOO (IGNCR, "IGNCR");
1237 FOO (ICRNL, "ICRNL");
1238 FOO (IXON, "IXON");
1239 FOO (IXOFF, "IXOFF");
1240# ifdef IUCLC
1241 FOO (IUCLC, "IUCLC");
1242# endif
1243# ifdef IXANY
1244 FOO (IXANY, "IXANY");
1245# endif
1246# ifdef IMAXBEL
1247 FOO (IMAXBEL, "IMAXBEL");
1248# endif
1249
1250 fprintf (stderr, "\n");
1251
1252# undef FOO
1253# define FOO(entry, name) \
1254 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1255
1256 FOO (VINTR, "VINTR");
1257 FOO (VQUIT, "VQUIT");
1258 FOO (VERASE, "VERASE");
1259 FOO (VKILL, "VKILL");
1260 FOO (VEOF, "VEOF");
1261 FOO (VEOL, "VEOL");
1262# ifdef VEOL2
1263 FOO (VEOL2, "VEOL2");
1264# endif
1265# ifdef VSWTC
1266 FOO (VSWTC, "VSWTC");
1267# endif
1268# ifdef VSWTCH
1269 FOO (VSWTCH, "VSWTCH");
1270# endif
1271 FOO (VSTART, "VSTART");
1272 FOO (VSTOP, "VSTOP");
1273 FOO (VSUSP, "VSUSP");
1274# ifdef VDSUSP
1275 FOO (VDSUSP, "VDSUSP");
1276# endif
1277# ifdef VREPRINT
1278 FOO (VREPRINT, "VREPRINT");
1279# endif
1280# ifdef VDISCRD
1281 FOO (VDISCRD, "VDISCRD");
1282# endif
1283# ifdef VWERSE
1284 FOO (VWERSE, "VWERSE");
1285# endif
1286# ifdef VLNEXT
1287 FOO (VLNEXT, "VLNEXT");
1288# endif
1289
1290 fprintf (stderr, "\n");
1291# undef FOO
1292# endif /* HAVE_TERMIOS_H */
1293#endif /* DEBUG_TTYMODE */
1294} 1502}
1295 1503
1296/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1297/* 1505/*
1298 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the
… …
1310 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1311 { 1519 {
1312 if (getfd_hook) 1520 if (getfd_hook)
1313 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1314 1522
1315 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1316 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1317 } 1525 }
1318 } 1526 }
1319 else 1527 else
1320#endif 1528#endif
1321 if (!pty->get ()) 1529 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1531
1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1533
1534 struct termios tio = def_tio;
1535
1536#ifndef NO_BACKSPACE_KEY
1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1538 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1539 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1540 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1541#endif
1542
1543 /* init terminal attributes */
1544 cfsetospeed (&tio, BAUDRATE);
1545 cfsetispeed (&tio, BAUDRATE);
1546 tcsetattr (pty->tty, TCSANOW, &tio);
1324 pty->set_utf8_mode (enc_utf8); 1547 pty->set_utf8_mode (enc_utf8);
1325 1548
1326 /* set initial window size */ 1549 /* set initial window size */
1327 tt_winch (); 1550 tt_winch ();
1328
1329 int er;
1330
1331#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0];
1334 else if (strcmp (key_backspace, "DEC") == 0)
1335 er = '\177'; /* the initial state anyway */
1336 else
1337#endif
1338 er = -1;
1339
1340 rxvt_get_ttymode (&tio, er);
1341 1551
1342#if ENABLE_FRILLS 1552#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1553 if (rs[Rs_pty_fd])
1344 return; 1554 return;
1345#endif 1555#endif
… …
1376 } 1586 }
1377 1587
1378 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1379 1589
1380 default: 1590 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1383 1600
1384 pty->close_tty (); 1601 pty->close_tty ();
1385 1602
1386 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1387 1604
… …
1400int 1617int
1401rxvt_term::run_child (const char *const *argv) 1618rxvt_term::run_child (const char *const *argv)
1402{ 1619{
1403 char *login; 1620 char *login;
1404 1621
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1622 if (option (Opt_console))
1623 {
1408 { /* be virtual console, fail silently */ 1624 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1625#ifdef TIOCCONS
1410 unsigned int on = 1; 1626 unsigned int on = 1;
1411 1627
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1628 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1414 int fd; 1630 int fd;
1415 1631
1416 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1633 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1419 close (fd); 1636 close (fd);
1420#endif /* SRIOCSREDIR */ 1637 }
1638#endif /* SRIOCSREDIR */
1421 } 1639 }
1422 1640
1423 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1643 signal (SIGQUIT, SIG_DFL);
1426 signal (SIGCHLD, SIG_DFL); 1644 signal (SIGCHLD, SIG_DFL);
1427 signal (SIGHUP, SIG_DFL); 1645 signal (SIGHUP, SIG_DFL);
1428 signal (SIGPIPE, SIG_DFL); 1646 signal (SIGPIPE, SIG_DFL);
1429 /* 1647 /*
1430 * mimick login's behavior by disabling the job control signals 1648 * mimic login's behavior by disabling the job control signals
1431 * a shell that wants them can turn them back on 1649 * a shell that wants them can turn them back on
1432 */ 1650 */
1433#ifdef SIGTSTP 1651#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1652 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1653 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1654 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1655#endif /* SIGTSTP */
1438
1439 // unblock signals (signals are blocked by iom.C
1440 sigset_t ss;
1441 sigemptyset (&ss);
1442 sigprocmask (SIG_SETMASK, &ss, 0);
1443 1656
1444 /* command interpreter path */ 1657 /* command interpreter path */
1445 if (argv != NULL) 1658 if (argv)
1446 { 1659 {
1447# ifdef DEBUG_CMD 1660# ifdef DEBUG_CMD
1448 int i; 1661 int i;
1449 1662
1450 for (i = 0; argv[i]; i++) 1663 for (i = 0; argv[i]; i++)
… …
1459 const char *argv0, *shell; 1672 const char *argv0, *shell;
1460 1673
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1674 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1675 shell = "/bin/sh";
1463 1676
1464 argv0 = (const char *)rxvt_r_basename (shell); 1677 argv0 = rxvt_basename (shell);
1465 1678
1466 if (OPTION (Opt_loginShell)) 1679 if (option (Opt_loginShell))
1467 { 1680 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1681 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1682
1470 login[0] = '-'; 1683 login[0] = '-';
1471 strcpy (&login[1], argv0); 1684 strcpy (&login[1], argv0);
1472 argv0 = login; 1685 argv0 = login;
1473 } 1686 }
1474 1687
1475 execlp (shell, argv0, NULL); 1688 execlp (shell, argv0, (char *)0);
1476 /* no error message: STDERR is closed! */ 1689 /* no error message: STDERR is closed! */
1477 } 1690 }
1478 1691
1479 return -1; 1692 return -1;
1480} 1693}

Diff Legend

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