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.192 by root, Tue Jul 24 14:38:59 2007 UTC vs.
Revision 1.328 by root, Thu Jun 7 16:04:31 2012 UTC

1 /*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
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 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
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)
… …
50 "rgb:00/cd/00", // 2: green (Green3) 158 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (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 ENABLE_TRANSPARENCY
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(ENABLE_TRANSPARENCY)
189 pixmap = None;
190#endif
191 536
192 MEvent.time = CurrentTime; 537 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 538 MEvent.button = AnyButton;
194 want_refresh = 1; 539 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 540 priv_modes = SavedModes = PrivMode_Default;
196 ncol = 80; 541 ncol = 80;
197 nrow = 24; 542 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 543 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 544 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 545 lineSpace = LINESPACE;
546 letterSpace = LETTERSPACE;
201 saveLines = SAVELINES; 547 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 548
204 refresh_type = SLOW_REFRESH; 549 refresh_type = SLOW_REFRESH;
205 550
206 oldcursor.row = oldcursor.col = -1; 551 oldcursor.row = oldcursor.col = -1;
207#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1;
214 552
215 set_option (Opt_scrollBar); 553 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 554 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 555 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll); 556 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 557 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 558 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 559 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 560 set_option (Opt_intensityStyles);
561 set_option (Opt_iso14755);
223 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
224 563 set_option (Opt_buffered);
225 return true;
226}
227
228void
229rxvt_term::init_secondary ()
230{
231 int i;
232
233 /*
234 * Close all unused file descriptors
235 * We don't want them, we don't need them.
236 */
237 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 {
239 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO);
241 }
242 else if (i > STDIN_FILENO)
243 {
244 dup2 (i, STDIN_FILENO);
245 close (i);
246 }
247
248 dup2 (STDERR_FILENO, STDOUT_FILENO);
249
250#if 0 // schmorp sayz closing filies is murder
251 for (i = STDERR_FILENO + 1; i < num_fds; i++)
252 {
253#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
254 if (i == 4 || i == 7)
255 continue;
256#endif
257 close (i);
258 }
259#endif
260} 564}
261 565
262/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
263const char ** 567const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
265{ 569{
266 int i, r_argc; 570 int i;
267 char *val;
268 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
269 572
270 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */
273 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e"))
275 break;
276
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278
279 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i];
281
282 r_argv[i] = NULL;
283
284 if (r_argc == argc)
285 cmd_argv = NULL;
286 else
287 {
288 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
289
290 for (i = 0; i < argc - r_argc - 1; i++)
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292
293 cmd_argv[i] = NULL;
294 }
295
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
297 574
298 /* 575 /*
299 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
300 */ 577 */
301 578
302 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
303 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
304 581
305 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
306 583
307 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
308 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]);
309 586
310 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
311 xa = display->xa; 588 xa = display->xa;
312 589
313 set (display); 590 set (display);
314 extract_resources (); 591 extract_resources ();
315 592
316#if XFT 593#if ENABLE_FRILLS
317 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
318 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));
319#endif 598#endif
320
321#ifdef HAVE_AFTERIMAGE
322 //TODO: is this neccessary for future versions who check the global var whern the macro doesn'T set it?
323 ::dpy = NULL ; /* init global var from libAfter... */
324 asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
325#endif
326 free (r_argv);
327 599
328 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
330 rs [i] = 0; 602 rs [i] = 0;
331 603
… …
339 { 611 {
340 rxvt_perl.init (this); 612 rxvt_perl.init (this);
341 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
342 } 614 }
343#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 ();
344 620
345 /* 621 /*
346 * set any defaults not already set 622 * set any defaults not already set
347 */ 623 */
348 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
349 { 625 {
350 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
352 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
354 } 631 }
355 else 632 else
356 { 633 {
357 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
358 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
359 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
360 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
361 } 639 }
362 640
363 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
370 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)
371 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372 650
373 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374 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]);
375#endif 656#endif
376 657
377#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
378 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
379 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
383 664
384 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
385 if (!saveLines) 666 if (!saveLines)
386 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
387 668
388#ifdef PRINTPIPE
389 if (!rs[Rs_print_pipe])
390 rs[Rs_print_pipe] = PRINTPIPE;
391#endif
392
393 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
394 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
395 671
396#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
397 if (!rs[Rs_backspace_key]) 673 if (!rs[Rs_backspace_key])
398# ifdef DEFAULT_BACKSPACE 674# ifdef DEFAULT_BACKSPACE
399 key_backspace = DEFAULT_BACKSPACE; 675 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
400# else 676# else
401 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 677 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
402# endif 678# endif
403 else
404 {
405 val = strdup (rs[Rs_backspace_key]);
406 rxvt_Str_trim (val);
407 rxvt_Str_escaped (val);
408 key_backspace = val;
409 }
410#endif 679#endif
411 680
412#ifndef NO_DELETE_KEY 681#ifndef NO_DELETE_KEY
413 if (!rs[Rs_delete_key]) 682 if (!rs[Rs_delete_key])
414# ifdef DEFAULT_DELETE 683# ifdef DEFAULT_DELETE
415 key_delete = DEFAULT_DELETE; 684 rs[Rs_delete_key] = DEFAULT_DELETE;
416# else 685# else
417 key_delete = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
418# endif 687# endif
419 else
420 {
421 val = strdup (rs[Rs_delete_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_delete = val;
425 }
426#endif 688#endif
427 if (rs[Rs_answerbackstring])
428 {
429 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431 }
432 689
433#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
435#endif
436 691
437#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
438 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
439 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
440 { 695 {
… …
460 color_aliases (Color_fg); 715 color_aliases (Color_fg);
461 color_aliases (Color_bg); 716 color_aliases (Color_bg);
462#ifndef NO_CURSORCOLOR 717#ifndef NO_CURSORCOLOR
463 color_aliases (Color_cursor); 718 color_aliases (Color_cursor);
464 color_aliases (Color_cursor2); 719 color_aliases (Color_cursor2);
465#endif /* NO_CURSORCOLOR */ 720#endif /* NO_CURSORCOLOR */
466 color_aliases (Color_pointer_fg); 721 color_aliases (Color_pointer_fg);
467 color_aliases (Color_pointer_bg); 722 color_aliases (Color_pointer_bg);
468 color_aliases (Color_border); 723 color_aliases (Color_border);
469#ifndef NO_BOLD_UNDERLINE_REVERSE 724#ifndef NO_BOLD_UNDERLINE_REVERSE
470 color_aliases (Color_BD); 725 color_aliases (Color_BD);
471 color_aliases (Color_UL); 726 color_aliases (Color_UL);
472 color_aliases (Color_RV); 727 color_aliases (Color_RV);
473#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 728#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
474 729
475 if (!rs[Rs_color + Color_border]) 730 if (!rs[Rs_color + Color_border])
476 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 731 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
477 732
478 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#ifdef HAVE_BG_PIXMAP
811 {
812 bg_init ();
813
814#if ENABLE_TRANSPARENCY
815 if (option (Opt_transparent))
816 {
817 bg_set_transparent ();
818
819 if (rs [Rs_blurradius])
820 root_effects.set_blur (rs [Rs_blurradius]);
821
822 if (ISSET_PIXCOLOR (Color_tint))
823 root_effects.set_tint (pix_colors_focused [Color_tint]);
824
825 if (rs [Rs_shade])
826 root_effects.set_shade (rs [Rs_shade]);
827
828 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root);
831 }
832#endif
833 }
834#endif
835
836#if ENABLE_PERL
837 rootwin_ev.start (display, display->root);
838#endif
839
840 init_done = 1;
841
842 init_command (cmd_argv);
843
844 if (pty->pty >= 0)
845 pty_ev.start (pty->pty, ev::READ);
846
847 HOOK_INVOKE ((this, HOOK_START, DT_END));
848
849#if ENABLE_XEMBED
850 if (rs[Rs_embed])
851 {
852 long info[2] = { 0, XEMBED_MAPPED };
853
854 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
855 32, PropModeReplace, (unsigned char *)&info, 2);
856 }
857#endif
858
859#if HAVE_STARTUP_NOTIFICATION
860 SnDisplay *snDisplay;
861 SnLauncheeContext *snContext;
862
863 snDisplay = sn_display_new (dpy, NULL, NULL);
864 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
865
866 /* Tell the window manager that this window is part of the startup context */
867 if (snContext)
868 sn_launchee_context_setup_window (snContext, parent);
869#endif
870
871 XMapWindow (dpy, vt);
872 XMapWindow (dpy, parent);
873
874#if HAVE_STARTUP_NOTIFICATION
875 if (snContext)
876 {
877 /* Mark the startup process as complete */
878 sn_launchee_context_complete (snContext);
879
880 sn_launchee_context_unref (snContext);
881 }
882
883 sn_display_unref (snDisplay);
884#endif
885
886 refresh_check ();
479} 887}
480 888
481/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
482void 890void
483rxvt_term::init_env () 891rxvt_term::init_env ()
484{ 892{
485 int i;
486 unsigned int u;
487 char *val; 893 char *val;
894 char *env_display;
895 char *env_windowid;
896 char *env_colorfgbg;
897 char *env_term;
488 898
489#ifdef DISPLAY_IS_IP 899#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 900 /* Fixup display_name for export over pty to any interested terminal
491 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 901 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
492 * (for the first non-loopback interface) that we get from 902 * (for the first non-loopback interface) that we get from
… …
499 */ 909 */
500 val = rxvt_network_display (rs[Rs_display_name]); 910 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 911 rs[Rs_display_name] = (const char *)val;
502 912
503 if (val == NULL) 913 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 914#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (dpy); 915 val = XDisplayString (dpy);
506 916
507 if (rs[Rs_display_name] == NULL) 917 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 918 rs[Rs_display_name] = val; /* use broken `:0' value */
509 919
510 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 920 env_display = (char *)rxvt_malloc (strlen (val) + 9);
512 921
513 sprintf (env_display, "DISPLAY=%s", val); 922 sprintf (env_display, "DISPLAY=%s", val);
514 923
924 env_windowid = (char *)rxvt_malloc (21);
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
516 926
517 /* add entries to the environment: 927 /* add entries to the environment:
518 * @ DISPLAY: in case we started with -display 928 * @ DISPLAY: in case we started with -display
519 * @ WINDOWID: X window id number of the window 929 * @ WINDOWID: X window id number of the window
520 * @ COLORTERM: terminal sub-name and also indicates its color 930 * @ COLORTERM: terminal sub-name and also indicates its color
… …
523 * @ COLORFGBG: fg;bg color codes 933 * @ COLORFGBG: fg;bg color codes
524 */ 934 */
525 putenv (env_display); 935 putenv (env_display);
526 putenv (env_windowid); 936 putenv (env_windowid);
527 937
528 if (env_colorfgbg) 938 env_colorfgbg = get_colorfgbg ();
529 putenv (env_colorfgbg); 939 putenv (env_colorfgbg);
530 940
531#ifdef RXVT_TERMINFO 941#ifdef RXVT_TERMINFO
532 putenv ("TERMINFO=" RXVT_TERMINFO); 942 putenv ("TERMINFO=" RXVT_TERMINFO);
533#endif 943#endif
534 944
… …
537 else 947 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 948 putenv ("COLORTERM=" COLORTERMENVFULL);
539 949
540 if (rs[Rs_term_name] != NULL) 950 if (rs[Rs_term_name] != NULL)
541 { 951 {
542 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 952 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 953 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 954 putenv (env_term);
545 } 955 }
546 else 956 else
547 putenv ("TERM=" TERMENV); 957 putenv ("TERM=" TERMENV);
… …
549#ifdef HAVE_UNSETENV 959#ifdef HAVE_UNSETENV
550 /* avoid passing old settings and confusing term size */ 960 /* avoid passing old settings and confusing term size */
551 unsetenv ("LINES"); 961 unsetenv ("LINES");
552 unsetenv ("COLUMNS"); 962 unsetenv ("COLUMNS");
553 unsetenv ("TERMCAP"); /* terminfo should be okay */ 963 unsetenv ("TERMCAP"); /* terminfo should be okay */
554#endif /* HAVE_UNSETENV */ 964#endif /* HAVE_UNSETENV */
555} 965}
556 966
557/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
558/*
559 * This is more or less stolen straight from XFree86 xterm.
560 * This should support all European type languages.
561 */
562void 968void
563rxvt_term::set_locale (const char *locale) 969rxvt_term::set_locale (const char *locale)
564{ 970{
565 set_environ (envv); 971 set_environ (envv);
566 972
567#if HAVE_XSETLOCALE || HAVE_SETLOCALE
568 free (this->locale); 973 free (this->locale);
569 this->locale = setlocale (LC_CTYPE, locale); 974 this->locale = setlocale (LC_CTYPE, locale);
570 975
571 if (!this->locale) 976 if (!this->locale)
572 { 977 {
… …
580 985
581 this->locale = "C"; 986 this->locale = "C";
582 } 987 }
583 988
584 989
585 this->locale = rxvt_strdup (this->locale); 990 this->locale = strdup (this->locale);
586 SET_LOCALE (this->locale); 991 SET_LOCALE (this->locale);
587 mbstate.reset (); 992 mbstate.reset ();
588#endif
589 993
590#if HAVE_NL_LANGINFO 994#if HAVE_NL_LANGINFO
591 char *codeset = strdup (nl_langinfo (CODESET)); 995 char *codeset = nl_langinfo (CODESET);
592 // /^UTF.?8/i 996 // /^UTF.?8/i
593 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
594 && (codeset[1] == 'T' || codeset[1] == 't') 998 && (codeset[1] == 'T' || codeset[1] == 't')
595 && (codeset[2] == 'F' || codeset[2] == 'f') 999 && (codeset[2] == 'F' || codeset[2] == 'f')
596 && (codeset[3] == '8' || codeset[4] == '8'); 1000 && (codeset[3] == '8' || codeset[4] == '8');
597 free (codeset);
598#else 1001#else
599 enc_utf8 = 0; 1002 enc_utf8 = 0;
600#endif 1003#endif
601} 1004}
602 1005
603void 1006void
604rxvt_term::init_xlocale () 1007rxvt_term::init_xlocale ()
605{ 1008{
606 set_environ (envv); 1009 set_environ (envv);
607 1010
608#ifdef USE_XIM 1011#if USE_XIM
609 if (!locale) 1012 if (!locale)
610 rxvt_warn ("setting locale failed, working without locale support.\n"); 1013 rxvt_warn ("setting locale failed, continuing without locale support.\n");
611 else 1014 else
612 { 1015 {
613 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1016 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
614 1017
615 if (!XSupportsLocale ()) 1018 if (!XSupportsLocale ())
616 { 1019 {
617 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1020 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
618 return; 1021 return;
619 } 1022 }
620 1023
621 im_ev.start (display); 1024 im_ev.start (display);
622 1025
… …
647 priv_modes |= PrivMode_Keypress; 1050 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 1051 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 1052 priv_modes |= PrivMode_smoothScroll;
650 1053
651#ifndef NO_BACKSPACE_KEY 1054#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 1055 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 1056 priv_modes |= PrivMode_HaveBackSpace;
654#endif 1057#endif
655 1058
656 /* add value for scrollBar */ 1059 /* add value for scrollBar */
657 if (scrollBar.state) 1060 if (scrollBar.state)
… …
663 run_command (argv); 1066 run_command (argv);
664} 1067}
665 1068
666/*----------------------------------------------------------------------*/ 1069/*----------------------------------------------------------------------*/
667void 1070void
668rxvt_term::Get_Colours () 1071rxvt_term::get_colours ()
669{ 1072{
670 int i; 1073 int i;
671 1074
672#ifdef OFF_FOCUS_FADING 1075#ifdef OFF_FOCUS_FADING
673 pix_colors = pix_colors_focused; 1076 pix_colors = pix_colors_focused;
674#endif 1077#endif
675 1078
676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1079 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
677 { 1080 {
678 const char *name = rs[Rs_color + i]; 1081 const char *name = rs[Rs_color + i];
679 1082
680 if (!name) 1083 if (!name)
… …
733 * get scrollBar shadow colors 1136 * get scrollBar shadow colors
734 * 1137 *
735 * The calculations of topShadow/bottomShadow values are adapted 1138 * The calculations of topShadow/bottomShadow values are adapted
736 * from the fvwm window manager. 1139 * from the fvwm window manager.
737 */ 1140 */
738#ifdef KEEP_SCROLLCOLOR 1141#ifdef RXVT_SCROLLBAR
739 if (depth <= 2) 1142 if (depth <= 2)
740 { 1143 {
741 /* Monochrome */ 1144 /* Monochrome */
742 alias_color (Color_scroll, Color_fg); 1145 alias_color (Color_scroll, Color_fg);
743 alias_color (Color_topShadow, Color_bg); 1146 alias_color (Color_topShadow, Color_bg);
… …
758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1161 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
759 cscroll.a) 1162 cscroll.a)
760 )) 1163 ))
761 alias_color (Color_topShadow, Color_White); 1164 alias_color (Color_topShadow, Color_White);
762 } 1165 }
763#endif /* KEEP_SCROLLCOLOR */ 1166#endif
764 1167
765#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1169 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i); 1170 update_fade_color (i);
768#endif 1171#endif
… …
771/*----------------------------------------------------------------------*/ 1174/*----------------------------------------------------------------------*/
772/* color aliases, fg/bg bright-bold */ 1175/* color aliases, fg/bg bright-bold */
773void 1176void
774rxvt_term::color_aliases (int idx) 1177rxvt_term::color_aliases (int idx)
775{ 1178{
776 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1179 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
777 { 1180 {
778 int i = atoi (rs[Rs_color + idx]); 1181 int i = atoi (rs[Rs_color + idx]);
779 1182
780 if (i >= 8 && i <= 15) 1183 if (i >= 8 && i <= 15)
781 { /* bright colors */ 1184 /* bright colors */
782 i -= 8;
783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1185 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784 return; 1186 else if (i >= 0 && i <= 7)
785 } 1187 /* normal colors */
786
787 if (i >= 0 && i <= 7) /* normal colors */
788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1188 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789 } 1189 }
790} 1190}
791 1191
792/*----------------------------------------------------------------------*/ 1192/*----------------------------------------------------------------------*/
… …
876 1276
877 if (i) 1277 if (i)
878 ModMetaMask = modmasks[i - 1]; 1278 ModMetaMask = modmasks[i - 1];
879} 1279}
880 1280
1281void
1282rxvt_term::set_icon (const char *file)
1283{
1284#if HAVE_PIXBUF
1285 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1286 if (!pixbuf)
1287 {
1288 rxvt_warn ("Loading image icon failed, continuing without.\n");
1289 return;
1290 }
1291
1292 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1293 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1294
1295 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1296 {
1297 rxvt_warn ("Icon image too big, continuing without.\n");
1298 g_object_unref (pixbuf);
1299 return;
1300 }
1301
1302 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1303 {
1304 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1305 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1306 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1307
1308 buffer [0] = w;
1309 buffer [1] = h;
1310 for (int i = 0; i < h; i++)
1311 {
1312 for (int j = 0; j < w; j++)
1313 {
1314 unsigned char *pixel = row + j * channels;
1315 long value;
1316
1317 if (channels == 4)
1318 value = pixel[3];
1319 else
1320 value = (unsigned char)0x00ff;
1321
1322 value = (value << 8) + pixel[0];
1323 value = (value << 8) + pixel[1];
1324 value = (value << 8) + pixel[2];
1325 buffer[(i * w + j) + 2] = value;
1326 }
1327
1328 row += rowstride;
1329 }
1330
1331 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1332 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1333 free (buffer);
1334 }
1335 else
1336 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1337
1338 g_object_unref (pixbuf);
1339#endif
1340}
1341
881/*----------------------------------------------------------------------*/ 1342/*----------------------------------------------------------------------*/
882/* rxvt_Create_Windows () - Open and map the window */ 1343/* Open and map the window */
883void 1344void
884rxvt_term::create_windows (int argc, const char *const *argv) 1345rxvt_term::create_windows (int argc, const char *const *argv)
885{ 1346{
886 XClassHint classHint; 1347 XClassHint classHint;
887 XWMHints wmHint; 1348 XWMHints wmHint;
888#if ENABLE_FRILLS 1349#if ENABLE_FRILLS
889 MWMHints mwmhints; 1350 MWMHints mwmhints = { };
890#endif 1351#endif
891 XGCValues gcvalue; 1352 XGCValues gcvalue;
892 XSetWindowAttributes attributes; 1353 XSetWindowAttributes attributes;
893 Window top, parent; 1354 Window top, parent;
894 1355
895 dLocal (Display *, dpy); 1356 dLocal (Display *, dpy);
896 1357
897 /* grab colors before netscape does */ 1358 /* grab colors before netscape does */
898 Get_Colours (); 1359 get_colours ();
899 1360
900 if (!set_fonts ()) 1361 if (!set_fonts ())
901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1362 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
902 1363
903 parent = display->root; 1364 parent = display->root;
… …
907#if ENABLE_FRILLS 1368#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 1369 if (option (Opt_borderLess))
909 { 1370 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1371 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 1372 {
912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1373 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913 attributes.override_redirect = true; 1374 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 1375 }
916 else 1376 else
917 { 1377 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 1378 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 1379 }
921 } 1380 }
922 else
923 mwmhints.flags = 0;
924#endif 1381#endif
925 1382
926#if ENABLE_XEMBED 1383#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 1384 if (rs[Rs_embed])
928 { 1385 {
… …
937 } 1394 }
938#endif 1395#endif
939 1396
940 window_calc (0, 0); 1397 window_calc (0, 0);
941 1398
942 /* sub-window placement & size in rxvt_resize_subwindows () */ 1399 /* sub-window placement & size in rxvt_term::resize_all_windows () */
943 attributes.background_pixel = pix_colors_focused [Color_border]; 1400 attributes.background_pixel = pix_colors_focused [Color_border];
944 attributes.border_pixel = pix_colors_focused [Color_border]; 1401 attributes.border_pixel = pix_colors_focused [Color_border];
945 attributes.colormap = cmap; 1402 attributes.colormap = cmap;
946 1403
947 top = XCreateWindow (dpy, parent, 1404 top = XCreateWindow (dpy, parent,
… …
950 ext_bwidth, 1407 ext_bwidth,
951 depth, InputOutput, visual, 1408 depth, InputOutput, visual,
952 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1409 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
953 &attributes); 1410 &attributes);
954 1411
955 this->parent[0] = top; 1412 this->parent = top;
956 1413
957 old_width = szHint.width; 1414 set_title (rs [Rs_title]);
958 old_height = szHint.height; 1415 set_icon_name (rs [Rs_iconName]);
959
960 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
961 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
962 1416
963 classHint.res_name = (char *)rs[Rs_name]; 1417 classHint.res_name = (char *)rs[Rs_name];
964 classHint.res_class = (char *)RESCLASS; 1418 classHint.res_class = (char *)RESCLASS;
965 1419
966 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1420 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
968 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1422 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
969 wmHint.window_group = top; 1423 wmHint.window_group = top;
970 1424
971 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972 &szHint, &wmHint, &classHint); 1426 &szHint, &wmHint, &classHint);
1427#if ENABLE_EWMH
1428 /*
1429 * set up icon hint
1430 * rs [Rs_iconfile] is path to icon
1431 */
1432
1433 if (rs [Rs_iconfile])
1434 {
1435 set_icon (rs [Rs_iconfile]);
1436 }
1437#endif
973 1438
974#if ENABLE_FRILLS 1439#if ENABLE_FRILLS
975 if (mwmhints.flags) 1440 if (mwmhints.flags)
976 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1441 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
977 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1442 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
982#if ENABLE_EWMH 1447#if ENABLE_EWMH
983 xa[XA_NET_WM_PING], 1448 xa[XA_NET_WM_PING],
984#endif 1449#endif
985 }; 1450 };
986 1451
987 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1452 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
988 1453
989#if ENABLE_FRILLS 1454#if ENABLE_FRILLS
990 if (rs[Rs_transient_for]) 1455 if (rs[Rs_transient_for])
991 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
992#endif 1457#endif
… …
1012 termwin_ev.start (display, top); 1477 termwin_ev.start (display, top);
1013 1478
1014 /* vt cursor: Black-on-White is standard, but this is more popular */ 1479 /* vt cursor: Black-on-White is standard, but this is more popular */
1015 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016 1481
1017#ifdef HAVE_SCROLLBARS
1018 /* cursor scrollBar: Black-on-White */
1019 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1020#endif
1021
1022 /* the vt window */ 1482 /* the vt window */
1023 vt = XCreateSimpleWindow (dpy, top, 1483 vt = XCreateSimpleWindow (dpy, top,
1024 window_vt_x, window_vt_y, 1484 window_vt_x, window_vt_y,
1025 width, height, 1485 vt_width, vt_height,
1026 0, 1486 0,
1027 pix_colors_focused[Color_fg], 1487 pix_colors_focused[Color_fg],
1028 pix_colors_focused[Color_bg]); 1488 pix_colors_focused[Color_bg]);
1029 1489
1030 attributes.bit_gravity = NorthWestGravity; 1490 attributes.bit_gravity = NorthWestGravity;
… …
1039 1499
1040 vt_select_input (); 1500 vt_select_input ();
1041 1501
1042 vt_ev.start (display, vt); 1502 vt_ev.start (display, vt);
1043 1503
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL
1046#ifndef HAVE_AFTERIMAGE
1047 && !option (Opt_transparent)
1048#endif
1049 )
1050 {
1051 const char *p = rs[Rs_backgroundPixmap];
1052
1053 if ((p = strchr (p, ';')) != NULL)
1054 {
1055 p++;
1056 scale_pixmap (p);
1057 }
1058
1059 set_bgPixmap (rs[Rs_backgroundPixmap]);
1060 scr_touch (true);
1061 }
1062#endif
1063
1064 /* graphics context for the vt window */ 1504 /* graphics context for the vt window */
1065 gcvalue.foreground = pix_colors[Color_fg]; 1505 gcvalue.foreground = pix_colors[Color_fg];
1066 gcvalue.background = pix_colors[Color_bg]; 1506 gcvalue.background = pix_colors[Color_bg];
1067 gcvalue.graphics_exposures = 0; 1507 gcvalue.graphics_exposures = 0;
1068 1508
… …
1070 GCForeground | GCBackground | GCGraphicsExposures, 1510 GCForeground | GCBackground | GCGraphicsExposures,
1071 &gcvalue); 1511 &gcvalue);
1072 1512
1073 drawable = new rxvt_drawable (this, vt); 1513 drawable = new rxvt_drawable (this, vt);
1074 1514
1075#ifdef RXVT_SCROLLBAR
1076 gcvalue.foreground = pix_colors[Color_topShadow];
1077 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078 gcvalue.foreground = pix_colors[Color_bottomShadow];
1079 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1080 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1081 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1082#endif
1083
1084#ifdef OFF_FOCUS_FADING 1515#ifdef OFF_FOCUS_FADING
1085 // initially we are in unfocused state 1516 // initially we are in unfocused state
1086 if (rs[Rs_fade]) 1517 if (rs[Rs_fade])
1087 pix_colors = pix_colors_unfocused; 1518 pix_colors = pix_colors_unfocused;
1088#endif 1519#endif
1089 1520
1090 pointer_unblank (); 1521 pointer_unblank ();
1091 scr_recolour (); 1522 scr_recolour ();
1092}
1093
1094/* ------------------------------------------------------------------------- *
1095 * GET TTY CURRENT STATE *
1096 * ------------------------------------------------------------------------- */
1097void
1098rxvt_get_ttymode (ttymode_t *tio, int erase)
1099{
1100 /*
1101 * standard System V termios interface
1102 */
1103 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1104 {
1105 // return error - use system defaults,
1106 // where possible, and zero elsewhere
1107 memset (tio, 0, sizeof (ttymode_t));
1108
1109 tio->c_cc[VINTR] = CINTR;
1110 tio->c_cc[VQUIT] = CQUIT;
1111 tio->c_cc[VERASE] = CERASE;
1112#ifdef VERASE2
1113 tio->c_cc[VERASE2] = CERASE2;
1114#endif
1115 tio->c_cc[VKILL] = CKILL;
1116 tio->c_cc[VSTART] = CSTART;
1117 tio->c_cc[VSTOP] = CSTOP;
1118 tio->c_cc[VSUSP] = CSUSP;
1119# ifdef VDSUSP
1120 tio->c_cc[VDSUSP] = CDSUSP;
1121# endif
1122# ifdef VREPRINT
1123 tio->c_cc[VREPRINT] = CRPRNT;
1124# endif
1125# ifdef VDISCRD
1126 tio->c_cc[VDISCRD] = CFLUSH;
1127# endif
1128# ifdef VWERSE
1129 tio->c_cc[VWERSE] = CWERASE;
1130# endif
1131# ifdef VLNEXT
1132 tio->c_cc[VLNEXT] = CLNEXT;
1133# endif
1134 }
1135
1136 tio->c_cc[VEOF] = CEOF;
1137 tio->c_cc[VEOL] = VDISABLE;
1138# ifdef VEOL2
1139 tio->c_cc[VEOL2] = VDISABLE;
1140# endif
1141# ifdef VSWTC
1142 tio->c_cc[VSWTC] = VDISABLE;
1143# endif
1144# ifdef VSWTCH
1145 tio->c_cc[VSWTCH] = VDISABLE;
1146# endif
1147# if VMIN != VEOF
1148 tio->c_cc[VMIN] = 1;
1149# endif
1150# if VTIME != VEOL
1151 tio->c_cc[VTIME] = 0;
1152# endif
1153
1154 if (erase != -1)
1155 tio->c_cc[VERASE] = (char)erase;
1156
1157 /* input modes */
1158 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1159# ifdef IMAXBEL
1160 | IMAXBEL
1161# endif
1162 | IXON);
1163
1164 /* output modes */
1165 tio->c_oflag = (OPOST | ONLCR);
1166
1167 /* control modes */
1168 tio->c_cflag = (CS8 | CREAD);
1169
1170 /* line discipline modes */
1171 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1172# if defined (ECHOCTL) && defined (ECHOKE)
1173 | ECHOCTL | ECHOKE
1174# endif
1175 | ECHOE | ECHOK);
1176
1177 /*
1178 * Debugging
1179 */
1180#ifdef DEBUG_TTYMODE
1181#ifdef HAVE_TERMIOS_H
1182 /* c_iflag bits */
1183 fprintf (stderr, "Input flags\n");
1184
1185 /* cpp token stringize doesn't work on all machines <sigh> */
1186# define FOO(flag,name) \
1187 if ((tio->c_iflag) & flag) \
1188 fprintf (stderr, "%s ", name)
1189
1190 /* c_iflag bits */
1191 FOO (IGNBRK, "IGNBRK");
1192 FOO (BRKINT, "BRKINT");
1193 FOO (IGNPAR, "IGNPAR");
1194 FOO (PARMRK, "PARMRK");
1195 FOO (INPCK, "INPCK");
1196 FOO (ISTRIP, "ISTRIP");
1197 FOO (INLCR, "INLCR");
1198 FOO (IGNCR, "IGNCR");
1199 FOO (ICRNL, "ICRNL");
1200 FOO (IXON, "IXON");
1201 FOO (IXOFF, "IXOFF");
1202# ifdef IUCLC
1203 FOO (IUCLC, "IUCLC");
1204# endif
1205# ifdef IXANY
1206 FOO (IXANY, "IXANY");
1207# endif
1208# ifdef IMAXBEL
1209 FOO (IMAXBEL, "IMAXBEL");
1210# endif
1211
1212 fprintf (stderr, "\n");
1213
1214# undef FOO
1215# define FOO(entry, name) \
1216 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1217
1218 FOO (VINTR, "VINTR");
1219 FOO (VQUIT, "VQUIT");
1220 FOO (VERASE, "VERASE");
1221 FOO (VKILL, "VKILL");
1222 FOO (VEOF, "VEOF");
1223 FOO (VEOL, "VEOL");
1224# ifdef VEOL2
1225 FOO (VEOL2, "VEOL2");
1226# endif
1227# ifdef VSWTC
1228 FOO (VSWTC, "VSWTC");
1229# endif
1230# ifdef VSWTCH
1231 FOO (VSWTCH, "VSWTCH");
1232# endif
1233 FOO (VSTART, "VSTART");
1234 FOO (VSTOP, "VSTOP");
1235 FOO (VSUSP, "VSUSP");
1236# ifdef VDSUSP
1237 FOO (VDSUSP, "VDSUSP");
1238# endif
1239# ifdef VREPRINT
1240 FOO (VREPRINT, "VREPRINT");
1241# endif
1242# ifdef VDISCRD
1243 FOO (VDISCRD, "VDISCRD");
1244# endif
1245# ifdef VWERSE
1246 FOO (VWERSE, "VWERSE");
1247# endif
1248# ifdef VLNEXT
1249 FOO (VLNEXT, "VLNEXT");
1250# endif
1251
1252 fprintf (stderr, "\n");
1253# undef FOO
1254# endif /* HAVE_TERMIOS_H */
1255#endif /* DEBUG_TTYMODE */
1256} 1523}
1257 1524
1258/*----------------------------------------------------------------------*/ 1525/*----------------------------------------------------------------------*/
1259/* 1526/*
1260 * Run the command in a subprocess and return a file descriptor for the 1527 * Run the command in a subprocess and return a file descriptor for the
… …
1272 if (pty->pty >= 0) 1539 if (pty->pty >= 0)
1273 { 1540 {
1274 if (getfd_hook) 1541 if (getfd_hook)
1275 pty->pty = (*getfd_hook) (pty->pty); 1542 pty->pty = (*getfd_hook) (pty->pty);
1276 1543
1277 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1544 if (pty->pty < 0)
1278 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1545 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1279 } 1546 }
1280 } 1547 }
1281 else 1548 else
1282#endif 1549#endif
1283 if (!pty->get ()) 1550 if (!pty->get ())
1284 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1285 1552
1286 int er; 1553 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1554
1555 struct termios tio = def_tio;
1287 1556
1288#ifndef NO_BACKSPACE_KEY 1557#ifndef NO_BACKSPACE_KEY
1289 if (key_backspace[0] && !key_backspace[1]) 1558 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1290 er = key_backspace[0]; 1559 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1291 else if (strcmp (key_backspace, "DEC") == 0) 1560 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1292 er = '\177'; /* the initial state anyway */ 1561 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1293 else
1294#endif 1562#endif
1295 er = -1;
1296 1563
1297 rxvt_get_ttymode (&tio, er); 1564 /* init terminal attributes */
1298 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1565 cfsetospeed (&tio, BAUDRATE);
1566 cfsetispeed (&tio, BAUDRATE);
1567 tcsetattr (pty->tty, TCSANOW, &tio);
1299 pty->set_utf8_mode (enc_utf8); 1568 pty->set_utf8_mode (enc_utf8);
1300 1569
1301 /* set initial window size */ 1570 /* set initial window size */
1302 tt_winch (); 1571 tt_winch ();
1303 1572
… …
1339 1608
1340 _exit (EXIT_FAILURE); 1609 _exit (EXIT_FAILURE);
1341 1610
1342 default: 1611 default:
1343 if (!option (Opt_utmpInhibit)) 1612 if (!option (Opt_utmpInhibit))
1613 {
1614#ifdef LOG_ONLY_ON_LOGIN
1615 bool login_shell = option (Opt_loginShell);
1616#else
1617 bool login_shell = true;
1618#endif
1344 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1619 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1620 }
1345 1621
1346 pty->close_tty (); 1622 pty->close_tty ();
1347 1623
1348 child_ev.start (cmd_pid); 1624 child_ev.start (cmd_pid);
1349 1625
… …
1363rxvt_term::run_child (const char *const *argv) 1639rxvt_term::run_child (const char *const *argv)
1364{ 1640{
1365 char *login; 1641 char *login;
1366 1642
1367 if (option (Opt_console)) 1643 if (option (Opt_console))
1644 {
1368 { /* be virtual console, fail silently */ 1645 /* be virtual console, fail silently */
1369#ifdef TIOCCONS 1646#ifdef TIOCCONS
1370 unsigned int on = 1; 1647 unsigned int on = 1;
1371 1648
1372 ioctl (STDIN_FILENO, TIOCCONS, &on); 1649 ioctl (STDIN_FILENO, TIOCCONS, &on);
1373#elif defined (SRIOCSREDIR) 1650#elif defined (SRIOCSREDIR)
1374 int fd; 1651 int fd;
1375 1652
1376 fd = open (CONSOLE, O_WRONLY, 0); 1653 fd = open (CONSOLE, O_WRONLY, 0);
1377 if (fd >= 0) 1654 if (fd >= 0)
1378 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1655 {
1656 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1379 close (fd); 1657 close (fd);
1380#endif /* SRIOCSREDIR */ 1658 }
1659#endif /* SRIOCSREDIR */
1381 } 1660 }
1382 1661
1383 /* reset signals and spin off the command interpreter */ 1662 /* reset signals and spin off the command interpreter */
1384 signal (SIGINT, SIG_DFL); 1663 signal (SIGINT, SIG_DFL);
1385 signal (SIGQUIT, SIG_DFL); 1664 signal (SIGQUIT, SIG_DFL);
1386 signal (SIGCHLD, SIG_DFL); 1665 signal (SIGCHLD, SIG_DFL);
1387 signal (SIGHUP, SIG_DFL); 1666 signal (SIGHUP, SIG_DFL);
1388 signal (SIGPIPE, SIG_DFL); 1667 signal (SIGPIPE, SIG_DFL);
1389 /* 1668 /*
1390 * mimick login's behavior by disabling the job control signals 1669 * mimic login's behavior by disabling the job control signals
1391 * a shell that wants them can turn them back on 1670 * a shell that wants them can turn them back on
1392 */ 1671 */
1393#ifdef SIGTSTP 1672#ifdef SIGTSTP
1394 signal (SIGTSTP, SIG_IGN); 1673 signal (SIGTSTP, SIG_IGN);
1395 signal (SIGTTIN, SIG_IGN); 1674 signal (SIGTTIN, SIG_IGN);
1396 signal (SIGTTOU, SIG_IGN); 1675 signal (SIGTTOU, SIG_IGN);
1397#endif /* SIGTSTP */ 1676#endif /* SIGTSTP */
1398
1399 // unblock signals (signals are blocked by iom.C
1400 sigset_t ss;
1401 sigemptyset (&ss);
1402 sigprocmask (SIG_SETMASK, &ss, 0);
1403 1677
1404 /* command interpreter path */ 1678 /* command interpreter path */
1405 if (argv != NULL) 1679 if (argv)
1406 { 1680 {
1407# ifdef DEBUG_CMD 1681# ifdef DEBUG_CMD
1408 int i; 1682 int i;
1409 1683
1410 for (i = 0; argv[i]; i++) 1684 for (i = 0; argv[i]; i++)
… …
1419 const char *argv0, *shell; 1693 const char *argv0, *shell;
1420 1694
1421 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1695 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1422 shell = "/bin/sh"; 1696 shell = "/bin/sh";
1423 1697
1424 argv0 = (const char *)rxvt_r_basename (shell); 1698 argv0 = rxvt_basename (shell);
1425 1699
1426 if (option (Opt_loginShell)) 1700 if (option (Opt_loginShell))
1427 { 1701 {
1428 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1702 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1429 1703
1430 login[0] = '-'; 1704 login[0] = '-';
1431 strcpy (&login[1], argv0); 1705 strcpy (&login[1], argv0);
1432 argv0 = login; 1706 argv0 = login;
1433 } 1707 }
1434 1708
1435 execlp (shell, argv0, NULL); 1709 execlp (shell, argv0, (char *)0);
1436 /* no error message: STDERR is closed! */ 1710 /* no error message: STDERR is closed! */
1437 } 1711 }
1438 1712
1439 return -1; 1713 return -1;
1440} 1714}

Diff Legend

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