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.208 by ayin, Mon Sep 3 08:48:00 2007 UTC vs.
Revision 1.275 by sf-exg, Sat Aug 28 11:03:30 2010 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 <pcg@goof.com>
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>
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 DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
… …
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
179#if !USE_256_COLORS
74 // 88 xterm colours 180 // 88 xterm colours
75 "rgb:00/00/00", 181 "rgb:00/00/00",
76 "rgb:00/00/8b", 182 "rgb:00/00/8b",
77 "rgb:00/00/cd", 183 "rgb:00/00/cd",
78 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
147 496
148#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 503 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 510#if ENABLE_FRILLS
162 NULL, // Color_underline 511 NULL, // Color_underline
163#endif 512#endif
164#ifdef OPTION_HC 513#ifdef OPTION_HC
165 NULL, 514 NULL,
515 NULL,
166#endif 516#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 520#endif
171#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
172 NULL, 522 NULL,
173#endif 523#endif
174#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 525 "rgb:00/00/00",
176#endif 526#endif
177 }; 527 };
178 528
179bool 529void
180rxvt_term::init_vars () 530rxvt_term::init_vars ()
181{ 531{
182 pix_colors = // 532 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 533
189 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
191 want_refresh = 1; 536 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 538 ncol = 80;
194 nrow = 24; 539 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 544 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 545
201 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
202 547
203 oldcursor.row = oldcursor.col = -1; 548 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 last_bot = last_state = -1;
217 549
218 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
226 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
227 560 set_option (Opt_buffered);
228 return true;
229}
230
231void
232rxvt_term::init_secondary ()
233{
234 int i;
235
236 /*
237 * Close all unused file descriptors
238 * We don't want them, we don't need them.
239 */
240 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 {
242 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO);
244 }
245 else if (i > STDIN_FILENO)
246 {
247 dup2 (i, STDIN_FILENO);
248 close (i);
249 }
250
251 dup2 (STDERR_FILENO, STDOUT_FILENO);
252
253#if 0 // schmorp sayz closing filies is murder
254 for (i = STDERR_FILENO + 1; i < num_fds; i++)
255 {
256#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
257 if (i == 4 || i == 7)
258 continue;
259#endif
260 close (i);
261 }
262#endif
263} 561}
264 562
265/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
266const char ** 564const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
268{ 566{
269 int i, r_argc; 567 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
272 569
273 /* 570 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 571 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 572 */
276 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
278 break; 575 break;
279 576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281 592
282 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
284 595
285 r_argv[i] = NULL; 596 r_argv[i] = NULL;
286 597
287 if (r_argc == argc)
288 cmd_argv = NULL;
289 else
290 {
291 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
292
293 for (i = 0; i < argc - r_argc - 1; i++)
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296 cmd_argv[i] = NULL;
297 }
298
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
300 599
301 /* 600 /*
302 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
303 */ 602 */
304 603
… …
306 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
307 606
308 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
309 608
310 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
312 614
313 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
314 xa = display->xa; 616 xa = display->xa;
315 617
316 set (display); 618 set (display);
… …
319#if XFT 621#if XFT
320 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif 624#endif
323 625
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
327 free (r_argv); 626 free (r_argv);
328 627
329 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
331 rs [i] = 0; 630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
332 636
333#if ENABLE_PERL 637#if ENABLE_PERL
334 if (!rs[Rs_perl_ext_1]) 638 if (!rs[Rs_perl_ext_1])
335 rs[Rs_perl_ext_1] = "default"; 639 rs[Rs_perl_ext_1] = "default";
336 640
… …
347 * set any defaults not already set 651 * set any defaults not already set
348 */ 652 */
349 if (cmd_argv && cmd_argv[0]) 653 if (cmd_argv && cmd_argv[0])
350 { 654 {
351 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
352 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 656 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
657
353 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_title]; 659 rs[Rs_iconName] = rs[Rs_title];
355 } 660 }
356 else 661 else
357 { 662 {
358 if (!rs[Rs_title]) 663 if (!rs[Rs_title])
359 rs[Rs_title] = rs[Rs_name]; 664 rs[Rs_title] = rs[Rs_name];
665
360 if (!rs[Rs_iconName]) 666 if (!rs[Rs_iconName])
361 rs[Rs_iconName] = rs[Rs_name]; 667 rs[Rs_iconName] = rs[Rs_name];
362 } 668 }
363 669
364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 670 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
371 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 677 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
372 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 678 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
373 679
374 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 680 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
375 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 681 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
682
683 if (rs[Rs_letterSpace])
684 letterSpace = atoi (rs[Rs_letterSpace]);
376#endif 685#endif
377 686
378#ifdef POINTER_BLANK 687#ifdef POINTER_BLANK
379 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
380 pointerBlankDelay = i; 689 pointerBlankDelay = i;
… …
384 693
385 /* no point having a scrollbar without having any scrollback! */ 694 /* no point having a scrollbar without having any scrollback! */
386 if (!saveLines) 695 if (!saveLines)
387 set_option (Opt_scrollBar, 0); 696 set_option (Opt_scrollBar, 0);
388 697
389#ifdef PRINTPIPE
390 if (!rs[Rs_print_pipe])
391 rs[Rs_print_pipe] = PRINTPIPE;
392#endif
393
394 if (!rs[Rs_cutchars]) 698 if (!rs[Rs_cutchars])
395 rs[Rs_cutchars] = CUTCHARS; 699 rs[Rs_cutchars] = CUTCHARS;
396 700
397#ifndef NO_BACKSPACE_KEY 701#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 702 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 703# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 704 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 705# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 706 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 707# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 rxvt_Str_trim (val);
408 rxvt_Str_escaped (val);
409 key_backspace = val;
410 }
411#endif 708#endif
412 709
413#ifndef NO_DELETE_KEY 710#ifndef NO_DELETE_KEY
414 if (!rs[Rs_delete_key]) 711 if (!rs[Rs_delete_key])
415# ifdef DEFAULT_DELETE 712# ifdef DEFAULT_DELETE
416 key_delete = DEFAULT_DELETE; 713 rs[Rs_delete_key] = DEFAULT_DELETE;
417# else 714# else
418 key_delete = "\033[3~"; 715 rs[Rs_delete_key] = "\033[3~";
419# endif 716# endif
420 else
421 {
422 val = strdup (rs[Rs_delete_key]);
423 rxvt_Str_trim (val);
424 rxvt_Str_escaped (val);
425 key_delete = val;
426 }
427#endif 717#endif
428 if (rs[Rs_answerbackstring])
429 {
430 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
431 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
432 }
433 718
434#ifdef HAVE_SCROLLBARS 719 scrollBar.setup (this);
435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
436#endif
437 720
438#ifdef XTERM_REVERSE_VIDEO 721#ifdef XTERM_REVERSE_VIDEO
439 /* this is how xterm implements reverseVideo */ 722 /* this is how xterm implements reverseVideo */
440 if (option (Opt_reverseVideo)) 723 if (option (Opt_reverseVideo))
441 { 724 {
… …
461 color_aliases (Color_fg); 744 color_aliases (Color_fg);
462 color_aliases (Color_bg); 745 color_aliases (Color_bg);
463#ifndef NO_CURSORCOLOR 746#ifndef NO_CURSORCOLOR
464 color_aliases (Color_cursor); 747 color_aliases (Color_cursor);
465 color_aliases (Color_cursor2); 748 color_aliases (Color_cursor2);
466#endif /* NO_CURSORCOLOR */ 749#endif /* NO_CURSORCOLOR */
467 color_aliases (Color_pointer_fg); 750 color_aliases (Color_pointer_fg);
468 color_aliases (Color_pointer_bg); 751 color_aliases (Color_pointer_bg);
469 color_aliases (Color_border); 752 color_aliases (Color_border);
470#ifndef NO_BOLD_UNDERLINE_REVERSE 753#ifndef NO_BOLD_UNDERLINE_REVERSE
471 color_aliases (Color_BD); 754 color_aliases (Color_BD);
472 color_aliases (Color_UL); 755 color_aliases (Color_UL);
473 color_aliases (Color_RV); 756 color_aliases (Color_RV);
474#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 757#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
475 758
476 if (!rs[Rs_color + Color_border]) 759 if (!rs[Rs_color + Color_border])
477 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 760 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
478 761
479 return cmd_argv; 762 return cmd_argv;
763}
764
765/*----------------------------------------------------------------------*/
766void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
768{
769 this->envv = envv;
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 = STATE_IDLE; /* set existence for size calculations */
795
796 pty = ptytty::create ();
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bgPixmap.set_target (this);
813 bgPixmap.invalidate ();
814
815#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent))
817 {
818 bgPixmap.set_transparent ();
819
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823#endif
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856
857#if ENABLE_PERL
858 rootwin_ev.start (display, display->root);
859#endif
860
861 set_colorfgbg ();
862
863 init_command (cmd_argv);
864
865 free (cmd_argv);
866
867 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ);
869
870 HOOK_INVOKE ((this, HOOK_START, DT_END));
871
872#if ENABLE_XEMBED
873 if (rs[Rs_embed])
874 {
875 long info[2] = { 0, XEMBED_MAPPED };
876
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2);
879 }
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]);
884
885 refresh_check ();
480} 886}
481 887
482/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
483void 889void
484rxvt_term::init_env () 890rxvt_term::init_env ()
… …
499 */ 905 */
500 val = rxvt_network_display (rs[Rs_display_name]); 906 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 907 rs[Rs_display_name] = (const char *)val;
502 908
503 if (val == NULL) 909 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 910#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (dpy); 911 val = XDisplayString (dpy);
506 912
507 if (rs[Rs_display_name] == NULL) 913 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 914 rs[Rs_display_name] = val; /* use broken `:0' value */
509 915
… …
549#ifdef HAVE_UNSETENV 955#ifdef HAVE_UNSETENV
550 /* avoid passing old settings and confusing term size */ 956 /* avoid passing old settings and confusing term size */
551 unsetenv ("LINES"); 957 unsetenv ("LINES");
552 unsetenv ("COLUMNS"); 958 unsetenv ("COLUMNS");
553 unsetenv ("TERMCAP"); /* terminfo should be okay */ 959 unsetenv ("TERMCAP"); /* terminfo should be okay */
554#endif /* HAVE_UNSETENV */ 960#endif /* HAVE_UNSETENV */
555} 961}
556 962
557/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
558/* 964/*
559 * This is more or less stolen straight from XFree86 xterm. 965 * This is more or less stolen straight from XFree86 xterm.
… …
580 986
581 this->locale = "C"; 987 this->locale = "C";
582 } 988 }
583 989
584 990
585 this->locale = rxvt_strdup (this->locale); 991 this->locale = strdup (this->locale);
586 SET_LOCALE (this->locale); 992 SET_LOCALE (this->locale);
587 mbstate.reset (); 993 mbstate.reset ();
588#endif 994#endif
589 995
590#if HAVE_NL_LANGINFO 996#if HAVE_NL_LANGINFO
… …
647 priv_modes |= PrivMode_Keypress; 1053 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 1054 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 1055 priv_modes |= PrivMode_smoothScroll;
650 1056
651#ifndef NO_BACKSPACE_KEY 1057#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 1058 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 1059 priv_modes |= PrivMode_HaveBackSpace;
654#endif 1060#endif
655 1061
656 /* add value for scrollBar */ 1062 /* add value for scrollBar */
657 if (scrollBar.state) 1063 if (scrollBar.state)
… …
663 run_command (argv); 1069 run_command (argv);
664} 1070}
665 1071
666/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
667void 1073void
668rxvt_term::Get_Colours () 1074rxvt_term::get_colours ()
669{ 1075{
670 int i; 1076 int i;
671 1077
672#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
673 pix_colors = pix_colors_focused; 1079 pix_colors = pix_colors_focused;
674#endif 1080#endif
675 1081
676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
677 { 1083 {
678 const char *name = rs[Rs_color + i]; 1084 const char *name = rs[Rs_color + i];
679 1085
680 if (!name) 1086 if (!name)
… …
733 * get scrollBar shadow colors 1139 * get scrollBar shadow colors
734 * 1140 *
735 * The calculations of topShadow/bottomShadow values are adapted 1141 * The calculations of topShadow/bottomShadow values are adapted
736 * from the fvwm window manager. 1142 * from the fvwm window manager.
737 */ 1143 */
738#ifdef KEEP_SCROLLCOLOR 1144#ifdef RXVT_SCROLLBAR
739 if (depth <= 2) 1145 if (depth <= 2)
740 { 1146 {
741 /* Monochrome */ 1147 /* Monochrome */
742 alias_color (Color_scroll, Color_fg); 1148 alias_color (Color_scroll, Color_fg);
743 alias_color (Color_topShadow, Color_bg); 1149 alias_color (Color_topShadow, Color_bg);
… …
758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
759 cscroll.a) 1165 cscroll.a)
760 )) 1166 ))
761 alias_color (Color_topShadow, Color_White); 1167 alias_color (Color_topShadow, Color_White);
762 } 1168 }
763#endif /* KEEP_SCROLLCOLOR */ 1169#endif
764 1170
765#ifdef OFF_FOCUS_FADING 1171#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i); 1173 update_fade_color (i);
768#endif 1174#endif
… …
776 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
777 { 1183 {
778 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
779 1185
780 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
781 { /* bright colors */ 1187 /* bright colors */
782 i -= 8;
783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1188 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784 return; 1189 else if (i >= 0 && i <= 7)
785 } 1190 /* normal colors */
786
787 if (i >= 0 && i <= 7) /* normal colors */
788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1191 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789 } 1192 }
790} 1193}
791 1194
792/*----------------------------------------------------------------------*/ 1195/*----------------------------------------------------------------------*/
… …
893 Window top, parent; 1296 Window top, parent;
894 1297
895 dLocal (Display *, dpy); 1298 dLocal (Display *, dpy);
896 1299
897 /* grab colors before netscape does */ 1300 /* grab colors before netscape does */
898 Get_Colours (); 1301 get_colours ();
899 1302
900 if (!set_fonts ()) 1303 if (!set_fonts ())
901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1304 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
902 1305
903 parent = display->root; 1306 parent = display->root;
… …
951 this->parent[0] = top; 1354 this->parent[0] = top;
952 1355
953 old_width = szHint.width; 1356 old_width = szHint.width;
954 old_height = szHint.height; 1357 old_height = szHint.height;
955 1358
956 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1359 set_title (rs [Rs_title]);
957 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1360 set_icon_name (rs [Rs_iconName]);
958 1361
959 classHint.res_name = (char *)rs[Rs_name]; 1362 classHint.res_name = (char *)rs[Rs_name];
960 classHint.res_class = (char *)RESCLASS; 1363 classHint.res_class = (char *)RESCLASS;
961 1364
962 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1365 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
964 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1367 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
965 wmHint.window_group = top; 1368 wmHint.window_group = top;
966 1369
967 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1370 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
968 &szHint, &wmHint, &classHint); 1371 &szHint, &wmHint, &classHint);
1372#if ENABLE_EWMH
1373# ifdef HAVE_AFTERIMAGE
1374 /*
1375 * set up icon hint
1376 * rs [Rs_iconfile] is path to icon
1377 */
1378
1379 if (rs [Rs_iconfile])
1380 {
1381 init_asv ();
1382
1383 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1384 if (asv && im)
1385 {
1386 int w = im->width;
1387 int h = im->height;
1388 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1389 ASImage *result = scale_asimage (asv, im,
1390 w, h, ASA_ARGB32,
1391 100, ASIMAGE_QUALITY_DEFAULT);
1392 destroy_asimage (&im);
1393
1394 if (buffer && result)
1395 {
1396 ARGB32 *asbuf = result->alt.argb32;
1397 buffer [0] = w;
1398 buffer [1] = h;
1399
1400 for (unsigned int i = 0; i < w * h; ++i)
1401 buffer [i + 2] = asbuf [i];
1402
1403 destroy_asimage (&result);
1404 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1405 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1406 free (buffer);
1407 }
1408 else
1409 {
1410 if (!buffer)
1411 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1412
1413 if (!result)
1414 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1415 }
1416 }
1417 else
1418 rxvt_warn ("Loading image icon failed, continuing without.\n");
1419 }
1420# endif
1421#endif
969 1422
970#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
971 if (mwmhints.flags) 1424 if (mwmhints.flags)
972 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
973 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1426 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1007 1460
1008 termwin_ev.start (display, top); 1461 termwin_ev.start (display, top);
1009 1462
1010 /* vt cursor: Black-on-White is standard, but this is more popular */ 1463 /* vt cursor: Black-on-White is standard, but this is more popular */
1011 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1012
1013#ifdef HAVE_SCROLLBARS
1014 /* cursor scrollBar: Black-on-White */
1015 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1016#endif
1017 1465
1018 /* the vt window */ 1466 /* the vt window */
1019 vt = XCreateSimpleWindow (dpy, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1020 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1021 width, height, 1469 width, height,
… …
1046 GCForeground | GCBackground | GCGraphicsExposures, 1494 GCForeground | GCBackground | GCGraphicsExposures,
1047 &gcvalue); 1495 &gcvalue);
1048 1496
1049 drawable = new rxvt_drawable (this, vt); 1497 drawable = new rxvt_drawable (this, vt);
1050 1498
1051#ifdef RXVT_SCROLLBAR
1052 gcvalue.foreground = pix_colors[Color_topShadow];
1053 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1054 gcvalue.foreground = pix_colors[Color_bottomShadow];
1055 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1056 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1057 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1058#endif
1059
1060#ifdef OFF_FOCUS_FADING 1499#ifdef OFF_FOCUS_FADING
1061 // initially we are in unfocused state 1500 // initially we are in unfocused state
1062 if (rs[Rs_fade]) 1501 if (rs[Rs_fade])
1063 pix_colors = pix_colors_unfocused; 1502 pix_colors = pix_colors_unfocused;
1064#endif 1503#endif
1065 1504
1066 pointer_unblank (); 1505 pointer_unblank ();
1067 scr_recolour (); 1506 scr_recolour ();
1068}
1069
1070/* ------------------------------------------------------------------------- *
1071 * GET TTY CURRENT STATE *
1072 * ------------------------------------------------------------------------- */
1073void
1074rxvt_get_ttymode (ttymode_t *tio, int erase)
1075{
1076 /*
1077 * standard System V termios interface
1078 */
1079 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1080 {
1081 // return error - use system defaults,
1082 // where possible, and zero elsewhere
1083 memset (tio, 0, sizeof (ttymode_t));
1084
1085 tio->c_cc[VINTR] = CINTR;
1086 tio->c_cc[VQUIT] = CQUIT;
1087 tio->c_cc[VERASE] = CERASE;
1088#ifdef VERASE2
1089 tio->c_cc[VERASE2] = CERASE2;
1090#endif
1091 tio->c_cc[VKILL] = CKILL;
1092 tio->c_cc[VSTART] = CSTART;
1093 tio->c_cc[VSTOP] = CSTOP;
1094 tio->c_cc[VSUSP] = CSUSP;
1095# ifdef VDSUSP
1096 tio->c_cc[VDSUSP] = CDSUSP;
1097# endif
1098# ifdef VREPRINT
1099 tio->c_cc[VREPRINT] = CRPRNT;
1100# endif
1101# ifdef VDISCRD
1102 tio->c_cc[VDISCRD] = CFLUSH;
1103# endif
1104# ifdef VWERSE
1105 tio->c_cc[VWERSE] = CWERASE;
1106# endif
1107# ifdef VLNEXT
1108 tio->c_cc[VLNEXT] = CLNEXT;
1109# endif
1110 }
1111
1112 tio->c_cc[VEOF] = CEOF;
1113 tio->c_cc[VEOL] = VDISABLE;
1114# ifdef VEOL2
1115 tio->c_cc[VEOL2] = VDISABLE;
1116# endif
1117# ifdef VSWTC
1118 tio->c_cc[VSWTC] = VDISABLE;
1119# endif
1120# ifdef VSWTCH
1121 tio->c_cc[VSWTCH] = VDISABLE;
1122# endif
1123# if VMIN != VEOF
1124 tio->c_cc[VMIN] = 1;
1125# endif
1126# if VTIME != VEOL
1127 tio->c_cc[VTIME] = 0;
1128# endif
1129
1130 if (erase != -1)
1131 tio->c_cc[VERASE] = (char)erase;
1132
1133 /* input modes */
1134 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1135# ifdef IMAXBEL
1136 | IMAXBEL
1137# endif
1138 | IXON);
1139
1140 /* output modes */
1141 tio->c_oflag = (OPOST | ONLCR);
1142
1143 /* control modes */
1144 tio->c_cflag = (CS8 | CREAD);
1145
1146 /* line discipline modes */
1147 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1148# if defined (ECHOCTL) && defined (ECHOKE)
1149 | ECHOCTL | ECHOKE
1150# endif
1151 | ECHOE | ECHOK);
1152
1153 /*
1154 * Debugging
1155 */
1156#ifdef DEBUG_TTYMODE
1157#ifdef HAVE_TERMIOS_H
1158 /* c_iflag bits */
1159 fprintf (stderr, "Input flags\n");
1160
1161 /* cpp token stringize doesn't work on all machines <sigh> */
1162# define FOO(flag,name) \
1163 if ((tio->c_iflag) & flag) \
1164 fprintf (stderr, "%s ", name)
1165
1166 /* c_iflag bits */
1167 FOO (IGNBRK, "IGNBRK");
1168 FOO (BRKINT, "BRKINT");
1169 FOO (IGNPAR, "IGNPAR");
1170 FOO (PARMRK, "PARMRK");
1171 FOO (INPCK, "INPCK");
1172 FOO (ISTRIP, "ISTRIP");
1173 FOO (INLCR, "INLCR");
1174 FOO (IGNCR, "IGNCR");
1175 FOO (ICRNL, "ICRNL");
1176 FOO (IXON, "IXON");
1177 FOO (IXOFF, "IXOFF");
1178# ifdef IUCLC
1179 FOO (IUCLC, "IUCLC");
1180# endif
1181# ifdef IXANY
1182 FOO (IXANY, "IXANY");
1183# endif
1184# ifdef IMAXBEL
1185 FOO (IMAXBEL, "IMAXBEL");
1186# endif
1187
1188 fprintf (stderr, "\n");
1189
1190# undef FOO
1191# define FOO(entry, name) \
1192 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1193
1194 FOO (VINTR, "VINTR");
1195 FOO (VQUIT, "VQUIT");
1196 FOO (VERASE, "VERASE");
1197 FOO (VKILL, "VKILL");
1198 FOO (VEOF, "VEOF");
1199 FOO (VEOL, "VEOL");
1200# ifdef VEOL2
1201 FOO (VEOL2, "VEOL2");
1202# endif
1203# ifdef VSWTC
1204 FOO (VSWTC, "VSWTC");
1205# endif
1206# ifdef VSWTCH
1207 FOO (VSWTCH, "VSWTCH");
1208# endif
1209 FOO (VSTART, "VSTART");
1210 FOO (VSTOP, "VSTOP");
1211 FOO (VSUSP, "VSUSP");
1212# ifdef VDSUSP
1213 FOO (VDSUSP, "VDSUSP");
1214# endif
1215# ifdef VREPRINT
1216 FOO (VREPRINT, "VREPRINT");
1217# endif
1218# ifdef VDISCRD
1219 FOO (VDISCRD, "VDISCRD");
1220# endif
1221# ifdef VWERSE
1222 FOO (VWERSE, "VWERSE");
1223# endif
1224# ifdef VLNEXT
1225 FOO (VLNEXT, "VLNEXT");
1226# endif
1227
1228 fprintf (stderr, "\n");
1229# undef FOO
1230# endif /* HAVE_TERMIOS_H */
1231#endif /* DEBUG_TTYMODE */
1232} 1507}
1233 1508
1234/*----------------------------------------------------------------------*/ 1509/*----------------------------------------------------------------------*/
1235/* 1510/*
1236 * Run the command in a subprocess and return a file descriptor for the 1511 * Run the command in a subprocess and return a file descriptor for the
… …
1257 else 1532 else
1258#endif 1533#endif
1259 if (!pty->get ()) 1534 if (!pty->get ())
1260 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1261 1536
1262 int er; 1537 struct termios tio = def_tio;
1263 1538
1264#ifndef NO_BACKSPACE_KEY 1539#ifndef NO_BACKSPACE_KEY
1265 if (key_backspace[0] && !key_backspace[1]) 1540 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1266 er = key_backspace[0]; 1541 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1267 else if (strcmp (key_backspace, "DEC") == 0) 1542 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1268 er = '\177'; /* the initial state anyway */ 1543 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1269 else
1270#endif 1544#endif
1271 er = -1;
1272 1545
1273 rxvt_get_ttymode (&tio, er); 1546 /* init terminal attributes */
1274 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1547 cfsetospeed (&tio, BAUDRATE);
1548 cfsetispeed (&tio, BAUDRATE);
1549 tcsetattr (pty->tty, TCSANOW, &tio);
1275 pty->set_utf8_mode (enc_utf8); 1550 pty->set_utf8_mode (enc_utf8);
1276 1551
1277 /* set initial window size */ 1552 /* set initial window size */
1278 tt_winch (); 1553 tt_winch ();
1279 1554
… …
1339rxvt_term::run_child (const char *const *argv) 1614rxvt_term::run_child (const char *const *argv)
1340{ 1615{
1341 char *login; 1616 char *login;
1342 1617
1343 if (option (Opt_console)) 1618 if (option (Opt_console))
1619 {
1344 { /* be virtual console, fail silently */ 1620 /* be virtual console, fail silently */
1345#ifdef TIOCCONS 1621#ifdef TIOCCONS
1346 unsigned int on = 1; 1622 unsigned int on = 1;
1347 1623
1348 ioctl (STDIN_FILENO, TIOCCONS, &on); 1624 ioctl (STDIN_FILENO, TIOCCONS, &on);
1349#elif defined (SRIOCSREDIR) 1625#elif defined (SRIOCSREDIR)
… …
1351 1627
1352 fd = open (CONSOLE, O_WRONLY, 0); 1628 fd = open (CONSOLE, O_WRONLY, 0);
1353 if (fd >= 0) 1629 if (fd >= 0)
1354 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1630 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1355 close (fd); 1631 close (fd);
1356#endif /* SRIOCSREDIR */ 1632#endif /* SRIOCSREDIR */
1357 } 1633 }
1358 1634
1359 /* reset signals and spin off the command interpreter */ 1635 /* reset signals and spin off the command interpreter */
1360 signal (SIGINT, SIG_DFL); 1636 signal (SIGINT, SIG_DFL);
1361 signal (SIGQUIT, SIG_DFL); 1637 signal (SIGQUIT, SIG_DFL);
1362 signal (SIGCHLD, SIG_DFL); 1638 signal (SIGCHLD, SIG_DFL);
1363 signal (SIGHUP, SIG_DFL); 1639 signal (SIGHUP, SIG_DFL);
1364 signal (SIGPIPE, SIG_DFL); 1640 signal (SIGPIPE, SIG_DFL);
1365 /* 1641 /*
1366 * mimick login's behavior by disabling the job control signals 1642 * mimic login's behavior by disabling the job control signals
1367 * a shell that wants them can turn them back on 1643 * a shell that wants them can turn them back on
1368 */ 1644 */
1369#ifdef SIGTSTP 1645#ifdef SIGTSTP
1370 signal (SIGTSTP, SIG_IGN); 1646 signal (SIGTSTP, SIG_IGN);
1371 signal (SIGTTIN, SIG_IGN); 1647 signal (SIGTTIN, SIG_IGN);
1372 signal (SIGTTOU, SIG_IGN); 1648 signal (SIGTTOU, SIG_IGN);
1373#endif /* SIGTSTP */ 1649#endif /* SIGTSTP */
1374
1375 // unblock signals (signals are blocked by iom.C
1376 sigset_t ss;
1377 sigemptyset (&ss);
1378 sigprocmask (SIG_SETMASK, &ss, 0);
1379 1650
1380 /* command interpreter path */ 1651 /* command interpreter path */
1381 if (argv != NULL) 1652 if (argv)
1382 { 1653 {
1383# ifdef DEBUG_CMD 1654# ifdef DEBUG_CMD
1384 int i; 1655 int i;
1385 1656
1386 for (i = 0; argv[i]; i++) 1657 for (i = 0; argv[i]; i++)
… …
1395 const char *argv0, *shell; 1666 const char *argv0, *shell;
1396 1667
1397 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1668 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1398 shell = "/bin/sh"; 1669 shell = "/bin/sh";
1399 1670
1400 argv0 = (const char *)rxvt_r_basename (shell); 1671 argv0 = rxvt_basename (shell);
1401 1672
1402 if (option (Opt_loginShell)) 1673 if (option (Opt_loginShell))
1403 { 1674 {
1404 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1675 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1405 1676
1406 login[0] = '-'; 1677 login[0] = '-';
1407 strcpy (&login[1], argv0); 1678 strcpy (&login[1], argv0);
1408 argv0 = login; 1679 argv0 = login;
1409 } 1680 }
1410 1681
1411 execlp (shell, argv0, NULL); 1682 execlp (shell, argv0, (char *)0);
1412 /* no error message: STDERR is closed! */ 1683 /* no error message: STDERR is closed! */
1413 } 1684 }
1414 1685
1415 return -1; 1686 return -1;
1416} 1687}

Diff Legend

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