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.199 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.316 by sf-exg, Mon Jan 9 15:45:45 2012 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 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 <csignal>
42 44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
65#ifdef DISPLAY_IS_IP
66/* On Solaris link with -lsocket and -lnsl */
67#include <sys/types.h>
68#include <sys/socket.h>
69
70/* these next two are probably only on Sun (not Solaris) */
71#ifdef HAVE_SYS_SOCKIO_H
72#include <sys/sockio.h>
73#endif
74#ifdef HAVE_SYS_BYTEORDER_H
75#include <sys/byteorder.h>
76#endif
77
78#include <netinet/in.h>
79#include <arpa/inet.h>
80#include <net/if.h>
81#include <net/if_arp.h>
82
83static char *
84rxvt_network_display (const char *display)
85{
86 char buffer[1024], *rval = NULL;
87 struct ifconf ifc;
88 struct ifreq *ifr;
89 int i, skfd;
90
91 if (display[0] != ':' && strncmp (display, "unix:", 5))
92 return (char *) display; /* nothing to do */
93
94 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
95 ifc.ifc_buf = buffer;
96
97 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
98 {
99 perror ("socket");
100 return NULL;
101 }
102
103 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
104 {
105 perror ("SIOCGIFCONF");
106 close (skfd);
107 return NULL;
108 }
109
110 for (i = 0, ifr = ifc.ifc_req;
111 i < (ifc.ifc_len / sizeof (struct ifreq));
112 i++, ifr++)
113 {
114 struct ifreq ifr2;
115
116 strcpy (ifr2.ifr_name, ifr->ifr_name);
117
118 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
119 {
120 unsigned long addr;
121 struct sockaddr_in *p_addr;
122
123 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
124 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
125
126 /*
127 * not "0.0.0.0" or "127.0.0.1" - so format the address
128 */
129 if (addr && addr != 0x7F000001)
130 {
131 char *colon = strchr (display, ':');
132
133 if (colon == NULL)
134 colon = ":0.0";
135
136 rval = rxvt_malloc (strlen (colon) + 16);
137 sprintf (rval, "%d.%d.%d.%d%s",
138 (int) ((addr >> 030) & 0xFF),
139 (int) ((addr >> 020) & 0xFF),
140 (int) ((addr >> 010) & 0xFF),
141 (int) (addr & 0xFF), colon);
142 break;
143 }
144 }
145 }
146
147 close (skfd);
148
149 return rval;
150}
151#endif
152
43const char *const def_colorName[] = 153static const char *const def_colorName[] =
44 { 154 {
45 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
47 /* low-intensity colors */ 157 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
50 "rgb:00/cd/00", // 2: green (Green3) 160 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 161 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 162 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 163 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 164 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 166 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 167# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 168 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 169# endif
60 /* high-intensity colors */ 170 /* high-intensity colors */
61# ifdef XTERM_COLORS 171# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 172 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 183
184#if !USE_256_COLORS
74 // 88 xterm colours 185 // 88 xterm colours
75 "rgb:00/00/00", 186 "rgb:00/00/00",
76 "rgb:00/00/8b", 187 "rgb:00/00/8b",
77 "rgb:00/00/cd", 188 "rgb:00/00/cd",
78 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
476 "rgb:08/08/08",
477 "rgb:12/12/12",
478 "rgb:1c/1c/1c",
479 "rgb:26/26/26",
480 "rgb:30/30/30",
481 "rgb:3a/3a/3a",
482 "rgb:44/44/44",
483 "rgb:4e/4e/4e",
484 "rgb:58/58/58",
485 "rgb:62/62/62",
486 "rgb:6c/6c/6c",
487 "rgb:76/76/76",
488 "rgb:80/80/80",
489 "rgb:8a/8a/8a",
490 "rgb:94/94/94",
491 "rgb:9e/9e/9e",
492 "rgb:a8/a8/a8",
493 "rgb:b2/b2/b2",
494 "rgb:bc/bc/bc",
495 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0",
497 "rgb:da/da/da",
498 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee",
500#endif
147 501
148#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 506 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 507 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 508 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 509#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 510 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 511 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 512 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 513 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 514#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 515#if ENABLE_FRILLS
162 NULL, // Color_underline 516 NULL, // Color_underline
163#endif 517#endif
164#ifdef OPTION_HC 518#ifdef OPTION_HC
165 NULL, 519 NULL,
520 NULL,
166#endif 521#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 525#endif
171#if TINTING 526#if ENABLE_TRANSPARENCY
172 NULL, 527 NULL,
173#endif 528#endif
174#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 530 "rgb:00/00/00",
176#endif 531#endif
177 }; 532 };
178 533
179bool 534void
180rxvt_term::init_vars () 535rxvt_term::init_vars ()
181{ 536{
182 pix_colors = // 537 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 538
189 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
191 want_refresh = 1; 541 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 543 ncol = 80;
194 nrow = 24; 544 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 549 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 550
201 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
202 552
203 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0;
211 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1;
216 554
217 set_option (Opt_scrollBar); 555 set_option (Opt_scrollBar);
218 set_option (Opt_scrollTtyOutput); 556 set_option (Opt_scrollTtyOutput);
219 set_option (Opt_jumpScroll); 557 set_option (Opt_jumpScroll);
220 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
221 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
222 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
223 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
224 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
225 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
226 565 set_option (Opt_buffered);
227 return true;
228}
229
230void
231rxvt_term::init_secondary ()
232{
233 int i;
234
235 /*
236 * Close all unused file descriptors
237 * We don't want them, we don't need them.
238 */
239 if ((i = open ("/dev/null", O_RDONLY)) < 0)
240 {
241 /* TODO: BOO HISS */
242 dup2 (STDERR_FILENO, STDIN_FILENO);
243 }
244 else if (i > STDIN_FILENO)
245 {
246 dup2 (i, STDIN_FILENO);
247 close (i);
248 }
249
250 dup2 (STDERR_FILENO, STDOUT_FILENO);
251
252#if 0 // schmorp sayz closing filies is murder
253 for (i = STDERR_FILENO + 1; i < num_fds; i++)
254 {
255#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
256 if (i == 4 || i == 7)
257 continue;
258#endif
259 close (i);
260 }
261#endif
262} 566}
263 567
264/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
265const char ** 569const char **
266rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
267{ 571{
268 int i, r_argc; 572 int i;
269 char *val;
270 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
271 574
272 /*
273 * Look for -e option. Find => split and make cmd_argv[] of command args
274 */
275 for (r_argc = 0; r_argc < argc; r_argc++)
276 if (!strcmp (argv[r_argc], "-e"))
277 break;
278
279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
280
281 for (i = 0; i < r_argc; i++)
282 r_argv[i] = (const char *)argv[i];
283
284 r_argv[i] = NULL;
285
286 if (r_argc == argc)
287 cmd_argv = NULL;
288 else
289 {
290 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
291
292 for (i = 0; i < argc - r_argc - 1; i++)
293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
294
295 cmd_argv[i] = NULL;
296 }
297
298 rs[Rs_name] = rxvt_r_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
299 576
300 /* 577 /*
301 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
302 */ 579 */
303 580
304 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
305 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
306 583
307 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
308 585
309 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
311 588
312 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
… …
318#if XFT 595#if XFT
319 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
320 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
321#endif 598#endif
322 599
323#ifdef HAVE_AFTERIMAGE
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
326 free (r_argv);
327
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
332#if ENABLE_PERL 604#if ENABLE_PERL
… …
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#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
807
808 create_windows (argc, argv);
809
810 init_xlocale ();
811
812 scr_poweron (); // initialize screen
813
814#if 0
815 XSynchronize (dpy, True);
816#endif
817
818 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */
820#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init ();
823
824#ifdef ENABLE_TRANSPARENCY
825 if (option (Opt_transparent))
826 {
827 bg_set_transparent ();
828
829 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]);
831
832 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]);
834
835 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]);
837
838 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root);
841 }
842#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 if (bg_set_file (rs[Rs_backgroundPixmap]))
847 if (!bg_window_position_sensitive ())
848 update_background ();
849#endif
850 }
851#endif
852
853#if ENABLE_PERL
854 rootwin_ev.start (display, display->root);
855#endif
856
857 init_done = 1;
858
859 init_command (cmd_argv);
860
861 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ);
863
864 HOOK_INVOKE ((this, HOOK_START, DT_END));
865
866#if ENABLE_XEMBED
867 if (rs[Rs_embed])
868 {
869 long info[2] = { 0, XEMBED_MAPPED };
870
871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
872 32, PropModeReplace, (unsigned char *)&info, 2);
873 }
874#endif
875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
888 XMapWindow (dpy, vt);
889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
902
903 refresh_check ();
479} 904}
480 905
481/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
482void 907void
483rxvt_term::init_env () 908rxvt_term::init_env ()
484{ 909{
485 int i;
486 unsigned int u;
487 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
488 915
489#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 917 /* 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 918 * 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 919 * (for the first non-loopback interface) that we get from
… …
499 */ 926 */
500 val = rxvt_network_display (rs[Rs_display_name]); 927 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 928 rs[Rs_display_name] = (const char *)val;
502 929
503 if (val == NULL) 930 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 931#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (dpy); 932 val = XDisplayString (dpy);
506 933
507 if (rs[Rs_display_name] == NULL) 934 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 935 rs[Rs_display_name] = val; /* use broken `:0' value */
509 936
510 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
512 938
513 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
514 940
941 env_windowid = (char *)rxvt_malloc (21);
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
516 943
517 /* add entries to the environment: 944 /* add entries to the environment:
518 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
519 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
520 * @ COLORTERM: terminal sub-name and also indicates its color 947 * @ COLORTERM: terminal sub-name and also indicates its color
… …
523 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
524 */ 951 */
525 putenv (env_display); 952 putenv (env_display);
526 putenv (env_windowid); 953 putenv (env_windowid);
527 954
528 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
529 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
530 957
531#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
532 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
533#endif 960#endif
534 961
… …
537 else 964 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 965 putenv ("COLORTERM=" COLORTERMENVFULL);
539 966
540 if (rs[Rs_term_name] != NULL) 967 if (rs[Rs_term_name] != NULL)
541 { 968 {
542 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 969 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 970 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 971 putenv (env_term);
545 } 972 }
546 else 973 else
547 putenv ("TERM=" TERMENV); 974 putenv ("TERM=" TERMENV);
… …
549#ifdef HAVE_UNSETENV 976#ifdef HAVE_UNSETENV
550 /* avoid passing old settings and confusing term size */ 977 /* avoid passing old settings and confusing term size */
551 unsetenv ("LINES"); 978 unsetenv ("LINES");
552 unsetenv ("COLUMNS"); 979 unsetenv ("COLUMNS");
553 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
554#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
555} 982}
556 983
557/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
558/*
559 * This is more or less stolen straight from XFree86 xterm.
560 * This should support all European type languages.
561 */
562void 985void
563rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
564{ 987{
565 set_environ (envv); 988 set_environ (envv);
566 989
… …
580 1003
581 this->locale = "C"; 1004 this->locale = "C";
582 } 1005 }
583 1006
584 1007
585 this->locale = rxvt_strdup (this->locale); 1008 this->locale = strdup (this->locale);
586 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
587 mbstate.reset (); 1010 mbstate.reset ();
588#endif 1011#endif
589 1012
590#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
591 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
592 // /^UTF.?8/i 1015 // /^UTF.?8/i
593 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
594 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
595 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
596 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
597 free (codeset);
598#else 1020#else
599 enc_utf8 = 0; 1021 enc_utf8 = 0;
600#endif 1022#endif
601} 1023}
602 1024
… …
605{ 1027{
606 set_environ (envv); 1028 set_environ (envv);
607 1029
608#ifdef USE_XIM 1030#ifdef USE_XIM
609 if (!locale) 1031 if (!locale)
610 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
611 else 1033 else
612 { 1034 {
613 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
614 1036
615 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
616 { 1038 {
617 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1039 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
618 return; 1040 return;
619 } 1041 }
620 1042
621 im_ev.start (display); 1043 im_ev.start (display);
622 1044
… …
647 priv_modes |= PrivMode_Keypress; 1069 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 1070 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 1071 priv_modes |= PrivMode_smoothScroll;
650 1072
651#ifndef NO_BACKSPACE_KEY 1073#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 1074 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 1075 priv_modes |= PrivMode_HaveBackSpace;
654#endif 1076#endif
655 1077
656 /* add value for scrollBar */ 1078 /* add value for scrollBar */
657 if (scrollBar.state) 1079 if (scrollBar.state)
… …
663 run_command (argv); 1085 run_command (argv);
664} 1086}
665 1087
666/*----------------------------------------------------------------------*/ 1088/*----------------------------------------------------------------------*/
667void 1089void
668rxvt_term::Get_Colours () 1090rxvt_term::get_colours ()
669{ 1091{
670 int i; 1092 int i;
671 1093
672#ifdef OFF_FOCUS_FADING 1094#ifdef OFF_FOCUS_FADING
673 pix_colors = pix_colors_focused; 1095 pix_colors = pix_colors_focused;
674#endif 1096#endif
675 1097
676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1098 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
677 { 1099 {
678 const char *name = rs[Rs_color + i]; 1100 const char *name = rs[Rs_color + i];
679 1101
680 if (!name) 1102 if (!name)
… …
733 * get scrollBar shadow colors 1155 * get scrollBar shadow colors
734 * 1156 *
735 * The calculations of topShadow/bottomShadow values are adapted 1157 * The calculations of topShadow/bottomShadow values are adapted
736 * from the fvwm window manager. 1158 * from the fvwm window manager.
737 */ 1159 */
738#ifdef KEEP_SCROLLCOLOR 1160#ifdef RXVT_SCROLLBAR
739 if (depth <= 2) 1161 if (depth <= 2)
740 { 1162 {
741 /* Monochrome */ 1163 /* Monochrome */
742 alias_color (Color_scroll, Color_fg); 1164 alias_color (Color_scroll, Color_fg);
743 alias_color (Color_topShadow, Color_bg); 1165 alias_color (Color_topShadow, Color_bg);
… …
758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1180 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
759 cscroll.a) 1181 cscroll.a)
760 )) 1182 ))
761 alias_color (Color_topShadow, Color_White); 1183 alias_color (Color_topShadow, Color_White);
762 } 1184 }
763#endif /* KEEP_SCROLLCOLOR */ 1185#endif
764 1186
765#ifdef OFF_FOCUS_FADING 1187#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1188 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i); 1189 update_fade_color (i);
768#endif 1190#endif
… …
776 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1198 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
777 { 1199 {
778 int i = atoi (rs[Rs_color + idx]); 1200 int i = atoi (rs[Rs_color + idx]);
779 1201
780 if (i >= 8 && i <= 15) 1202 if (i >= 8 && i <= 15)
781 { /* bright colors */ 1203 /* bright colors */
782 i -= 8;
783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1204 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784 return; 1205 else if (i >= 0 && i <= 7)
785 } 1206 /* normal colors */
786
787 if (i >= 0 && i <= 7) /* normal colors */
788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1207 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789 } 1208 }
790} 1209}
791 1210
792/*----------------------------------------------------------------------*/ 1211/*----------------------------------------------------------------------*/
… …
876 1295
877 if (i) 1296 if (i)
878 ModMetaMask = modmasks[i - 1]; 1297 ModMetaMask = modmasks[i - 1];
879} 1298}
880 1299
1300void
1301rxvt_term::set_icon (const char *file)
1302{
1303#ifdef HAVE_AFTERIMAGE
1304 init_asv ();
1305
1306 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1307 if (!im)
1308 {
1309 rxvt_warn ("Loading image icon failed, continuing without.\n");
1310 return;
1311 }
1312
1313 unsigned int w = im->width;
1314 unsigned int h = im->height;
1315
1316 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1317 {
1318 rxvt_warn ("Icon image too big, continuing without.\n");
1319 destroy_asimage (&im);
1320 return;
1321 }
1322
1323 ASImage *result = scale_asimage (asv, im,
1324 w, h, ASA_ARGB32,
1325 100, ASIMAGE_QUALITY_DEFAULT);
1326 destroy_asimage (&im);
1327
1328 if (!result)
1329 {
1330 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1331 return;
1332 }
1333
1334 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1335 if (buffer)
1336 {
1337 ARGB32 *asbuf = result->alt.argb32;
1338 buffer [0] = w;
1339 buffer [1] = h;
1340
1341 for (unsigned int i = 0; i < w * h; ++i)
1342 buffer [i + 2] = asbuf [i];
1343
1344 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1345 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1346 free (buffer);
1347 }
1348 else
1349 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1350
1351 destroy_asimage (&result);
1352#endif
1353
1354#ifdef HAVE_PIXBUF
1355 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1356 if (!pixbuf)
1357 {
1358 rxvt_warn ("Loading image icon failed, continuing without.\n");
1359 return;
1360 }
1361
1362 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1363 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1364
1365 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1366 {
1367 rxvt_warn ("Icon image too big, continuing without.\n");
1368 g_object_unref (pixbuf);
1369 return;
1370 }
1371
1372 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1373 {
1374 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1375 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1376 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1377
1378 buffer [0] = w;
1379 buffer [1] = h;
1380 for (int i = 0; i < h; i++)
1381 {
1382 for (int j = 0; j < w; j++)
1383 {
1384 unsigned char *pixel = row + j * channels;
1385 long value;
1386
1387 if (channels == 4)
1388 value = pixel[3];
1389 else
1390 value = (unsigned char)0x00ff;
1391
1392 value = (value << 8) + pixel[0];
1393 value = (value << 8) + pixel[1];
1394 value = (value << 8) + pixel[2];
1395 buffer[(i * w + j) + 2] = value;
1396 }
1397
1398 row += rowstride;
1399 }
1400
1401 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1402 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1403 free (buffer);
1404 }
1405 else
1406 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1407
1408 g_object_unref (pixbuf);
1409#endif
1410}
1411
881/*----------------------------------------------------------------------*/ 1412/*----------------------------------------------------------------------*/
882/* rxvt_Create_Windows () - Open and map the window */ 1413/* Open and map the window */
883void 1414void
884rxvt_term::create_windows (int argc, const char *const *argv) 1415rxvt_term::create_windows (int argc, const char *const *argv)
885{ 1416{
886 XClassHint classHint; 1417 XClassHint classHint;
887 XWMHints wmHint; 1418 XWMHints wmHint;
… …
893 Window top, parent; 1424 Window top, parent;
894 1425
895 dLocal (Display *, dpy); 1426 dLocal (Display *, dpy);
896 1427
897 /* grab colors before netscape does */ 1428 /* grab colors before netscape does */
898 Get_Colours (); 1429 get_colours ();
899 1430
900 if (!set_fonts ()) 1431 if (!set_fonts ())
901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1432 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
902 1433
903 parent = display->root; 1434 parent = display->root;
… …
907#if ENABLE_FRILLS 1438#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 1439 if (option (Opt_borderLess))
909 { 1440 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1441 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 1442 {
912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1443 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913 attributes.override_redirect = true; 1444 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 1445 }
916 else 1446 else
917 { 1447 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 1448 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 1449 }
921 } 1450 }
922 else
923 mwmhints.flags = 0;
924#endif 1451#endif
925 1452
926#if ENABLE_XEMBED 1453#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 1454 if (rs[Rs_embed])
928 { 1455 {
… …
937 } 1464 }
938#endif 1465#endif
939 1466
940 window_calc (0, 0); 1467 window_calc (0, 0);
941 1468
942 /* sub-window placement & size in rxvt_resize_subwindows () */ 1469 /* sub-window placement & size in rxvt_term::resize_all_windows () */
943 attributes.background_pixel = pix_colors_focused [Color_border]; 1470 attributes.background_pixel = pix_colors_focused [Color_border];
944 attributes.border_pixel = pix_colors_focused [Color_border]; 1471 attributes.border_pixel = pix_colors_focused [Color_border];
945 attributes.colormap = cmap; 1472 attributes.colormap = cmap;
946 1473
947 top = XCreateWindow (dpy, parent, 1474 top = XCreateWindow (dpy, parent,
… …
950 ext_bwidth, 1477 ext_bwidth,
951 depth, InputOutput, visual, 1478 depth, InputOutput, visual,
952 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
953 &attributes); 1480 &attributes);
954 1481
955 this->parent[0] = top; 1482 this->parent = top;
956 1483
957 old_width = szHint.width; 1484 set_title (rs [Rs_title]);
958 old_height = szHint.height; 1485 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 1486
963 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
964 classHint.res_class = (char *)RESCLASS; 1488 classHint.res_class = (char *)RESCLASS;
965 1489
966 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1490 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
968 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1492 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
969 wmHint.window_group = top; 1493 wmHint.window_group = top;
970 1494
971 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1495 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972 &szHint, &wmHint, &classHint); 1496 &szHint, &wmHint, &classHint);
1497#if ENABLE_EWMH
1498 /*
1499 * set up icon hint
1500 * rs [Rs_iconfile] is path to icon
1501 */
1502
1503 if (rs [Rs_iconfile])
1504 {
1505 set_icon (rs [Rs_iconfile]);
1506 }
1507#endif
973 1508
974#if ENABLE_FRILLS 1509#if ENABLE_FRILLS
975 if (mwmhints.flags) 1510 if (mwmhints.flags)
976 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1511 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
977 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1512 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
982#if ENABLE_EWMH 1517#if ENABLE_EWMH
983 xa[XA_NET_WM_PING], 1518 xa[XA_NET_WM_PING],
984#endif 1519#endif
985 }; 1520 };
986 1521
987 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1522 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
988 1523
989#if ENABLE_FRILLS 1524#if ENABLE_FRILLS
990 if (rs[Rs_transient_for]) 1525 if (rs[Rs_transient_for])
991 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1526 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
992#endif 1527#endif
… …
1011 1546
1012 termwin_ev.start (display, top); 1547 termwin_ev.start (display, top);
1013 1548
1014 /* vt cursor: Black-on-White is standard, but this is more popular */ 1549 /* vt cursor: Black-on-White is standard, but this is more popular */
1015 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016
1017#ifdef HAVE_SCROLLBARS
1018 /* cursor scrollBar: Black-on-White */
1019 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1020#endif
1021 1551
1022 /* the vt window */ 1552 /* the vt window */
1023 vt = XCreateSimpleWindow (dpy, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1024 window_vt_x, window_vt_y, 1554 window_vt_x, window_vt_y,
1025 width, height, 1555 width, height,
… …
1039 1569
1040 vt_select_input (); 1570 vt_select_input ();
1041 1571
1042 vt_ev.start (display, vt); 1572 vt_ev.start (display, vt);
1043 1573
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL)
1046 {
1047 const char *p = rs[Rs_backgroundPixmap];
1048
1049 if ((p = strchr (p, ';')) != NULL)
1050 {
1051 p++;
1052 bgPixmap.handle_geometry (p);
1053 }
1054
1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1056 scr_touch (true);
1057 }
1058#endif
1059
1060 /* graphics context for the vt window */ 1574 /* graphics context for the vt window */
1061 gcvalue.foreground = pix_colors[Color_fg]; 1575 gcvalue.foreground = pix_colors[Color_fg];
1062 gcvalue.background = pix_colors[Color_bg]; 1576 gcvalue.background = pix_colors[Color_bg];
1063 gcvalue.graphics_exposures = 0; 1577 gcvalue.graphics_exposures = 0;
1064 1578
… …
1066 GCForeground | GCBackground | GCGraphicsExposures, 1580 GCForeground | GCBackground | GCGraphicsExposures,
1067 &gcvalue); 1581 &gcvalue);
1068 1582
1069 drawable = new rxvt_drawable (this, vt); 1583 drawable = new rxvt_drawable (this, vt);
1070 1584
1071#ifdef RXVT_SCROLLBAR
1072 gcvalue.foreground = pix_colors[Color_topShadow];
1073 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[Color_bottomShadow];
1075 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1077 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078#endif
1079
1080#ifdef OFF_FOCUS_FADING 1585#ifdef OFF_FOCUS_FADING
1081 // initially we are in unfocused state 1586 // initially we are in unfocused state
1082 if (rs[Rs_fade]) 1587 if (rs[Rs_fade])
1083 pix_colors = pix_colors_unfocused; 1588 pix_colors = pix_colors_unfocused;
1084#endif 1589#endif
1085 1590
1086 pointer_unblank (); 1591 pointer_unblank ();
1087 scr_recolour (); 1592 scr_recolour ();
1088}
1089
1090/* ------------------------------------------------------------------------- *
1091 * GET TTY CURRENT STATE *
1092 * ------------------------------------------------------------------------- */
1093void
1094rxvt_get_ttymode (ttymode_t *tio, int erase)
1095{
1096 /*
1097 * standard System V termios interface
1098 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1100 {
1101 // return error - use system defaults,
1102 // where possible, and zero elsewhere
1103 memset (tio, 0, sizeof (ttymode_t));
1104
1105 tio->c_cc[VINTR] = CINTR;
1106 tio->c_cc[VQUIT] = CQUIT;
1107 tio->c_cc[VERASE] = CERASE;
1108#ifdef VERASE2
1109 tio->c_cc[VERASE2] = CERASE2;
1110#endif
1111 tio->c_cc[VKILL] = CKILL;
1112 tio->c_cc[VSTART] = CSTART;
1113 tio->c_cc[VSTOP] = CSTOP;
1114 tio->c_cc[VSUSP] = CSUSP;
1115# ifdef VDSUSP
1116 tio->c_cc[VDSUSP] = CDSUSP;
1117# endif
1118# ifdef VREPRINT
1119 tio->c_cc[VREPRINT] = CRPRNT;
1120# endif
1121# ifdef VDISCRD
1122 tio->c_cc[VDISCRD] = CFLUSH;
1123# endif
1124# ifdef VWERSE
1125 tio->c_cc[VWERSE] = CWERASE;
1126# endif
1127# ifdef VLNEXT
1128 tio->c_cc[VLNEXT] = CLNEXT;
1129# endif
1130 }
1131
1132 tio->c_cc[VEOF] = CEOF;
1133 tio->c_cc[VEOL] = VDISABLE;
1134# ifdef VEOL2
1135 tio->c_cc[VEOL2] = VDISABLE;
1136# endif
1137# ifdef VSWTC
1138 tio->c_cc[VSWTC] = VDISABLE;
1139# endif
1140# ifdef VSWTCH
1141 tio->c_cc[VSWTCH] = VDISABLE;
1142# endif
1143# if VMIN != VEOF
1144 tio->c_cc[VMIN] = 1;
1145# endif
1146# if VTIME != VEOL
1147 tio->c_cc[VTIME] = 0;
1148# endif
1149
1150 if (erase != -1)
1151 tio->c_cc[VERASE] = (char)erase;
1152
1153 /* input modes */
1154 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1155# ifdef IMAXBEL
1156 | IMAXBEL
1157# endif
1158 | IXON);
1159
1160 /* output modes */
1161 tio->c_oflag = (OPOST | ONLCR);
1162
1163 /* control modes */
1164 tio->c_cflag = (CS8 | CREAD);
1165
1166 /* line discipline modes */
1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1168# if defined (ECHOCTL) && defined (ECHOKE)
1169 | ECHOCTL | ECHOKE
1170# endif
1171 | ECHOE | ECHOK);
1172
1173 /*
1174 * Debugging
1175 */
1176#ifdef DEBUG_TTYMODE
1177#ifdef HAVE_TERMIOS_H
1178 /* c_iflag bits */
1179 fprintf (stderr, "Input flags\n");
1180
1181 /* cpp token stringize doesn't work on all machines <sigh> */
1182# define FOO(flag,name) \
1183 if ((tio->c_iflag) & flag) \
1184 fprintf (stderr, "%s ", name)
1185
1186 /* c_iflag bits */
1187 FOO (IGNBRK, "IGNBRK");
1188 FOO (BRKINT, "BRKINT");
1189 FOO (IGNPAR, "IGNPAR");
1190 FOO (PARMRK, "PARMRK");
1191 FOO (INPCK, "INPCK");
1192 FOO (ISTRIP, "ISTRIP");
1193 FOO (INLCR, "INLCR");
1194 FOO (IGNCR, "IGNCR");
1195 FOO (ICRNL, "ICRNL");
1196 FOO (IXON, "IXON");
1197 FOO (IXOFF, "IXOFF");
1198# ifdef IUCLC
1199 FOO (IUCLC, "IUCLC");
1200# endif
1201# ifdef IXANY
1202 FOO (IXANY, "IXANY");
1203# endif
1204# ifdef IMAXBEL
1205 FOO (IMAXBEL, "IMAXBEL");
1206# endif
1207
1208 fprintf (stderr, "\n");
1209
1210# undef FOO
1211# define FOO(entry, name) \
1212 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1213
1214 FOO (VINTR, "VINTR");
1215 FOO (VQUIT, "VQUIT");
1216 FOO (VERASE, "VERASE");
1217 FOO (VKILL, "VKILL");
1218 FOO (VEOF, "VEOF");
1219 FOO (VEOL, "VEOL");
1220# ifdef VEOL2
1221 FOO (VEOL2, "VEOL2");
1222# endif
1223# ifdef VSWTC
1224 FOO (VSWTC, "VSWTC");
1225# endif
1226# ifdef VSWTCH
1227 FOO (VSWTCH, "VSWTCH");
1228# endif
1229 FOO (VSTART, "VSTART");
1230 FOO (VSTOP, "VSTOP");
1231 FOO (VSUSP, "VSUSP");
1232# ifdef VDSUSP
1233 FOO (VDSUSP, "VDSUSP");
1234# endif
1235# ifdef VREPRINT
1236 FOO (VREPRINT, "VREPRINT");
1237# endif
1238# ifdef VDISCRD
1239 FOO (VDISCRD, "VDISCRD");
1240# endif
1241# ifdef VWERSE
1242 FOO (VWERSE, "VWERSE");
1243# endif
1244# ifdef VLNEXT
1245 FOO (VLNEXT, "VLNEXT");
1246# endif
1247
1248 fprintf (stderr, "\n");
1249# undef FOO
1250# endif /* HAVE_TERMIOS_H */
1251#endif /* DEBUG_TTYMODE */
1252} 1593}
1253 1594
1254/*----------------------------------------------------------------------*/ 1595/*----------------------------------------------------------------------*/
1255/* 1596/*
1256 * Run the command in a subprocess and return a file descriptor for the 1597 * Run the command in a subprocess and return a file descriptor for the
… …
1268 if (pty->pty >= 0) 1609 if (pty->pty >= 0)
1269 { 1610 {
1270 if (getfd_hook) 1611 if (getfd_hook)
1271 pty->pty = (*getfd_hook) (pty->pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1272 1613
1273 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1274 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1275 } 1616 }
1276 } 1617 }
1277 else 1618 else
1278#endif 1619#endif
1279 if (!pty->get ()) 1620 if (!pty->get ())
1280 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1621 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1281 1622
1282 int er; 1623 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1624
1625 struct termios tio = def_tio;
1283 1626
1284#ifndef NO_BACKSPACE_KEY 1627#ifndef NO_BACKSPACE_KEY
1285 if (key_backspace[0] && !key_backspace[1]) 1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1286 er = key_backspace[0]; 1629 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1287 else if (strcmp (key_backspace, "DEC") == 0) 1630 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1288 er = '\177'; /* the initial state anyway */ 1631 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1289 else
1290#endif 1632#endif
1291 er = -1;
1292 1633
1293 rxvt_get_ttymode (&tio, er); 1634 /* init terminal attributes */
1294 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1635 cfsetospeed (&tio, BAUDRATE);
1636 cfsetispeed (&tio, BAUDRATE);
1637 tcsetattr (pty->tty, TCSANOW, &tio);
1295 pty->set_utf8_mode (enc_utf8); 1638 pty->set_utf8_mode (enc_utf8);
1296 1639
1297 /* set initial window size */ 1640 /* set initial window size */
1298 tt_winch (); 1641 tt_winch ();
1299 1642
… …
1335 1678
1336 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1337 1680
1338 default: 1681 default:
1339 if (!option (Opt_utmpInhibit)) 1682 if (!option (Opt_utmpInhibit))
1683 {
1684#ifdef LOG_ONLY_ON_LOGIN
1685 bool login_shell = option (Opt_loginShell);
1686#else
1687 bool login_shell = true;
1688#endif
1340 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1690 }
1341 1691
1342 pty->close_tty (); 1692 pty->close_tty ();
1343 1693
1344 child_ev.start (cmd_pid); 1694 child_ev.start (cmd_pid);
1345 1695
… …
1359rxvt_term::run_child (const char *const *argv) 1709rxvt_term::run_child (const char *const *argv)
1360{ 1710{
1361 char *login; 1711 char *login;
1362 1712
1363 if (option (Opt_console)) 1713 if (option (Opt_console))
1714 {
1364 { /* be virtual console, fail silently */ 1715 /* be virtual console, fail silently */
1365#ifdef TIOCCONS 1716#ifdef TIOCCONS
1366 unsigned int on = 1; 1717 unsigned int on = 1;
1367 1718
1368 ioctl (STDIN_FILENO, TIOCCONS, &on); 1719 ioctl (STDIN_FILENO, TIOCCONS, &on);
1369#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1370 int fd; 1721 int fd;
1371 1722
1372 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1373 if (fd >= 0) 1724 if (fd >= 0)
1374 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1375 close (fd); 1727 close (fd);
1376#endif /* SRIOCSREDIR */ 1728 }
1729#endif /* SRIOCSREDIR */
1377 } 1730 }
1378 1731
1379 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1380 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);
1381 signal (SIGQUIT, SIG_DFL); 1734 signal (SIGQUIT, SIG_DFL);
1382 signal (SIGCHLD, SIG_DFL); 1735 signal (SIGCHLD, SIG_DFL);
1383 signal (SIGHUP, SIG_DFL); 1736 signal (SIGHUP, SIG_DFL);
1384 signal (SIGPIPE, SIG_DFL); 1737 signal (SIGPIPE, SIG_DFL);
1385 /* 1738 /*
1386 * mimick login's behavior by disabling the job control signals 1739 * mimic login's behavior by disabling the job control signals
1387 * a shell that wants them can turn them back on 1740 * a shell that wants them can turn them back on
1388 */ 1741 */
1389#ifdef SIGTSTP 1742#ifdef SIGTSTP
1390 signal (SIGTSTP, SIG_IGN); 1743 signal (SIGTSTP, SIG_IGN);
1391 signal (SIGTTIN, SIG_IGN); 1744 signal (SIGTTIN, SIG_IGN);
1392 signal (SIGTTOU, SIG_IGN); 1745 signal (SIGTTOU, SIG_IGN);
1393#endif /* SIGTSTP */ 1746#endif /* SIGTSTP */
1394
1395 // unblock signals (signals are blocked by iom.C
1396 sigset_t ss;
1397 sigemptyset (&ss);
1398 sigprocmask (SIG_SETMASK, &ss, 0);
1399 1747
1400 /* command interpreter path */ 1748 /* command interpreter path */
1401 if (argv != NULL) 1749 if (argv)
1402 { 1750 {
1403# ifdef DEBUG_CMD 1751# ifdef DEBUG_CMD
1404 int i; 1752 int i;
1405 1753
1406 for (i = 0; argv[i]; i++) 1754 for (i = 0; argv[i]; i++)
… …
1415 const char *argv0, *shell; 1763 const char *argv0, *shell;
1416 1764
1417 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1765 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1418 shell = "/bin/sh"; 1766 shell = "/bin/sh";
1419 1767
1420 argv0 = (const char *)rxvt_r_basename (shell); 1768 argv0 = rxvt_basename (shell);
1421 1769
1422 if (option (Opt_loginShell)) 1770 if (option (Opt_loginShell))
1423 { 1771 {
1424 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1772 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1425 1773
1426 login[0] = '-'; 1774 login[0] = '-';
1427 strcpy (&login[1], argv0); 1775 strcpy (&login[1], argv0);
1428 argv0 = login; 1776 argv0 = login;
1429 } 1777 }
1430 1778
1431 execlp (shell, argv0, NULL); 1779 execlp (shell, argv0, (char *)0);
1432 /* no error message: STDERR is closed! */ 1780 /* no error message: STDERR is closed! */
1433 } 1781 }
1434 1782
1435 return -1; 1783 return -1;
1436} 1784}

Diff Legend

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