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.194 by sasha, Thu Jul 26 16:17:50 2007 UTC vs.
Revision 1.350 by root, Sat Jul 3 04:04:13 2021 UTC

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

Diff Legend

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