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.197 by ayin, Thu Aug 2 15:01:30 2007 UTC vs.
Revision 1.349 by root, Tue Jun 25 03:35:01 2019 UTC

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

Diff Legend

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