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

Diff Legend

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