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.179 by root, Sat Jan 20 12:29:35 2007 UTC vs.
Revision 1.347 by sf-exg, Thu Jul 14 05:10:06 2016 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)
49 "rgb:cd/00/00", // 1: red (Red3) 187 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 188 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (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(TRANSPARENT)
189 pixmap = None;
190#endif
191 576
192 MEvent.time = CurrentTime; 577 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 578 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 579 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 580 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 581 ncol = 80;
198 nrow = 24; 582 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 583 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 584 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 585 lineSpace = LINESPACE;
586 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 587 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 588
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 589 refresh_type = SLOW_REFRESH;
207 590
208 oldcursor.row = oldcursor.col = -1; 591 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 592
215 last_bot = last_state = -1; 593 set_option (Opt_scrollBar);
216 594 set_option (Opt_scrollTtyOutput);
217 return true; 595 set_option (Opt_jumpScroll);
596 set_option (Opt_skipScroll);
597 set_option (Opt_secondaryScreen);
598 set_option (Opt_secondaryScroll);
599 set_option (Opt_pastableTabs);
600 set_option (Opt_intensityStyles);
601 set_option (Opt_iso14755);
602 set_option (Opt_iso14755_52);
603 set_option (Opt_buffered);
218} 604}
219 605
220void 606#if ENABLE_PERL
221rxvt_term::init_secondary () 607static void
608rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
222{ 609{
223 int i; 610 rxvt_perl.parse_resource (term, k, false, false, 0, v);
224
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO);
233 }
234 else if (i > STDIN_FILENO)
235 {
236 dup2 (i, STDIN_FILENO);
237 close (i);
238 }
239
240 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 611}
612#endif
253 613
254/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
255const char ** 615const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 616rxvt_term::init_resources (int argc, const char *const *argv)
257{ 617{
258 int i, r_argc; 618 int i;
259 char *val;
260 const char **cmd_argv, **r_argv; 619 const char **cmd_argv;
261 620
262 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */
265 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e"))
267 break;
268
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270
271 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i];
273
274 r_argv[i] = NULL;
275
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 621 rs[Rs_name] = rxvt_basename (argv[0]);
289 622
290 /* 623 /*
291 * Open display, get options/resources and create the window 624 * Open display, get options/resources and create the window
292 */ 625 */
293 626
294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 627 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
295 rs[Rs_display_name] = ":0"; 628 rs[Rs_display_name] = ":0";
296 629
297 get_options (r_argc, r_argv); 630 cmd_argv = get_options (argc, argv);
298 631
299 if (!(display = displays.get (rs[Rs_display_name]))) 632 if (!(display = displays.get (rs[Rs_display_name])))
300 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]);
301 634
302 // using a local pointer decreases code size a lot 635 // using a local pointer decreases code size a lot
303 xa = display->xa; 636 xa = display->xa;
304 637
305 set (display); 638 set (display);
306 extract_resources (); 639 extract_resources ();
307 640
308#if XFT 641#if ENABLE_FRILLS
309 if (rs[Rs_depth]) 642 if (rs[Rs_visual])
310 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));
311#endif 646#endif
312
313 free (r_argv);
314 647
315 for (int i = NUM_RESOURCES; i--; ) 648 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 649 if (rs [i] == resval_undef)
317 rs [i] = 0; 650 rs [i] = 0;
318 651
… …
323 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 656 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
324 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 657 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
325 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 658 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
326 { 659 {
327 rxvt_perl.init (this); 660 rxvt_perl.init (this);
661 enumerate_resources (rxvt_perl_parse_resource);
328 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 662 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
329 } 663 }
330#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 ();
331 669
332 /* 670 /*
333 * set any defaults not already set 671 * set any defaults not already set
334 */ 672 */
335 if (cmd_argv && cmd_argv[0]) 673 if (cmd_argv && cmd_argv[0])
336 { 674 {
337 if (!rs[Rs_title]) 675 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 676 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
677
339 if (!rs[Rs_iconName]) 678 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 679 rs[Rs_iconName] = rs[Rs_title];
341 } 680 }
342 else 681 else
343 { 682 {
344 if (!rs[Rs_title]) 683 if (!rs[Rs_title])
345 rs[Rs_title] = rs[Rs_name]; 684 rs[Rs_title] = rs[Rs_name];
685
346 if (!rs[Rs_iconName]) 686 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_name]; 687 rs[Rs_iconName] = rs[Rs_name];
348 } 688 }
349 689
350 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 690 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
357 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)
358 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 698 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
359 699
360 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 700 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
361 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]);
362#endif 705#endif
363 706
364#ifdef POINTER_BLANK 707#ifdef POINTER_BLANK
365 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 708 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
366 pointerBlankDelay = i; 709 pointerBlankDelay = i;
367 else 710 else
368 pointerBlankDelay = 2; 711 pointerBlankDelay = 2;
369#endif 712#endif
370 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
371 /* no point having a scrollbar without having any scrollback! */ 721 /* no point having a scrollbar without having any scrollback! */
372 if (!saveLines) 722 if (!saveLines)
373 set_option (Opt_scrollBar, 0); 723 set_option (Opt_scrollBar, 0);
374 724
375#ifdef PRINTPIPE
376 if (!rs[Rs_print_pipe])
377 rs[Rs_print_pipe] = PRINTPIPE;
378#endif
379
380 if (!rs[Rs_cutchars]) 725 if (!rs[Rs_cutchars])
381 rs[Rs_cutchars] = CUTCHARS; 726 rs[Rs_cutchars] = CUTCHARS;
382 727
383#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 729 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 730# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 731 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 732# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 733 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 734# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 735#endif
398 736
399#ifndef NO_DELETE_KEY 737#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 738 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 739# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 740 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 741# else
404 key_delete = "\033[3~"; 742 rs[Rs_delete_key] = "\033[3~";
405# endif 743# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 744#endif
414 if (rs[Rs_answerbackstring])
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 745
420#ifdef HAVE_SCROLLBARS 746 scrollBar.setup (this);
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif
423 747
424#ifdef XTERM_REVERSE_VIDEO 748#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 749 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 750 if (option (Opt_reverseVideo))
427 { 751 {
428 if (!rs[Rs_color + Color_fg]) 752 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 753 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 754
431 if (!rs[Rs_color + Color_bg]) 755 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 761 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 762 rs[Rs_color + i] = def_colorName[i];
439 763
440#ifndef XTERM_REVERSE_VIDEO 764#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 765 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 766 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 767 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 768#endif
445 769
446 /* convenient aliases for setting fg/bg to colors */ 770 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 771 color_aliases (Color_fg);
448 color_aliases (Color_bg); 772 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 773#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 774 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 775 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 776#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 777 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 778 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 779 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 780#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 781 color_aliases (Color_BD);
458 color_aliases (Color_UL); 782 color_aliases (Color_UL);
459 color_aliases (Color_RV); 783 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 784#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 785
462 if (!rs[Rs_color + Color_border]) 786 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 787 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 788
465 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 ();
466} 926}
467 927
468/*----------------------------------------------------------------------*/ 928/*----------------------------------------------------------------------*/
469void 929void
470rxvt_term::init_env () 930rxvt_term::init_env ()
471{ 931{
472 int i;
473 unsigned int u;
474 char *val; 932 char *val;
933 char *env_display;
934 char *env_windowid;
935 char *env_colorfgbg;
936 char *env_term;
475 937
476#ifdef DISPLAY_IS_IP 938#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 939 /* Fixup display_name for export over pty to any interested terminal
478 * 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
479 * (for the first non-loopback interface) that we get from 941 * (for the first non-loopback interface) that we get from
… …
486 */ 948 */
487 val = rxvt_network_display (rs[Rs_display_name]); 949 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 950 rs[Rs_display_name] = (const char *)val;
489 951
490 if (val == NULL) 952 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 953#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 954 val = XDisplayString (dpy);
493 955
494 if (rs[Rs_display_name] == NULL) 956 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 957 rs[Rs_display_name] = val; /* use broken `:0' value */
496 958
497 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 959 env_display = (char *)rxvt_malloc (strlen (val) + 9);
499 960
500 sprintf (env_display, "DISPLAY=%s", val); 961 sprintf (env_display, "DISPLAY=%s", val);
501 962
963 env_windowid = (char *)rxvt_malloc (21);
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 964 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
503 965
504 /* add entries to the environment: 966 /* add entries to the environment:
505 * @ DISPLAY: in case we started with -display 967 * @ DISPLAY: in case we started with -display
506 * @ WINDOWID: X window id number of the window 968 * @ WINDOWID: X window id number of the window
507 * @ COLORTERM: terminal sub-name and also indicates its color 969 * @ COLORTERM: terminal sub-name and also indicates its color
… …
510 * @ COLORFGBG: fg;bg color codes 972 * @ COLORFGBG: fg;bg color codes
511 */ 973 */
512 putenv (env_display); 974 putenv (env_display);
513 putenv (env_windowid); 975 putenv (env_windowid);
514 976
515 if (env_colorfgbg) 977 env_colorfgbg = get_colorfgbg ();
516 putenv (env_colorfgbg); 978 putenv (env_colorfgbg);
517 979
518#ifdef RXVT_TERMINFO 980#ifdef RXVT_TERMINFO
519 putenv ("TERMINFO=" RXVT_TERMINFO); 981 putenv ("TERMINFO=" RXVT_TERMINFO);
520#endif 982#endif
521 983
… …
524 else 986 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 987 putenv ("COLORTERM=" COLORTERMENVFULL);
526 988
527 if (rs[Rs_term_name] != NULL) 989 if (rs[Rs_term_name] != NULL)
528 { 990 {
529 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);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 992 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 993 putenv (env_term);
532 } 994 }
533 else 995 else
534 putenv ("TERM=" TERMENV); 996 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 998#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 999 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 1000 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 1001 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 1002 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 1003#endif /* HAVE_UNSETENV */
542} 1004}
543 1005
544/*----------------------------------------------------------------------*/ 1006/*----------------------------------------------------------------------*/
545/*
546 * This is more or less stolen straight from XFree86 xterm.
547 * This should support all European type languages.
548 */
549void 1007void
550rxvt_term::set_locale (const char *locale) 1008rxvt_term::set_locale (const char *locale)
551{ 1009{
552 set_environ (envv); 1010 set_environ (env);
553 1011
554#if HAVE_XSETLOCALE || HAVE_SETLOCALE
555 free (this->locale); 1012 free (this->locale);
556 this->locale = setlocale (LC_CTYPE, locale); 1013 this->locale = setlocale (LC_CTYPE, locale);
557 1014
558 if (!this->locale) 1015 if (!this->locale)
559 { 1016 {
… …
567 1024
568 this->locale = "C"; 1025 this->locale = "C";
569 } 1026 }
570 1027
571 1028
572 this->locale = rxvt_strdup (this->locale); 1029 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 1030 SET_LOCALE (this->locale);
574 mbstate.reset (); 1031 mbstate.reset ();
575#endif
576 1032
577#if HAVE_NL_LANGINFO 1033#if HAVE_NL_LANGINFO
578 char *codeset = strdup (nl_langinfo (CODESET)); 1034 char *codeset = nl_langinfo (CODESET);
579 // /^UTF.?8/i 1035 // /^UTF.?8/i
580 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1036 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
581 && (codeset[1] == 'T' || codeset[1] == 't') 1037 && (codeset[1] == 'T' || codeset[1] == 't')
582 && (codeset[2] == 'F' || codeset[2] == 'f') 1038 && (codeset[2] == 'F' || codeset[2] == 'f')
583 && (codeset[3] == '8' || codeset[4] == '8'); 1039 && (codeset[3] == '8' || codeset[4] == '8');
584 free (codeset);
585#else 1040#else
586 enc_utf8 = 0; 1041 enc_utf8 = 0;
587#endif 1042#endif
588} 1043}
589 1044
590void 1045void
591rxvt_term::init_xlocale () 1046rxvt_term::init_xlocale ()
592{ 1047{
593 set_environ (envv); 1048 set_environ (env);
594 1049
595#ifdef USE_XIM 1050#if USE_XIM
596 if (!locale) 1051 if (!locale)
597 rxvt_warn ("setting locale failed, working without locale support.\n"); 1052 rxvt_warn ("setting locale failed, continuing without locale support.\n");
598 else 1053 else
599 { 1054 {
600 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1055 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
601 1056
602 if (!XSupportsLocale ()) 1057 if (!XSupportsLocale ())
603 { 1058 {
604 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");
605 return; 1060 return;
606 } 1061 }
607 1062
608 im_ev.start (display); 1063 im_ev.start (display);
609 1064
… …
621 * Initialize the command connection. 1076 * Initialize the command connection.
622 * This should be called after the X server connection is established. 1077 * This should be called after the X server connection is established.
623 */ 1078 */
624 1079
625#ifdef META8_OPTION 1080#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1081 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 1082#endif
628 1083
629 get_ourmods (); 1084 get_ourmods ();
630 1085
631 if (!OPTION (Opt_scrollTtyOutput)) 1086 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 1087 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 1088 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 1089 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 1090 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 1091 priv_modes |= PrivMode_smoothScroll;
637 1092
638#ifndef NO_BACKSPACE_KEY 1093#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 1094 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 1095 priv_modes |= PrivMode_HaveBackSpace;
641#endif 1096#endif
642 1097
643 /* add value for scrollBar */ 1098 /* add value for scrollBar */
644 if (scrollBar.state) 1099 if (scrollBar.state)
… …
650 run_command (argv); 1105 run_command (argv);
651} 1106}
652 1107
653/*----------------------------------------------------------------------*/ 1108/*----------------------------------------------------------------------*/
654void 1109void
655rxvt_term::Get_Colours () 1110rxvt_term::get_colors ()
656{ 1111{
657 int i; 1112 int i;
658 1113
659#ifdef OFF_FOCUS_FADING 1114#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 1115 pix_colors = pix_colors_focused;
661#endif 1116#endif
662 1117
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1118 for (i = 0; i < NRS_COLORS; i++)
664 {
665 const char *name = rs[Rs_color + i]; 1119 if (const char *name = rs[Rs_color + i])
666
667 if (!name)
668 continue;
669
670 rxvt_color xcol;
671
672 if (!set_color (xcol, name)) 1120 set_color (pix_colors [i], name);
673 {
674#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo))
676 name = def_colorName [1 - i];
677 else
678#endif
679 name = def_colorName [i];
680
681 if (!name)
682 continue;
683
684 if (!set_color (xcol, name))
685 {
686 switch (i)
687 {
688 case Color_fg:
689 case Color_bg:
690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
691 name = "";
692 break;
693#ifndef NO_CURSORCOLOR
694 case Color_cursor2:
695#endif
696 case Color_pointer_fg:
697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
699 break;
700 default:
701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
703 break;
704 }
705 }
706 }
707
708 pix_colors[i] = xcol;
709 rs[Rs_color + i] = name;
710 }
711
712 if (depth <= 2)
713 {
714 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
715 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
716 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 }
718 1121
719 /* 1122 /*
720 * get scrollBar shadow colors 1123 * get scrollBar shadow colors
721 * 1124 *
722 * The calculations of topShadow/bottomShadow values are adapted 1125 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 1126 * from the fvwm window manager.
724 */ 1127 */
725#ifdef KEEP_SCROLLCOLOR 1128#ifdef RXVT_SCROLLBAR
726 if (depth <= 2)
727 {
728 /* Monochrome */
729 alias_color (Color_scroll, Color_fg);
730 alias_color (Color_topShadow, Color_bg);
731 alias_color (Color_bottomShadow, Color_bg);
732 }
733 else
734 {
735 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1129 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
736 1130
737 rgba cscroll; 1131 rgba cscroll;
738 pix_colors [Color_scroll].get (cscroll); 1132 pix_colors [Color_scroll].get (cscroll);
739 1133
740 /* topShadowColor */ 1134 /* topShadowColor */
741 if (!pix_colors[Color_topShadow].set (this, 1135 if (!pix_colors[Color_topShadow].set (this,
742 rgba ( 1136 rgba (
743 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),
744 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),
745 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),
746 cscroll.a) 1140 cscroll.a)
747 )) 1141 ))
748 alias_color (Color_topShadow, Color_White); 1142 alias_color (Color_topShadow, Color_White);
749 } 1143#endif
750#endif /* KEEP_SCROLLCOLOR */
751 1144
752#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1146 for (i = 0; i < NRS_COLORS; i++)
754 update_fade_color (i); 1147 update_fade_color (i, true);
755#endif 1148#endif
756} 1149}
757 1150
758/*----------------------------------------------------------------------*/ 1151/*----------------------------------------------------------------------*/
759/* color aliases, fg/bg bright-bold */ 1152/* color aliases, fg/bg bright-bold */
760void 1153void
761rxvt_term::color_aliases (int idx) 1154rxvt_term::color_aliases (int idx)
762{ 1155{
763 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1156 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
764 { 1157 {
765 int i = atoi (rs[Rs_color + idx]); 1158 int i = atoi (rs[Rs_color + idx]);
766 1159
767 if (i >= 8 && i <= 15) 1160 if (i >= 8 && i <= 15)
768 { /* bright colors */ 1161 /* bright colors */
769 i -= 8;
770 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1162 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771 return; 1163 else if (i >= 0 && i <= 7)
772 } 1164 /* normal colors */
773
774 if (i >= 0 && i <= 7) /* normal colors */
775 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1165 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776 } 1166 }
777} 1167}
778 1168
779/*----------------------------------------------------------------------*/ 1169/*----------------------------------------------------------------------*/
… …
811 for (j = map->max_keypermod; j--; k++) 1201 for (j = map->max_keypermod; j--; k++)
812 { 1202 {
813 if (kc[k] == 0) 1203 if (kc[k] == 0)
814 break; 1204 break;
815 1205
816 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1206 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
817 { 1207 {
818 case XK_Num_Lock: 1208 case XK_Num_Lock:
819 ModNumLockMask = modmasks[i - 1]; 1209 ModNumLockMask = modmasks[i - 1];
820 continue; 1210 continue;
821 1211
… …
863 1253
864 if (i) 1254 if (i)
865 ModMetaMask = modmasks[i - 1]; 1255 ModMetaMask = modmasks[i - 1];
866} 1256}
867 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
868/*----------------------------------------------------------------------*/ 1319/*----------------------------------------------------------------------*/
869/* rxvt_Create_Windows () - Open and map the window */ 1320/* Open and map the window */
870void 1321void
871rxvt_term::create_windows (int argc, const char *const *argv) 1322rxvt_term::create_windows (int argc, const char *const *argv)
872{ 1323{
873 XClassHint classHint; 1324 XClassHint classHint;
874 XWMHints wmHint; 1325 XWMHints wmHint;
875#if ENABLE_FRILLS 1326#if ENABLE_FRILLS
876 MWMHints mwmhints; 1327 MWMHints mwmhints = { };
877#endif 1328#endif
878 XGCValues gcvalue; 1329 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 1330 XSetWindowAttributes attributes;
880 Window top, parent; 1331 Window top, parent;
881 1332
882 dLocal (Display *, dpy); 1333 dLocal (Display *, dpy);
883 1334
884 /* grab colors before netscape does */ 1335 /* grab colors before netscape does */
885 Get_Colours (); 1336 get_colors ();
886 1337
887 if (!set_fonts ()) 1338 if (!set_fonts ())
888 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");
889 1340
890 parent = display->root; 1341 parent = display->root;
891 1342
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1343 attributes.override_redirect = !!option (Opt_override_redirect);
893 1344
894#if ENABLE_FRILLS 1345#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 1346 if (option (Opt_borderLess))
896 { 1347 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1348 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 1349 {
899 /* 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");
900 attributes.override_redirect = true; 1351 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 1352 }
903 else 1353 else
904 { 1354 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 1355 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 1356 }
908 } 1357 }
909 else
910 mwmhints.flags = 0;
911#endif 1358#endif
912 1359
913#if ENABLE_XEMBED 1360#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 1361 if (rs[Rs_embed])
915 { 1362 {
… …
924 } 1371 }
925#endif 1372#endif
926 1373
927 window_calc (0, 0); 1374 window_calc (0, 0);
928 1375
929 /* sub-window placement & size in rxvt_resize_subwindows () */ 1376 /* sub-window placement & size in rxvt_term::resize_all_windows () */
930 attributes.background_pixel = pix_colors_focused [Color_border]; 1377 attributes.background_pixel = pix_colors_focused [Color_border];
931 attributes.border_pixel = pix_colors_focused [Color_border]; 1378 attributes.border_pixel = pix_colors_focused [Color_border];
932 attributes.colormap = cmap; 1379 attributes.colormap = cmap;
933 1380
934 top = XCreateWindow (dpy, parent, 1381 top = XCreateWindow (dpy, parent,
… …
937 ext_bwidth, 1384 ext_bwidth,
938 depth, InputOutput, visual, 1385 depth, InputOutput, visual,
939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1386 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
940 &attributes); 1387 &attributes);
941 1388
942 this->parent[0] = top; 1389 this->parent = top;
943 1390
944 old_width = szHint.width; 1391 set_title (rs [Rs_title]);
945 old_height = szHint.height; 1392 set_icon_name (rs [Rs_iconName]);
946
947 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
948 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
949 1393
950 classHint.res_name = (char *)rs[Rs_name]; 1394 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1395 classHint.res_class = (char *)RESCLASS;
952 1396
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1397 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1398 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1399 wmHint.initial_state = option (Opt_iconic) ? IconicState
1400 : option (Opt_dockapp) ? WithdrawnState
1401 : NormalState;
956 wmHint.window_group = top; 1402 wmHint.window_group = top;
957 1403
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &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
960 1415
961#if ENABLE_FRILLS 1416#if ENABLE_FRILLS
962 if (mwmhints.flags) 1417 if (mwmhints.flags)
963 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,
964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1419 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
969#if ENABLE_EWMH 1424#if ENABLE_EWMH
970 xa[XA_NET_WM_PING], 1425 xa[XA_NET_WM_PING],
971#endif 1426#endif
972 }; 1427 };
973 1428
974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1429 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
975 1430
976#if ENABLE_FRILLS 1431#if ENABLE_FRILLS
977 if (rs[Rs_transient_for]) 1432 if (rs[Rs_transient_for])
978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1433 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
979#endif 1434#endif
… …
997 | ExposureMask | StructureNotifyMask); 1452 | ExposureMask | StructureNotifyMask);
998 1453
999 termwin_ev.start (display, top); 1454 termwin_ev.start (display, top);
1000 1455
1001 /* 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
1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, shape);
1003
1004#ifdef HAVE_SCROLLBARS
1005 /* cursor scrollBar: Black-on-White */
1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1007#endif
1008 1469
1009 /* the vt window */ 1470 /* the vt window */
1010 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1011 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1012 width, height, 1473 vt_width, vt_height,
1013 0, 1474 0,
1014 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1015 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1016 1477
1017 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1479 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1480
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1481 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1482
1022 if (OPTION (Opt_pointerBlank)) 1483 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1484 vt_emask |= PointerMotionMask;
1024 else 1485 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1486 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1487
1027 vt_select_input (); 1488 vt_select_input ();
1028 1489
1029 vt_ev.start (display, vt); 1490 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1491
1048 /* graphics context for the vt window */ 1492 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1493 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1494 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1495 gcvalue.graphics_exposures = 0;
… …
1054 GCForeground | GCBackground | GCGraphicsExposures, 1498 GCForeground | GCBackground | GCGraphicsExposures,
1055 &gcvalue); 1499 &gcvalue);
1056 1500
1057 drawable = new rxvt_drawable (this, vt); 1501 drawable = new rxvt_drawable (this, vt);
1058 1502
1059#ifdef RXVT_SCROLLBAR
1060 gcvalue.foreground = pix_colors[Color_topShadow];
1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1066#endif
1067
1068#ifdef OFF_FOCUS_FADING 1503#ifdef OFF_FOCUS_FADING
1069 // initially we are in unfocused state 1504 // initially we are in unfocused state
1070 if (rs[Rs_fade]) 1505 if (rs[Rs_fade])
1071 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1072#endif 1507#endif
1073 1508
1074 pointer_unblank (); 1509 pointer_unblank ();
1075 scr_recolour (); 1510 scr_recolor ();
1076}
1077
1078/* ------------------------------------------------------------------------- *
1079 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */
1081void
1082rxvt_get_ttymode (ttymode_t *tio, int erase)
1083{
1084 /*
1085 * standard System V termios interface
1086 */
1087 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1088 {
1089 // return error - use system defaults,
1090 // where possible, and zero elsewhere
1091 memset (tio, 0, sizeof (ttymode_t));
1092
1093 tio->c_cc[VINTR] = CINTR;
1094 tio->c_cc[VQUIT] = CQUIT;
1095 tio->c_cc[VERASE] = CERASE;
1096#ifdef VERASE2
1097 tio->c_cc[VERASE2] = CERASE2;
1098#endif
1099 tio->c_cc[VKILL] = CKILL;
1100 tio->c_cc[VSTART] = CSTART;
1101 tio->c_cc[VSTOP] = CSTOP;
1102 tio->c_cc[VSUSP] = CSUSP;
1103# ifdef VDSUSP
1104 tio->c_cc[VDSUSP] = CDSUSP;
1105# endif
1106# ifdef VREPRINT
1107 tio->c_cc[VREPRINT] = CRPRNT;
1108# endif
1109# ifdef VDISCRD
1110 tio->c_cc[VDISCRD] = CFLUSH;
1111# endif
1112# ifdef VWERSE
1113 tio->c_cc[VWERSE] = CWERASE;
1114# endif
1115# ifdef VLNEXT
1116 tio->c_cc[VLNEXT] = CLNEXT;
1117# endif
1118 }
1119
1120 tio->c_cc[VEOF] = CEOF;
1121 tio->c_cc[VEOL] = VDISABLE;
1122# ifdef VEOL2
1123 tio->c_cc[VEOL2] = VDISABLE;
1124# endif
1125# ifdef VSWTC
1126 tio->c_cc[VSWTC] = VDISABLE;
1127# endif
1128# ifdef VSWTCH
1129 tio->c_cc[VSWTCH] = VDISABLE;
1130# endif
1131# if VMIN != VEOF
1132 tio->c_cc[VMIN] = 1;
1133# endif
1134# if VTIME != VEOL
1135 tio->c_cc[VTIME] = 0;
1136# endif
1137
1138 if (erase != -1)
1139 tio->c_cc[VERASE] = (char)erase;
1140
1141 /* input modes */
1142 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1143# ifdef IMAXBEL
1144 | IMAXBEL
1145# endif
1146 | IXON);
1147
1148 /* output modes */
1149 tio->c_oflag = (OPOST | ONLCR);
1150
1151 /* control modes */
1152 tio->c_cflag = (CS8 | CREAD);
1153
1154 /* line discipline modes */
1155 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1156# if defined (ECHOCTL) && defined (ECHOKE)
1157 | ECHOCTL | ECHOKE
1158# endif
1159 | ECHOE | ECHOK);
1160
1161 /*
1162 * Debugging
1163 */
1164#ifdef DEBUG_TTYMODE
1165#ifdef HAVE_TERMIOS_H
1166 /* c_iflag bits */
1167 fprintf (stderr, "Input flags\n");
1168
1169 /* cpp token stringize doesn't work on all machines <sigh> */
1170# define FOO(flag,name) \
1171 if ((tio->c_iflag) & flag) \
1172 fprintf (stderr, "%s ", name)
1173
1174 /* c_iflag bits */
1175 FOO (IGNBRK, "IGNBRK");
1176 FOO (BRKINT, "BRKINT");
1177 FOO (IGNPAR, "IGNPAR");
1178 FOO (PARMRK, "PARMRK");
1179 FOO (INPCK, "INPCK");
1180 FOO (ISTRIP, "ISTRIP");
1181 FOO (INLCR, "INLCR");
1182 FOO (IGNCR, "IGNCR");
1183 FOO (ICRNL, "ICRNL");
1184 FOO (IXON, "IXON");
1185 FOO (IXOFF, "IXOFF");
1186# ifdef IUCLC
1187 FOO (IUCLC, "IUCLC");
1188# endif
1189# ifdef IXANY
1190 FOO (IXANY, "IXANY");
1191# endif
1192# ifdef IMAXBEL
1193 FOO (IMAXBEL, "IMAXBEL");
1194# endif
1195
1196 fprintf (stderr, "\n");
1197
1198# undef FOO
1199# define FOO(entry, name) \
1200 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1201
1202 FOO (VINTR, "VINTR");
1203 FOO (VQUIT, "VQUIT");
1204 FOO (VERASE, "VERASE");
1205 FOO (VKILL, "VKILL");
1206 FOO (VEOF, "VEOF");
1207 FOO (VEOL, "VEOL");
1208# ifdef VEOL2
1209 FOO (VEOL2, "VEOL2");
1210# endif
1211# ifdef VSWTC
1212 FOO (VSWTC, "VSWTC");
1213# endif
1214# ifdef VSWTCH
1215 FOO (VSWTCH, "VSWTCH");
1216# endif
1217 FOO (VSTART, "VSTART");
1218 FOO (VSTOP, "VSTOP");
1219 FOO (VSUSP, "VSUSP");
1220# ifdef VDSUSP
1221 FOO (VDSUSP, "VDSUSP");
1222# endif
1223# ifdef VREPRINT
1224 FOO (VREPRINT, "VREPRINT");
1225# endif
1226# ifdef VDISCRD
1227 FOO (VDISCRD, "VDISCRD");
1228# endif
1229# ifdef VWERSE
1230 FOO (VWERSE, "VWERSE");
1231# endif
1232# ifdef VLNEXT
1233 FOO (VLNEXT, "VLNEXT");
1234# endif
1235
1236 fprintf (stderr, "\n");
1237# undef FOO
1238# endif /* HAVE_TERMIOS_H */
1239#endif /* DEBUG_TTYMODE */
1240} 1511}
1241 1512
1242/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1243/* 1514/*
1244 * 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
… …
1256 if (pty->pty >= 0) 1527 if (pty->pty >= 0)
1257 { 1528 {
1258 if (getfd_hook) 1529 if (getfd_hook)
1259 pty->pty = (*getfd_hook) (pty->pty); 1530 pty->pty = (*getfd_hook) (pty->pty);
1260 1531
1261 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1532 if (pty->pty < 0)
1262 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1533 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1263 } 1534 }
1264 } 1535 }
1265 else 1536 else
1266#endif 1537#endif
1267 if (!pty->get ()) 1538 if (!pty->get ())
1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1539 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269 1540
1270 int er; 1541 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1542
1543 struct termios tio = def_tio;
1271 1544
1272#ifndef NO_BACKSPACE_KEY 1545#ifndef NO_BACKSPACE_KEY
1273 if (key_backspace[0] && !key_backspace[1]) 1546 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274 er = key_backspace[0]; 1547 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1275 else if (strcmp (key_backspace, "DEC") == 0) 1548 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276 er = '\177'; /* the initial state anyway */ 1549 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1277 else
1278#endif 1550#endif
1279 er = -1;
1280 1551
1281 rxvt_get_ttymode (&tio, er); 1552 /* init terminal attributes */
1282 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1553 cfsetospeed (&tio, BAUDRATE);
1554 cfsetispeed (&tio, BAUDRATE);
1555 tcsetattr (pty->tty, TCSANOW, &tio);
1283 pty->set_utf8_mode (enc_utf8); 1556 pty->set_utf8_mode (enc_utf8);
1284 1557
1285 /* set initial window size */ 1558 /* set initial window size */
1286 tt_winch (); 1559 tt_winch ();
1287 1560
… …
1322 } 1595 }
1323 1596
1324 _exit (EXIT_FAILURE); 1597 _exit (EXIT_FAILURE);
1325 1598
1326 default: 1599 default:
1327 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
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1607 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1608 }
1329 1609
1330 pty->close_tty (); 1610 pty->close_tty ();
1331 1611
1332 child_ev.start (cmd_pid); 1612 child_ev.start (cmd_pid);
1333 1613
… …
1346int 1626int
1347rxvt_term::run_child (const char *const *argv) 1627rxvt_term::run_child (const char *const *argv)
1348{ 1628{
1349 char *login; 1629 char *login;
1350 1630
1351 if (OPTION (Opt_console)) 1631 if (option (Opt_console))
1632 {
1352 { /* be virtual console, fail silently */ 1633 /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1634#ifdef TIOCCONS
1354 unsigned int on = 1; 1635 unsigned int on = 1;
1355 1636
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1637 ioctl (STDIN_FILENO, TIOCCONS, &on);
1357#elif defined (SRIOCSREDIR) 1638#elif defined (SRIOCSREDIR)
1358 int fd; 1639 int fd;
1359 1640
1360 fd = open (CONSOLE, O_WRONLY, 0); 1641 fd = open (CONSOLE, O_WRONLY, 0);
1361 if (fd >= 0) 1642 if (fd >= 0)
1362 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1643 {
1644 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1363 close (fd); 1645 close (fd);
1364#endif /* SRIOCSREDIR */ 1646 }
1647#endif /* SRIOCSREDIR */
1365 } 1648 }
1366 1649
1367 /* reset signals and spin off the command interpreter */ 1650 /* reset signals and spin off the command interpreter */
1368 signal (SIGINT, SIG_DFL); 1651 signal (SIGINT, SIG_DFL);
1369 signal (SIGQUIT, SIG_DFL); 1652 signal (SIGQUIT, SIG_DFL);
1370 signal (SIGCHLD, SIG_DFL); 1653 signal (SIGCHLD, SIG_DFL);
1371 signal (SIGHUP, SIG_DFL); 1654 signal (SIGHUP, SIG_DFL);
1372 signal (SIGPIPE, SIG_DFL); 1655 signal (SIGPIPE, SIG_DFL);
1373 /* 1656 /*
1374 * mimick login's behavior by disabling the job control signals 1657 * mimic login's behavior by disabling the job control signals
1375 * a shell that wants them can turn them back on 1658 * a shell that wants them can turn them back on
1376 */ 1659 */
1377#ifdef SIGTSTP 1660#ifdef SIGTSTP
1378 signal (SIGTSTP, SIG_IGN); 1661 signal (SIGTSTP, SIG_IGN);
1379 signal (SIGTTIN, SIG_IGN); 1662 signal (SIGTTIN, SIG_IGN);
1380 signal (SIGTTOU, SIG_IGN); 1663 signal (SIGTTOU, SIG_IGN);
1381#endif /* SIGTSTP */ 1664#endif /* SIGTSTP */
1382
1383 // unblock signals (signals are blocked by iom.C
1384 sigset_t ss;
1385 sigemptyset (&ss);
1386 sigprocmask (SIG_SETMASK, &ss, 0);
1387 1665
1388 /* command interpreter path */ 1666 /* command interpreter path */
1389 if (argv != NULL) 1667 if (argv)
1390 { 1668 {
1391# ifdef DEBUG_CMD 1669# ifdef DEBUG_CMD
1392 int i; 1670 int i;
1393 1671
1394 for (i = 0; argv[i]; i++) 1672 for (i = 0; argv[i]; i++)
… …
1403 const char *argv0, *shell; 1681 const char *argv0, *shell;
1404 1682
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1683 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1684 shell = "/bin/sh";
1407 1685
1408 argv0 = (const char *)rxvt_r_basename (shell); 1686 argv0 = rxvt_basename (shell);
1409 1687
1410 if (OPTION (Opt_loginShell)) 1688 if (option (Opt_loginShell))
1411 { 1689 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1690 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413 1691
1414 login[0] = '-'; 1692 login[0] = '-';
1415 strcpy (&login[1], argv0); 1693 strcpy (&login[1], argv0);
1416 argv0 = login; 1694 argv0 = login;
1417 } 1695 }
1418 1696
1419 execlp (shell, argv0, NULL); 1697 execlp (shell, argv0, (char *)0);
1420 /* no error message: STDERR is closed! */ 1698 /* no error message: STDERR is closed! */
1421 } 1699 }
1422 1700
1423 return -1; 1701 return -1;
1424} 1702}

Diff Legend

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