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

Diff Legend

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