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.202 by sasha, Tue Aug 7 22:43:33 2007 UTC vs.
Revision 1.314 by sf-exg, Mon Jan 9 15:30:17 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 ENABLE_TRANSPARENCY 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#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216
217 last_bot = last_state = -1;
218 554
219 set_option (Opt_scrollBar); 555 set_option (Opt_scrollBar);
220 set_option (Opt_scrollTtyOutput); 556 set_option (Opt_scrollTtyOutput);
221 set_option (Opt_jumpScroll); 557 set_option (Opt_jumpScroll);
222 set_option (Opt_skipScroll); 558 set_option (Opt_skipScroll);
223 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
224 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
225 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
226 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
563 set_option (Opt_iso14755);
227 set_option (Opt_iso14755_52); 564 set_option (Opt_iso14755_52);
228 565 set_option (Opt_buffered);
229 return true;
230}
231
232void
233rxvt_term::init_secondary ()
234{
235 int i;
236
237 /*
238 * Close all unused file descriptors
239 * We don't want them, we don't need them.
240 */
241 if ((i = open ("/dev/null", O_RDONLY)) < 0)
242 {
243 /* TODO: BOO HISS */
244 dup2 (STDERR_FILENO, STDIN_FILENO);
245 }
246 else if (i > STDIN_FILENO)
247 {
248 dup2 (i, STDIN_FILENO);
249 close (i);
250 }
251
252 dup2 (STDERR_FILENO, STDOUT_FILENO);
253
254#if 0 // schmorp sayz closing filies is murder
255 for (i = STDERR_FILENO + 1; i < num_fds; i++)
256 {
257#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
258 if (i == 4 || i == 7)
259 continue;
260#endif
261 close (i);
262 }
263#endif
264} 566}
265 567
266/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
267const char ** 569const char **
268rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
269{ 571{
270 int i, r_argc; 572 int i;
271 char *val;
272 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
273 574
274 /*
275 * Look for -e option. Find => split and make cmd_argv[] of command args
276 */
277 for (r_argc = 0; r_argc < argc; r_argc++)
278 if (!strcmp (argv[r_argc], "-e"))
279 break;
280
281 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
282
283 for (i = 0; i < r_argc; i++)
284 r_argv[i] = (const char *)argv[i];
285
286 r_argv[i] = NULL;
287
288 if (r_argc == argc)
289 cmd_argv = NULL;
290 else
291 {
292 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
293
294 for (i = 0; i < argc - r_argc - 1; i++)
295 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
296
297 cmd_argv[i] = NULL;
298 }
299
300 rs[Rs_name] = rxvt_r_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
301 576
302 /* 577 /*
303 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
304 */ 579 */
305 580
306 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
307 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
308 583
309 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
310 585
311 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
312 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]);
313 588
314 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
… …
320#if XFT 595#if XFT
321 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
322 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
323#endif 598#endif
324 599
325#ifdef HAVE_AFTERIMAGE
326 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
327#endif
328 free (r_argv);
329
330 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
331 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
332 rs [i] = 0; 602 rs [i] = 0;
333 603
334#if ENABLE_PERL 604#if ENABLE_PERL
… …
341 { 611 {
342 rxvt_perl.init (this); 612 rxvt_perl.init (this);
343 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
344 } 614 }
345#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 ();
346 620
347 /* 621 /*
348 * set any defaults not already set 622 * set any defaults not already set
349 */ 623 */
350 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
351 { 625 {
352 if (!rs[Rs_title]) 626 if (!rs[Rs_title])
353 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 627 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
628
354 if (!rs[Rs_iconName]) 629 if (!rs[Rs_iconName])
355 rs[Rs_iconName] = rs[Rs_title]; 630 rs[Rs_iconName] = rs[Rs_title];
356 } 631 }
357 else 632 else
358 { 633 {
359 if (!rs[Rs_title]) 634 if (!rs[Rs_title])
360 rs[Rs_title] = rs[Rs_name]; 635 rs[Rs_title] = rs[Rs_name];
636
361 if (!rs[Rs_iconName]) 637 if (!rs[Rs_iconName])
362 rs[Rs_iconName] = rs[Rs_name]; 638 rs[Rs_iconName] = rs[Rs_name];
363 } 639 }
364 640
365 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 641 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
372 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)
373 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
374 650
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 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]);
377#endif 656#endif
378 657
379#ifdef POINTER_BLANK 658#ifdef POINTER_BLANK
380 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
381 pointerBlankDelay = i; 660 pointerBlankDelay = i;
… …
385 664
386 /* no point having a scrollbar without having any scrollback! */ 665 /* no point having a scrollbar without having any scrollback! */
387 if (!saveLines) 666 if (!saveLines)
388 set_option (Opt_scrollBar, 0); 667 set_option (Opt_scrollBar, 0);
389 668
390#ifdef PRINTPIPE
391 if (!rs[Rs_print_pipe])
392 rs[Rs_print_pipe] = PRINTPIPE;
393#endif
394
395 if (!rs[Rs_cutchars]) 669 if (!rs[Rs_cutchars])
396 rs[Rs_cutchars] = CUTCHARS; 670 rs[Rs_cutchars] = CUTCHARS;
397 671
398#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
399 if (!rs[Rs_backspace_key]) 673 if (!rs[Rs_backspace_key])
400# ifdef DEFAULT_BACKSPACE 674# ifdef DEFAULT_BACKSPACE
401 key_backspace = DEFAULT_BACKSPACE; 675 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402# else 676# else
403 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 677 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404# endif 678# endif
405 else
406 {
407 val = strdup (rs[Rs_backspace_key]);
408 rxvt_Str_trim (val);
409 rxvt_Str_escaped (val);
410 key_backspace = val;
411 }
412#endif 679#endif
413 680
414#ifndef NO_DELETE_KEY 681#ifndef NO_DELETE_KEY
415 if (!rs[Rs_delete_key]) 682 if (!rs[Rs_delete_key])
416# ifdef DEFAULT_DELETE 683# ifdef DEFAULT_DELETE
417 key_delete = DEFAULT_DELETE; 684 rs[Rs_delete_key] = DEFAULT_DELETE;
418# else 685# else
419 key_delete = "\033[3~"; 686 rs[Rs_delete_key] = "\033[3~";
420# endif 687# endif
421 else
422 {
423 val = strdup (rs[Rs_delete_key]);
424 rxvt_Str_trim (val);
425 rxvt_Str_escaped (val);
426 key_delete = val;
427 }
428#endif 688#endif
429 if (rs[Rs_answerbackstring])
430 {
431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433 }
434 689
435#ifdef HAVE_SCROLLBARS 690 scrollBar.setup (this);
436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437#endif
438 691
439#ifdef XTERM_REVERSE_VIDEO 692#ifdef XTERM_REVERSE_VIDEO
440 /* this is how xterm implements reverseVideo */ 693 /* this is how xterm implements reverseVideo */
441 if (option (Opt_reverseVideo)) 694 if (option (Opt_reverseVideo))
442 { 695 {
… …
462 color_aliases (Color_fg); 715 color_aliases (Color_fg);
463 color_aliases (Color_bg); 716 color_aliases (Color_bg);
464#ifndef NO_CURSORCOLOR 717#ifndef NO_CURSORCOLOR
465 color_aliases (Color_cursor); 718 color_aliases (Color_cursor);
466 color_aliases (Color_cursor2); 719 color_aliases (Color_cursor2);
467#endif /* NO_CURSORCOLOR */ 720#endif /* NO_CURSORCOLOR */
468 color_aliases (Color_pointer_fg); 721 color_aliases (Color_pointer_fg);
469 color_aliases (Color_pointer_bg); 722 color_aliases (Color_pointer_bg);
470 color_aliases (Color_border); 723 color_aliases (Color_border);
471#ifndef NO_BOLD_UNDERLINE_REVERSE 724#ifndef NO_BOLD_UNDERLINE_REVERSE
472 color_aliases (Color_BD); 725 color_aliases (Color_BD);
473 color_aliases (Color_UL); 726 color_aliases (Color_UL);
474 color_aliases (Color_RV); 727 color_aliases (Color_RV);
475#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 728#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
476 729
477 if (!rs[Rs_color + Color_border]) 730 if (!rs[Rs_color + Color_border])
478 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 731 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
479 732
480 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 set_colorfgbg ();
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 ();
481} 904}
482 905
483/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
484void 907void
485rxvt_term::init_env () 908rxvt_term::init_env ()
486{ 909{
487 int i;
488 unsigned int u;
489 char *val; 910 char *val;
911 char *env_display;
912 char *env_term;
490 913
491#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
492 /* Fixup display_name for export over pty to any interested terminal 915 /* Fixup display_name for export over pty to any interested terminal
493 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 916 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
494 * (for the first non-loopback interface) that we get from 917 * (for the first non-loopback interface) that we get from
… …
501 */ 924 */
502 val = rxvt_network_display (rs[Rs_display_name]); 925 val = rxvt_network_display (rs[Rs_display_name]);
503 rs[Rs_display_name] = (const char *)val; 926 rs[Rs_display_name] = (const char *)val;
504 927
505 if (val == NULL) 928 if (val == NULL)
506#endif /* DISPLAY_IS_IP */ 929#endif /* DISPLAY_IS_IP */
507 val = XDisplayString (dpy); 930 val = XDisplayString (dpy);
508 931
509 if (rs[Rs_display_name] == NULL) 932 if (rs[Rs_display_name] == NULL)
510 rs[Rs_display_name] = val; /* use broken `:0' value */ 933 rs[Rs_display_name] = val; /* use broken `:0' value */
511 934
512 i = strlen (val);
513 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 935 env_display = (char *)rxvt_malloc (strlen (val) + 9);
514 936
515 sprintf (env_display, "DISPLAY=%s", val); 937 sprintf (env_display, "DISPLAY=%s", val);
516 938
517 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
518 940
519 /* add entries to the environment: 941 /* add entries to the environment:
520 * @ DISPLAY: in case we started with -display 942 * @ DISPLAY: in case we started with -display
521 * @ WINDOWID: X window id number of the window 943 * @ WINDOWID: X window id number of the window
522 * @ COLORTERM: terminal sub-name and also indicates its color 944 * @ COLORTERM: terminal sub-name and also indicates its color
… …
539 else 961 else
540 putenv ("COLORTERM=" COLORTERMENVFULL); 962 putenv ("COLORTERM=" COLORTERMENVFULL);
541 963
542 if (rs[Rs_term_name] != NULL) 964 if (rs[Rs_term_name] != NULL)
543 { 965 {
544 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 966 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
545 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 967 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
546 putenv (env_term); 968 putenv (env_term);
547 } 969 }
548 else 970 else
549 putenv ("TERM=" TERMENV); 971 putenv ("TERM=" TERMENV);
… …
551#ifdef HAVE_UNSETENV 973#ifdef HAVE_UNSETENV
552 /* avoid passing old settings and confusing term size */ 974 /* avoid passing old settings and confusing term size */
553 unsetenv ("LINES"); 975 unsetenv ("LINES");
554 unsetenv ("COLUMNS"); 976 unsetenv ("COLUMNS");
555 unsetenv ("TERMCAP"); /* terminfo should be okay */ 977 unsetenv ("TERMCAP"); /* terminfo should be okay */
556#endif /* HAVE_UNSETENV */ 978#endif /* HAVE_UNSETENV */
557} 979}
558 980
559/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
560/*
561 * This is more or less stolen straight from XFree86 xterm.
562 * This should support all European type languages.
563 */
564void 982void
565rxvt_term::set_locale (const char *locale) 983rxvt_term::set_locale (const char *locale)
566{ 984{
567 set_environ (envv); 985 set_environ (envv);
568 986
… …
582 1000
583 this->locale = "C"; 1001 this->locale = "C";
584 } 1002 }
585 1003
586 1004
587 this->locale = rxvt_strdup (this->locale); 1005 this->locale = strdup (this->locale);
588 SET_LOCALE (this->locale); 1006 SET_LOCALE (this->locale);
589 mbstate.reset (); 1007 mbstate.reset ();
590#endif 1008#endif
591 1009
592#if HAVE_NL_LANGINFO 1010#if HAVE_NL_LANGINFO
593 char *codeset = strdup (nl_langinfo (CODESET)); 1011 char *codeset = nl_langinfo (CODESET);
594 // /^UTF.?8/i 1012 // /^UTF.?8/i
595 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
596 && (codeset[1] == 'T' || codeset[1] == 't') 1014 && (codeset[1] == 'T' || codeset[1] == 't')
597 && (codeset[2] == 'F' || codeset[2] == 'f') 1015 && (codeset[2] == 'F' || codeset[2] == 'f')
598 && (codeset[3] == '8' || codeset[4] == '8'); 1016 && (codeset[3] == '8' || codeset[4] == '8');
599 free (codeset);
600#else 1017#else
601 enc_utf8 = 0; 1018 enc_utf8 = 0;
602#endif 1019#endif
603} 1020}
604 1021
… …
607{ 1024{
608 set_environ (envv); 1025 set_environ (envv);
609 1026
610#ifdef USE_XIM 1027#ifdef USE_XIM
611 if (!locale) 1028 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 1029 rxvt_warn ("setting locale failed, continuing without locale support.\n");
613 else 1030 else
614 { 1031 {
615 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616 1033
617 if (!XSupportsLocale ()) 1034 if (!XSupportsLocale ())
618 { 1035 {
619 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1036 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
620 return; 1037 return;
621 } 1038 }
622 1039
623 im_ev.start (display); 1040 im_ev.start (display);
624 1041
… …
649 priv_modes |= PrivMode_Keypress; 1066 priv_modes |= PrivMode_Keypress;
650 if (!option (Opt_jumpScroll)) 1067 if (!option (Opt_jumpScroll))
651 priv_modes |= PrivMode_smoothScroll; 1068 priv_modes |= PrivMode_smoothScroll;
652 1069
653#ifndef NO_BACKSPACE_KEY 1070#ifndef NO_BACKSPACE_KEY
654 if (strcmp (key_backspace, "DEC") == 0) 1071 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
655 priv_modes |= PrivMode_HaveBackSpace; 1072 priv_modes |= PrivMode_HaveBackSpace;
656#endif 1073#endif
657 1074
658 /* add value for scrollBar */ 1075 /* add value for scrollBar */
659 if (scrollBar.state) 1076 if (scrollBar.state)
… …
665 run_command (argv); 1082 run_command (argv);
666} 1083}
667 1084
668/*----------------------------------------------------------------------*/ 1085/*----------------------------------------------------------------------*/
669void 1086void
670rxvt_term::Get_Colours () 1087rxvt_term::get_colours ()
671{ 1088{
672 int i; 1089 int i;
673 1090
674#ifdef OFF_FOCUS_FADING 1091#ifdef OFF_FOCUS_FADING
675 pix_colors = pix_colors_focused; 1092 pix_colors = pix_colors_focused;
676#endif 1093#endif
677 1094
678 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1095 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
679 { 1096 {
680 const char *name = rs[Rs_color + i]; 1097 const char *name = rs[Rs_color + i];
681 1098
682 if (!name) 1099 if (!name)
… …
735 * get scrollBar shadow colors 1152 * get scrollBar shadow colors
736 * 1153 *
737 * The calculations of topShadow/bottomShadow values are adapted 1154 * The calculations of topShadow/bottomShadow values are adapted
738 * from the fvwm window manager. 1155 * from the fvwm window manager.
739 */ 1156 */
740#ifdef KEEP_SCROLLCOLOR 1157#ifdef RXVT_SCROLLBAR
741 if (depth <= 2) 1158 if (depth <= 2)
742 { 1159 {
743 /* Monochrome */ 1160 /* Monochrome */
744 alias_color (Color_scroll, Color_fg); 1161 alias_color (Color_scroll, Color_fg);
745 alias_color (Color_topShadow, Color_bg); 1162 alias_color (Color_topShadow, Color_bg);
… …
760 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1177 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
761 cscroll.a) 1178 cscroll.a)
762 )) 1179 ))
763 alias_color (Color_topShadow, Color_White); 1180 alias_color (Color_topShadow, Color_White);
764 } 1181 }
765#endif /* KEEP_SCROLLCOLOR */ 1182#endif
766 1183
767#ifdef OFF_FOCUS_FADING 1184#ifdef OFF_FOCUS_FADING
768 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1185 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
769 update_fade_color (i); 1186 update_fade_color (i);
770#endif 1187#endif
… …
778 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1195 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
779 { 1196 {
780 int i = atoi (rs[Rs_color + idx]); 1197 int i = atoi (rs[Rs_color + idx]);
781 1198
782 if (i >= 8 && i <= 15) 1199 if (i >= 8 && i <= 15)
783 { /* bright colors */ 1200 /* bright colors */
784 i -= 8;
785 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1201 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
786 return; 1202 else if (i >= 0 && i <= 7)
787 } 1203 /* normal colors */
788
789 if (i >= 0 && i <= 7) /* normal colors */
790 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1204 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
791 } 1205 }
792} 1206}
793 1207
794/*----------------------------------------------------------------------*/ 1208/*----------------------------------------------------------------------*/
… …
878 1292
879 if (i) 1293 if (i)
880 ModMetaMask = modmasks[i - 1]; 1294 ModMetaMask = modmasks[i - 1];
881} 1295}
882 1296
1297void
1298rxvt_term::set_icon (const char *file)
1299{
1300#ifdef HAVE_AFTERIMAGE
1301 init_asv ();
1302
1303 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1304 if (!im)
1305 {
1306 rxvt_warn ("Loading image icon failed, continuing without.\n");
1307 return;
1308 }
1309
1310 unsigned int w = im->width;
1311 unsigned int h = im->height;
1312
1313 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1314 {
1315 rxvt_warn ("Icon image too big, continuing without.\n");
1316 destroy_asimage (&im);
1317 return;
1318 }
1319
1320 ASImage *result = scale_asimage (asv, im,
1321 w, h, ASA_ARGB32,
1322 100, ASIMAGE_QUALITY_DEFAULT);
1323 destroy_asimage (&im);
1324
1325 if (!result)
1326 {
1327 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1328 return;
1329 }
1330
1331 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1332 if (buffer)
1333 {
1334 ARGB32 *asbuf = result->alt.argb32;
1335 buffer [0] = w;
1336 buffer [1] = h;
1337
1338 for (unsigned int i = 0; i < w * h; ++i)
1339 buffer [i + 2] = asbuf [i];
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 destroy_asimage (&result);
1349#endif
1350
1351#ifdef HAVE_PIXBUF
1352 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf)
1354 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n");
1356 return;
1357 }
1358
1359 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1360 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1361
1362 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1363 {
1364 rxvt_warn ("Icon image too big, continuing without.\n");
1365 g_object_unref (pixbuf);
1366 return;
1367 }
1368
1369 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1370 {
1371 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1372 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1373 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1374
1375 buffer [0] = w;
1376 buffer [1] = h;
1377 for (int i = 0; i < h; i++)
1378 {
1379 for (int j = 0; j < w; j++)
1380 {
1381 unsigned char *pixel = row + j * channels;
1382 long value;
1383
1384 if (channels == 4)
1385 value = pixel[3];
1386 else
1387 value = (unsigned char)0x00ff;
1388
1389 value = (value << 8) + pixel[0];
1390 value = (value << 8) + pixel[1];
1391 value = (value << 8) + pixel[2];
1392 buffer[(i * w + j) + 2] = value;
1393 }
1394
1395 row += rowstride;
1396 }
1397
1398 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1399 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1400 free (buffer);
1401 }
1402 else
1403 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1404
1405 g_object_unref (pixbuf);
1406#endif
1407}
1408
883/*----------------------------------------------------------------------*/ 1409/*----------------------------------------------------------------------*/
884/* rxvt_Create_Windows () - Open and map the window */ 1410/* Open and map the window */
885void 1411void
886rxvt_term::create_windows (int argc, const char *const *argv) 1412rxvt_term::create_windows (int argc, const char *const *argv)
887{ 1413{
888 XClassHint classHint; 1414 XClassHint classHint;
889 XWMHints wmHint; 1415 XWMHints wmHint;
… …
895 Window top, parent; 1421 Window top, parent;
896 1422
897 dLocal (Display *, dpy); 1423 dLocal (Display *, dpy);
898 1424
899 /* grab colors before netscape does */ 1425 /* grab colors before netscape does */
900 Get_Colours (); 1426 get_colours ();
901 1427
902 if (!set_fonts ()) 1428 if (!set_fonts ())
903 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1429 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
904 1430
905 parent = display->root; 1431 parent = display->root;
… …
909#if ENABLE_FRILLS 1435#if ENABLE_FRILLS
910 if (option (Opt_borderLess)) 1436 if (option (Opt_borderLess))
911 { 1437 {
912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1438 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
913 { 1439 {
914 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1440 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
915 attributes.override_redirect = true; 1441 attributes.override_redirect = true;
916 mwmhints.flags = 0;
917 } 1442 }
918 else 1443 else
919 { 1444 {
920 mwmhints.flags = MWM_HINTS_DECORATIONS; 1445 mwmhints.flags = MWM_HINTS_DECORATIONS;
921 mwmhints.decorations = 0;
922 } 1446 }
923 } 1447 }
924 else
925 mwmhints.flags = 0;
926#endif 1448#endif
927 1449
928#if ENABLE_XEMBED 1450#if ENABLE_XEMBED
929 if (rs[Rs_embed]) 1451 if (rs[Rs_embed])
930 { 1452 {
… …
939 } 1461 }
940#endif 1462#endif
941 1463
942 window_calc (0, 0); 1464 window_calc (0, 0);
943 1465
944 /* sub-window placement & size in rxvt_resize_subwindows () */ 1466 /* sub-window placement & size in rxvt_term::resize_all_windows () */
945 attributes.background_pixel = pix_colors_focused [Color_border]; 1467 attributes.background_pixel = pix_colors_focused [Color_border];
946 attributes.border_pixel = pix_colors_focused [Color_border]; 1468 attributes.border_pixel = pix_colors_focused [Color_border];
947 attributes.colormap = cmap; 1469 attributes.colormap = cmap;
948 1470
949 top = XCreateWindow (dpy, parent, 1471 top = XCreateWindow (dpy, parent,
… …
952 ext_bwidth, 1474 ext_bwidth,
953 depth, InputOutput, visual, 1475 depth, InputOutput, visual,
954 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1476 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
955 &attributes); 1477 &attributes);
956 1478
957 this->parent[0] = top; 1479 this->parent = top;
958 1480
959 old_width = szHint.width; 1481 set_title (rs [Rs_title]);
960 old_height = szHint.height; 1482 set_icon_name (rs [Rs_iconName]);
961
962 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
963 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
964 1483
965 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
966 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
967 1486
968 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1487 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
970 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
971 wmHint.window_group = top; 1490 wmHint.window_group = top;
972 1491
973 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
974 &szHint, &wmHint, &classHint); 1493 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH
1495 /*
1496 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon
1498 */
1499
1500 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif
975 1505
976#if ENABLE_FRILLS 1506#if ENABLE_FRILLS
977 if (mwmhints.flags) 1507 if (mwmhints.flags)
978 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
979 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1509 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
984#if ENABLE_EWMH 1514#if ENABLE_EWMH
985 xa[XA_NET_WM_PING], 1515 xa[XA_NET_WM_PING],
986#endif 1516#endif
987 }; 1517 };
988 1518
989 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1519 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
990 1520
991#if ENABLE_FRILLS 1521#if ENABLE_FRILLS
992 if (rs[Rs_transient_for]) 1522 if (rs[Rs_transient_for])
993 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1523 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
994#endif 1524#endif
… …
1013 1543
1014 termwin_ev.start (display, top); 1544 termwin_ev.start (display, top);
1015 1545
1016 /* vt cursor: Black-on-White is standard, but this is more popular */ 1546 /* vt cursor: Black-on-White is standard, but this is more popular */
1017 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1018
1019#ifdef HAVE_SCROLLBARS
1020 /* cursor scrollBar: Black-on-White */
1021 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1022#endif
1023 1548
1024 /* the vt window */ 1549 /* the vt window */
1025 vt = XCreateSimpleWindow (dpy, top, 1550 vt = XCreateSimpleWindow (dpy, top,
1026 window_vt_x, window_vt_y, 1551 window_vt_x, window_vt_y,
1027 width, height, 1552 width, height,
… …
1041 1566
1042 vt_select_input (); 1567 vt_select_input ();
1043 1568
1044 vt_ev.start (display, vt); 1569 vt_ev.start (display, vt);
1045 1570
1046#ifdef XPM_BACKGROUND
1047 if (rs[Rs_backgroundPixmap] != NULL)
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 bgPixmap.handle_geometry (p);
1055 }
1056 else
1057 bgPixmap.set_defaultGeometry ();
1058
1059 set_bgPixmap (rs[Rs_backgroundPixmap]);
1060 scr_touch (true);
1061 }
1062#endif
1063
1064 /* graphics context for the vt window */ 1571 /* graphics context for the vt window */
1065 gcvalue.foreground = pix_colors[Color_fg]; 1572 gcvalue.foreground = pix_colors[Color_fg];
1066 gcvalue.background = pix_colors[Color_bg]; 1573 gcvalue.background = pix_colors[Color_bg];
1067 gcvalue.graphics_exposures = 0; 1574 gcvalue.graphics_exposures = 0;
1068 1575
… …
1070 GCForeground | GCBackground | GCGraphicsExposures, 1577 GCForeground | GCBackground | GCGraphicsExposures,
1071 &gcvalue); 1578 &gcvalue);
1072 1579
1073 drawable = new rxvt_drawable (this, vt); 1580 drawable = new rxvt_drawable (this, vt);
1074 1581
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 1582#ifdef OFF_FOCUS_FADING
1085 // initially we are in unfocused state 1583 // initially we are in unfocused state
1086 if (rs[Rs_fade]) 1584 if (rs[Rs_fade])
1087 pix_colors = pix_colors_unfocused; 1585 pix_colors = pix_colors_unfocused;
1088#endif 1586#endif
1089 1587
1090 pointer_unblank (); 1588 pointer_unblank ();
1091 scr_recolour (); 1589 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} 1590}
1257 1591
1258/*----------------------------------------------------------------------*/ 1592/*----------------------------------------------------------------------*/
1259/* 1593/*
1260 * Run the command in a subprocess and return a file descriptor for the 1594 * Run the command in a subprocess and return a file descriptor for the
… …
1272 if (pty->pty >= 0) 1606 if (pty->pty >= 0)
1273 { 1607 {
1274 if (getfd_hook) 1608 if (getfd_hook)
1275 pty->pty = (*getfd_hook) (pty->pty); 1609 pty->pty = (*getfd_hook) (pty->pty);
1276 1610
1277 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1611 if (pty->pty < 0)
1278 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1279 } 1613 }
1280 } 1614 }
1281 else 1615 else
1282#endif 1616#endif
1283 if (!pty->get ()) 1617 if (!pty->get ())
1284 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1285 1619
1286 int er; 1620 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1621
1622 struct termios tio = def_tio;
1287 1623
1288#ifndef NO_BACKSPACE_KEY 1624#ifndef NO_BACKSPACE_KEY
1289 if (key_backspace[0] && !key_backspace[1]) 1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1290 er = key_backspace[0]; 1626 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1291 else if (strcmp (key_backspace, "DEC") == 0) 1627 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1292 er = '\177'; /* the initial state anyway */ 1628 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1293 else
1294#endif 1629#endif
1295 er = -1;
1296 1630
1297 rxvt_get_ttymode (&tio, er); 1631 /* init terminal attributes */
1298 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1632 cfsetospeed (&tio, BAUDRATE);
1633 cfsetispeed (&tio, BAUDRATE);
1634 tcsetattr (pty->tty, TCSANOW, &tio);
1299 pty->set_utf8_mode (enc_utf8); 1635 pty->set_utf8_mode (enc_utf8);
1300 1636
1301 /* set initial window size */ 1637 /* set initial window size */
1302 tt_winch (); 1638 tt_winch ();
1303 1639
… …
1339 1675
1340 _exit (EXIT_FAILURE); 1676 _exit (EXIT_FAILURE);
1341 1677
1342 default: 1678 default:
1343 if (!option (Opt_utmpInhibit)) 1679 if (!option (Opt_utmpInhibit))
1680 {
1681#ifdef LOG_ONLY_ON_LOGIN
1682 bool login_shell = option (Opt_loginShell);
1683#else
1684 bool login_shell = true;
1685#endif
1344 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1686 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1687 }
1345 1688
1346 pty->close_tty (); 1689 pty->close_tty ();
1347 1690
1348 child_ev.start (cmd_pid); 1691 child_ev.start (cmd_pid);
1349 1692
… …
1363rxvt_term::run_child (const char *const *argv) 1706rxvt_term::run_child (const char *const *argv)
1364{ 1707{
1365 char *login; 1708 char *login;
1366 1709
1367 if (option (Opt_console)) 1710 if (option (Opt_console))
1711 {
1368 { /* be virtual console, fail silently */ 1712 /* be virtual console, fail silently */
1369#ifdef TIOCCONS 1713#ifdef TIOCCONS
1370 unsigned int on = 1; 1714 unsigned int on = 1;
1371 1715
1372 ioctl (STDIN_FILENO, TIOCCONS, &on); 1716 ioctl (STDIN_FILENO, TIOCCONS, &on);
1373#elif defined (SRIOCSREDIR) 1717#elif defined (SRIOCSREDIR)
1374 int fd; 1718 int fd;
1375 1719
1376 fd = open (CONSOLE, O_WRONLY, 0); 1720 fd = open (CONSOLE, O_WRONLY, 0);
1377 if (fd >= 0) 1721 if (fd >= 0)
1378 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1722 {
1723 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1379 close (fd); 1724 close (fd);
1380#endif /* SRIOCSREDIR */ 1725 }
1726#endif /* SRIOCSREDIR */
1381 } 1727 }
1382 1728
1383 /* reset signals and spin off the command interpreter */ 1729 /* reset signals and spin off the command interpreter */
1384 signal (SIGINT, SIG_DFL); 1730 signal (SIGINT, SIG_DFL);
1385 signal (SIGQUIT, SIG_DFL); 1731 signal (SIGQUIT, SIG_DFL);
1386 signal (SIGCHLD, SIG_DFL); 1732 signal (SIGCHLD, SIG_DFL);
1387 signal (SIGHUP, SIG_DFL); 1733 signal (SIGHUP, SIG_DFL);
1388 signal (SIGPIPE, SIG_DFL); 1734 signal (SIGPIPE, SIG_DFL);
1389 /* 1735 /*
1390 * mimick login's behavior by disabling the job control signals 1736 * mimic login's behavior by disabling the job control signals
1391 * a shell that wants them can turn them back on 1737 * a shell that wants them can turn them back on
1392 */ 1738 */
1393#ifdef SIGTSTP 1739#ifdef SIGTSTP
1394 signal (SIGTSTP, SIG_IGN); 1740 signal (SIGTSTP, SIG_IGN);
1395 signal (SIGTTIN, SIG_IGN); 1741 signal (SIGTTIN, SIG_IGN);
1396 signal (SIGTTOU, SIG_IGN); 1742 signal (SIGTTOU, SIG_IGN);
1397#endif /* SIGTSTP */ 1743#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 1744
1404 /* command interpreter path */ 1745 /* command interpreter path */
1405 if (argv != NULL) 1746 if (argv)
1406 { 1747 {
1407# ifdef DEBUG_CMD 1748# ifdef DEBUG_CMD
1408 int i; 1749 int i;
1409 1750
1410 for (i = 0; argv[i]; i++) 1751 for (i = 0; argv[i]; i++)
… …
1419 const char *argv0, *shell; 1760 const char *argv0, *shell;
1420 1761
1421 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1762 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1422 shell = "/bin/sh"; 1763 shell = "/bin/sh";
1423 1764
1424 argv0 = (const char *)rxvt_r_basename (shell); 1765 argv0 = rxvt_basename (shell);
1425 1766
1426 if (option (Opt_loginShell)) 1767 if (option (Opt_loginShell))
1427 { 1768 {
1428 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1769 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1429 1770
1430 login[0] = '-'; 1771 login[0] = '-';
1431 strcpy (&login[1], argv0); 1772 strcpy (&login[1], argv0);
1432 argv0 = login; 1773 argv0 = login;
1433 } 1774 }
1434 1775
1435 execlp (shell, argv0, NULL); 1776 execlp (shell, argv0, (char *)0);
1436 /* no error message: STDERR is closed! */ 1777 /* no error message: STDERR is closed! */
1437 } 1778 }
1438 1779
1439 return -1; 1780 return -1;
1440} 1781}

Diff Legend

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