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

Diff Legend

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