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.212 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.263 by sf-exg, Thu Apr 1 00:12:33 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#ifndef 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,
166#endif 515#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 516 COLOR_SCROLLBAR,
517#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 518 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 519#endif
171#if ENABLE_TRANSPARENCY 520#if ENABLE_TRANSPARENCY
172 NULL, 521 NULL,
173#endif 522#endif
174#if OFF_FOCUS_FADING 523#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 524 "rgb:00/00/00",
176#endif 525#endif
177 }; 526 };
178 527
179bool 528void
180rxvt_term::init_vars () 529rxvt_term::init_vars ()
181{ 530{
182 pix_colors = // 531 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 532
189 MEvent.time = CurrentTime; 533 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 534 MEvent.button = AnyButton;
191 want_refresh = 1; 535 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 536 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 537 ncol = 80;
194 nrow = 24; 538 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 539 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 540 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 541 lineSpace = LINESPACE;
542 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 543 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 544
201 refresh_type = SLOW_REFRESH; 545 refresh_type = SLOW_REFRESH;
202 546
203 oldcursor.row = oldcursor.col = -1; 547 oldcursor.row = oldcursor.col = -1;
204 last_bot = last_state = -1;
205 548
206 set_option (Opt_scrollBar); 549 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput); 550 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll); 551 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll); 552 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen); 553 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll); 554 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs); 555 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles); 556 set_option (Opt_intensityStyles);
557 set_option (Opt_iso14755);
214 set_option (Opt_iso14755_52); 558 set_option (Opt_iso14755_52);
215 559 set_option (Opt_buffered);
216 return true;
217} 560}
218 561
219void 562static void
220rxvt_term::init_secondary () 563init_secondary ()
221{ 564{
222 int i; 565 int i;
223 566
224 /*
225 * Close all unused file descriptors
226 * We don't want them, we don't need them.
227 */
228 if ((i = open ("/dev/null", O_RDONLY)) < 0) 567 if ((i = open ("/dev/null", O_RDONLY)) < 0)
229 { 568 {
230 /* TODO: BOO HISS */
231 dup2 (STDERR_FILENO, STDIN_FILENO); 569 dup2 (STDERR_FILENO, STDIN_FILENO);
232 } 570 }
233 else if (i > STDIN_FILENO) 571 else if (i != STDIN_FILENO)
234 { 572 {
235 dup2 (i, STDIN_FILENO); 573 dup2 (i, STDIN_FILENO);
236 close (i); 574 close (i);
237 } 575 }
238 576
239 dup2 (STDERR_FILENO, STDOUT_FILENO); 577 dup2 (STDERR_FILENO, STDOUT_FILENO);
240
241#if 0 // schmorp sayz closing filies is murder
242 for (i = STDERR_FILENO + 1; i < num_fds; i++)
243 {
244#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
245 if (i == 4 || i == 7)
246 continue;
247#endif
248 close (i);
249 }
250#endif
251} 578}
252 579
253/*----------------------------------------------------------------------*/ 580/*----------------------------------------------------------------------*/
254const char ** 581const char **
255rxvt_term::init_resources (int argc, const char *const *argv) 582rxvt_term::init_resources (int argc, const char *const *argv)
… …
262 */ 589 */
263 for (r_argc = 0; r_argc < argc; r_argc++) 590 for (r_argc = 0; r_argc < argc; r_argc++)
264 if (!strcmp (argv[r_argc], "-e")) 591 if (!strcmp (argv[r_argc], "-e"))
265 break; 592 break;
266 593
594 if (r_argc == argc)
595 cmd_argv = NULL;
596 else if (!argv[r_argc + 1])
597 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
598 else
599 {
600 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
601
602 for (i = 0; i < argc - r_argc - 1; i++)
603 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
604
605 cmd_argv[i] = NULL;
606 }
607
267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 608 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
268 609
269 for (i = 0; i < r_argc; i++) 610 for (i = 0; i < r_argc; i++)
270 r_argv[i] = (const char *)argv[i]; 611 r_argv[i] = (const char *)argv[i];
271 612
272 r_argv[i] = NULL; 613 r_argv[i] = NULL;
273
274 if (r_argc == argc)
275 cmd_argv = NULL;
276 else
277 {
278 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
279
280 for (i = 0; i < argc - r_argc - 1; i++)
281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
282
283 cmd_argv[i] = NULL;
284 }
285 614
286 rs[Rs_name] = rxvt_basename (argv[0]); 615 rs[Rs_name] = rxvt_basename (argv[0]);
287 616
288 /* 617 /*
289 * Open display, get options/resources and create the window 618 * Open display, get options/resources and create the window
… …
293 rs[Rs_display_name] = ":0"; 622 rs[Rs_display_name] = ":0";
294 623
295 get_options (r_argc, r_argv); 624 get_options (r_argc, r_argv);
296 625
297 if (!(display = displays.get (rs[Rs_display_name]))) 626 if (!(display = displays.get (rs[Rs_display_name])))
627 {
628 free (r_argv);
298 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 629 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
630 }
299 631
300 // using a local pointer decreases code size a lot 632 // using a local pointer decreases code size a lot
301 xa = display->xa; 633 xa = display->xa;
302 634
303 set (display); 635 set (display);
… …
306#if XFT 638#if XFT
307 if (rs[Rs_depth]) 639 if (rs[Rs_depth])
308 select_visual (strtol (rs[Rs_depth], 0, 0)); 640 select_visual (strtol (rs[Rs_depth], 0, 0));
309#endif 641#endif
310 642
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
314 free (r_argv); 643 free (r_argv);
315 644
316 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
318 rs [i] = 0; 647 rs [i] = 0;
648
649#ifdef HAVE_AFTERIMAGE
650 set_application_name ((char *)rs[Rs_name]);
651 set_output_threshold (OUTPUT_LEVEL_WARNING);
652#endif
319 653
320#if ENABLE_PERL 654#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1]) 655 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default"; 656 rs[Rs_perl_ext_1] = "default";
323 657
… …
335 */ 669 */
336 if (cmd_argv && cmd_argv[0]) 670 if (cmd_argv && cmd_argv[0])
337 { 671 {
338 if (!rs[Rs_title]) 672 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 673 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
674
340 if (!rs[Rs_iconName]) 675 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 676 rs[Rs_iconName] = rs[Rs_title];
342 } 677 }
343 else 678 else
344 { 679 {
345 if (!rs[Rs_title]) 680 if (!rs[Rs_title])
346 rs[Rs_title] = rs[Rs_name]; 681 rs[Rs_title] = rs[Rs_name];
682
347 if (!rs[Rs_iconName]) 683 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_name]; 684 rs[Rs_iconName] = rs[Rs_name];
349 } 685 }
350 686
351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 687 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 694 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
360 696
361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
362 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
699
700 if (rs[Rs_letterSpace])
701 letterSpace = atoi (rs[Rs_letterSpace]);
363#endif 702#endif
364 703
365#ifdef POINTER_BLANK 704#ifdef POINTER_BLANK
366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 705 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
367 pointerBlankDelay = i; 706 pointerBlankDelay = i;
… …
370#endif 709#endif
371 710
372 /* no point having a scrollbar without having any scrollback! */ 711 /* no point having a scrollbar without having any scrollback! */
373 if (!saveLines) 712 if (!saveLines)
374 set_option (Opt_scrollBar, 0); 713 set_option (Opt_scrollBar, 0);
375
376#ifdef PRINTPIPE
377 if (!rs[Rs_print_pipe])
378 rs[Rs_print_pipe] = PRINTPIPE;
379#endif
380 714
381 if (!rs[Rs_cutchars]) 715 if (!rs[Rs_cutchars])
382 rs[Rs_cutchars] = CUTCHARS; 716 rs[Rs_cutchars] = CUTCHARS;
383 717
384#ifndef NO_BACKSPACE_KEY 718#ifndef NO_BACKSPACE_KEY
… …
397# else 731# else
398 rs[Rs_delete_key] = "\033[3~"; 732 rs[Rs_delete_key] = "\033[3~";
399# endif 733# endif
400#endif 734#endif
401 735
402#ifdef HAVE_SCROLLBARS 736 scrollBar.setup (this);
403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
404#endif
405 737
406#ifdef XTERM_REVERSE_VIDEO 738#ifdef XTERM_REVERSE_VIDEO
407 /* this is how xterm implements reverseVideo */ 739 /* this is how xterm implements reverseVideo */
408 if (option (Opt_reverseVideo)) 740 if (option (Opt_reverseVideo))
409 { 741 {
… …
429 color_aliases (Color_fg); 761 color_aliases (Color_fg);
430 color_aliases (Color_bg); 762 color_aliases (Color_bg);
431#ifndef NO_CURSORCOLOR 763#ifndef NO_CURSORCOLOR
432 color_aliases (Color_cursor); 764 color_aliases (Color_cursor);
433 color_aliases (Color_cursor2); 765 color_aliases (Color_cursor2);
434#endif /* NO_CURSORCOLOR */ 766#endif /* NO_CURSORCOLOR */
435 color_aliases (Color_pointer_fg); 767 color_aliases (Color_pointer_fg);
436 color_aliases (Color_pointer_bg); 768 color_aliases (Color_pointer_bg);
437 color_aliases (Color_border); 769 color_aliases (Color_border);
438#ifndef NO_BOLD_UNDERLINE_REVERSE 770#ifndef NO_BOLD_UNDERLINE_REVERSE
439 color_aliases (Color_BD); 771 color_aliases (Color_BD);
440 color_aliases (Color_UL); 772 color_aliases (Color_UL);
441 color_aliases (Color_RV); 773 color_aliases (Color_RV);
442#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 774#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
443 775
444 if (!rs[Rs_color + Color_border]) 776 if (!rs[Rs_color + Color_border])
445 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 777 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
446 778
447 return cmd_argv; 779 return cmd_argv;
780}
781
782/*----------------------------------------------------------------------*/
783void
784rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
785{
786 this->envv = envv;
787
788 SET_R (this);
789 set_locale ("");
790 set_environ (envv); // a few things in X do not call setlocale :(
791
792 init_vars ();
793
794 init_secondary ();
795
796 const char **cmd_argv = init_resources (argc, argv);
797
798#ifdef KEYSYM_RESOURCE
799 keyboard->register_done ();
800#endif
801
802 if (const char *path = rs[Rs_chdir])
803 if (*path) // ignored if empty
804 {
805 if (*path != '/')
806 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
807
808 if (chdir (path))
809 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
810 }
811
812 if (option (Opt_scrollBar))
813 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
814
815 pty = ptytty::create ();
816
817 create_windows (argc, argv);
818
819 init_xlocale ();
820
821 scr_poweron (); // initialize screen
822
823#if 0
824 XSynchronize (dpy, True);
825#endif
826
827 if (option (Opt_scrollBar))
828 scrollBar.resize (); /* create and map scrollbar */
829#ifdef HAVE_BG_PIXMAP
830 {
831 bgPixmap.set_target (this);
832 bgPixmap.invalidate ();
833
834#ifdef ENABLE_TRANSPARENCY
835 if (option (Opt_transparent))
836 {
837 bgPixmap.set_transparent ();
838
839#ifdef HAVE_AFTERIMAGE
840 if (rs [Rs_blurradius])
841 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
842#endif
843 if (ISSET_PIXCOLOR (Color_tint))
844 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
845
846 if (rs [Rs_shade])
847 bgPixmap.set_shade (rs [Rs_shade]);
848
849 bgPixmap.set_root_pixmap ();
850 XSelectInput (dpy, display->root, PropertyChangeMask);
851 rootwin_ev.start (display, display->root);
852 }
853#endif
854
855#ifdef BG_IMAGE_FROM_FILE
856 if (rs[Rs_backgroundPixmap])
857 {
858 const char *p = rs[Rs_backgroundPixmap];
859
860 if ((p = strchr (p, ';')) != 0)
861 {
862 p++;
863 bgPixmap.set_geometry (p);
864 }
865 else
866 bgPixmap.set_defaultGeometry ();
867
868 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
869 if (!bgPixmap.window_position_sensitive ())
870 update_background ();
871 }
872#endif
873 }
874#endif
875
876#if ENABLE_PERL
877 rootwin_ev.start (display, display->root);
878#endif
879
880 set_colorfgbg ();
881
882 init_command (cmd_argv);
883
884 free (cmd_argv);
885
886 if (pty->pty >= 0)
887 pty_ev.start (pty->pty, ev::READ);
888
889 HOOK_INVOKE ((this, HOOK_START, DT_END));
890
891#if ENABLE_XEMBED
892 if (rs[Rs_embed])
893 {
894 long info[2] = { 0, XEMBED_MAPPED };
895
896 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
897 32, PropModeReplace, (unsigned char *)&info, 2);
898 }
899#endif
900
901 XMapWindow (dpy, vt);
902 XMapWindow (dpy, parent[0]);
903
904 refresh_check ();
448} 905}
449 906
450/*----------------------------------------------------------------------*/ 907/*----------------------------------------------------------------------*/
451void 908void
452rxvt_term::init_env () 909rxvt_term::init_env ()
… …
467 */ 924 */
468 val = rxvt_network_display (rs[Rs_display_name]); 925 val = rxvt_network_display (rs[Rs_display_name]);
469 rs[Rs_display_name] = (const char *)val; 926 rs[Rs_display_name] = (const char *)val;
470 927
471 if (val == NULL) 928 if (val == NULL)
472#endif /* DISPLAY_IS_IP */ 929#endif /* DISPLAY_IS_IP */
473 val = XDisplayString (dpy); 930 val = XDisplayString (dpy);
474 931
475 if (rs[Rs_display_name] == NULL) 932 if (rs[Rs_display_name] == NULL)
476 rs[Rs_display_name] = val; /* use broken `:0' value */ 933 rs[Rs_display_name] = val; /* use broken `:0' value */
477 934
… …
517#ifdef HAVE_UNSETENV 974#ifdef HAVE_UNSETENV
518 /* avoid passing old settings and confusing term size */ 975 /* avoid passing old settings and confusing term size */
519 unsetenv ("LINES"); 976 unsetenv ("LINES");
520 unsetenv ("COLUMNS"); 977 unsetenv ("COLUMNS");
521 unsetenv ("TERMCAP"); /* terminfo should be okay */ 978 unsetenv ("TERMCAP"); /* terminfo should be okay */
522#endif /* HAVE_UNSETENV */ 979#endif /* HAVE_UNSETENV */
523} 980}
524 981
525/*----------------------------------------------------------------------*/ 982/*----------------------------------------------------------------------*/
526/* 983/*
527 * This is more or less stolen straight from XFree86 xterm. 984 * This is more or less stolen straight from XFree86 xterm.
… …
548 1005
549 this->locale = "C"; 1006 this->locale = "C";
550 } 1007 }
551 1008
552 1009
553 this->locale = rxvt_strdup (this->locale); 1010 this->locale = strdup (this->locale);
554 SET_LOCALE (this->locale); 1011 SET_LOCALE (this->locale);
555 mbstate.reset (); 1012 mbstate.reset ();
556#endif 1013#endif
557 1014
558#if HAVE_NL_LANGINFO 1015#if HAVE_NL_LANGINFO
… …
631 run_command (argv); 1088 run_command (argv);
632} 1089}
633 1090
634/*----------------------------------------------------------------------*/ 1091/*----------------------------------------------------------------------*/
635void 1092void
636rxvt_term::Get_Colours () 1093rxvt_term::get_colours ()
637{ 1094{
638 int i; 1095 int i;
639 1096
640#ifdef OFF_FOCUS_FADING 1097#ifdef OFF_FOCUS_FADING
641 pix_colors = pix_colors_focused; 1098 pix_colors = pix_colors_focused;
642#endif 1099#endif
643 1100
644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
645 { 1102 {
646 const char *name = rs[Rs_color + i]; 1103 const char *name = rs[Rs_color + i];
647 1104
648 if (!name) 1105 if (!name)
… …
701 * get scrollBar shadow colors 1158 * get scrollBar shadow colors
702 * 1159 *
703 * The calculations of topShadow/bottomShadow values are adapted 1160 * The calculations of topShadow/bottomShadow values are adapted
704 * from the fvwm window manager. 1161 * from the fvwm window manager.
705 */ 1162 */
706#ifdef KEEP_SCROLLCOLOR 1163#ifdef RXVT_SCROLLBAR
707 if (depth <= 2) 1164 if (depth <= 2)
708 { 1165 {
709 /* Monochrome */ 1166 /* Monochrome */
710 alias_color (Color_scroll, Color_fg); 1167 alias_color (Color_scroll, Color_fg);
711 alias_color (Color_topShadow, Color_bg); 1168 alias_color (Color_topShadow, Color_bg);
… …
726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1183 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
727 cscroll.a) 1184 cscroll.a)
728 )) 1185 ))
729 alias_color (Color_topShadow, Color_White); 1186 alias_color (Color_topShadow, Color_White);
730 } 1187 }
731#endif /* KEEP_SCROLLCOLOR */ 1188#endif
732 1189
733#ifdef OFF_FOCUS_FADING 1190#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1191 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
735 update_fade_color (i); 1192 update_fade_color (i);
736#endif 1193#endif
… …
744 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1201 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
745 { 1202 {
746 int i = atoi (rs[Rs_color + idx]); 1203 int i = atoi (rs[Rs_color + idx]);
747 1204
748 if (i >= 8 && i <= 15) 1205 if (i >= 8 && i <= 15)
749 { /* bright colors */ 1206 /* bright colors */
750 i -= 8;
751 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1207 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
752 return; 1208 else if (i >= 0 && i <= 7)
753 } 1209 /* normal colors */
754
755 if (i >= 0 && i <= 7) /* normal colors */
756 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1210 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
757 } 1211 }
758} 1212}
759 1213
760/*----------------------------------------------------------------------*/ 1214/*----------------------------------------------------------------------*/
… …
861 Window top, parent; 1315 Window top, parent;
862 1316
863 dLocal (Display *, dpy); 1317 dLocal (Display *, dpy);
864 1318
865 /* grab colors before netscape does */ 1319 /* grab colors before netscape does */
866 Get_Colours (); 1320 get_colours ();
867 1321
868 if (!set_fonts ()) 1322 if (!set_fonts ())
869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1323 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
870 1324
871 parent = display->root; 1325 parent = display->root;
… …
919 this->parent[0] = top; 1373 this->parent[0] = top;
920 1374
921 old_width = szHint.width; 1375 old_width = szHint.width;
922 old_height = szHint.height; 1376 old_height = szHint.height;
923 1377
924 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1378 set_title (rs [Rs_title]);
925 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1379 set_icon_name (rs [Rs_iconName]);
926 1380
927 classHint.res_name = (char *)rs[Rs_name]; 1381 classHint.res_name = (char *)rs[Rs_name];
928 classHint.res_class = (char *)RESCLASS; 1382 classHint.res_class = (char *)RESCLASS;
929 1383
930 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1384 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1386 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
933 wmHint.window_group = top; 1387 wmHint.window_group = top;
934 1388
935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1389 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
936 &szHint, &wmHint, &classHint); 1390 &szHint, &wmHint, &classHint);
1391#if ENABLE_EWMH
1392# ifdef HAVE_AFTERIMAGE
1393 /*
1394 * set up icon hint
1395 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1396 */
1397
1398 if (rs [Rs_iconfile])
1399 {
1400 init_asv ();
1401
1402 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1403 if (asv && im)
1404 {
1405 int w = im->width;
1406 int h = im->height;
1407 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1408 ASImage *result = scale_asimage (asv, im,
1409 w, h, ASA_ARGB32,
1410 100, ASIMAGE_QUALITY_DEFAULT);
1411 destroy_asimage (&im);
1412
1413 if (buffer && result)
1414 {
1415 ARGB32 *asbuf = result->alt.argb32;
1416 buffer [0] = w;
1417 buffer [1] = h;
1418
1419 for (unsigned int i = 0; i < w * h; ++i)
1420 buffer [i + 2] = asbuf [i];
1421
1422 destroy_asimage (&result);
1423 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1424 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1425 free (buffer);
1426 }
1427 else
1428 {
1429 if (!buffer)
1430 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1431
1432 if (!result)
1433 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1434 }
1435 }
1436 else
1437 rxvt_warn ("Loading image icon failed, continuing without.\n");
1438 }
1439# endif
1440#endif
937 1441
938#if ENABLE_FRILLS 1442#if ENABLE_FRILLS
939 if (mwmhints.flags) 1443 if (mwmhints.flags)
940 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1444 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1445 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
975 1479
976 termwin_ev.start (display, top); 1480 termwin_ev.start (display, top);
977 1481
978 /* vt cursor: Black-on-White is standard, but this is more popular */ 1482 /* vt cursor: Black-on-White is standard, but this is more popular */
979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
980
981#ifdef HAVE_SCROLLBARS
982 /* cursor scrollBar: Black-on-White */
983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
984#endif
985 1484
986 /* the vt window */ 1485 /* the vt window */
987 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
988 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
989 width, height, 1488 width, height,
… …
1014 GCForeground | GCBackground | GCGraphicsExposures, 1513 GCForeground | GCBackground | GCGraphicsExposures,
1015 &gcvalue); 1514 &gcvalue);
1016 1515
1017 drawable = new rxvt_drawable (this, vt); 1516 drawable = new rxvt_drawable (this, vt);
1018 1517
1019#ifdef RXVT_SCROLLBAR
1020 gcvalue.foreground = pix_colors[Color_topShadow];
1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1026#endif
1027
1028#ifdef OFF_FOCUS_FADING 1518#ifdef OFF_FOCUS_FADING
1029 // initially we are in unfocused state 1519 // initially we are in unfocused state
1030 if (rs[Rs_fade]) 1520 if (rs[Rs_fade])
1031 pix_colors = pix_colors_unfocused; 1521 pix_colors = pix_colors_unfocused;
1032#endif 1522#endif
… …
1037 1527
1038/* ------------------------------------------------------------------------- * 1528/* ------------------------------------------------------------------------- *
1039 * GET TTY CURRENT STATE * 1529 * GET TTY CURRENT STATE *
1040 * ------------------------------------------------------------------------- */ 1530 * ------------------------------------------------------------------------- */
1041void 1531void
1042rxvt_get_ttymode (ttymode_t *tio, int erase) 1532rxvt_get_ttymode (struct termios *tio, int erase)
1043{ 1533{
1044 /* 1534 /*
1045 * standard System V termios interface 1535 * standard System V termios interface
1046 */ 1536 */
1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1537 if (tcgetattr (STDIN_FILENO, tio) < 0)
1048 { 1538 {
1049 // return error - use system defaults, 1539 // return error - use system defaults,
1050 // where possible, and zero elsewhere 1540 // where possible, and zero elsewhere
1051 memset (tio, 0, sizeof (ttymode_t)); 1541 memset (tio, 0, sizeof (struct termios));
1052 1542
1053 tio->c_cc[VINTR] = CINTR; 1543 tio->c_cc[VINTR] = CINTR;
1054 tio->c_cc[VQUIT] = CQUIT; 1544 tio->c_cc[VQUIT] = CQUIT;
1055 tio->c_cc[VERASE] = CERASE; 1545 tio->c_cc[VERASE] = CERASE;
1056#ifdef VERASE2 1546#ifdef VERASE2
… …
1120 1610
1121 /* 1611 /*
1122 * Debugging 1612 * Debugging
1123 */ 1613 */
1124#ifdef DEBUG_TTYMODE 1614#ifdef DEBUG_TTYMODE
1125#ifdef HAVE_TERMIOS_H
1126 /* c_iflag bits */ 1615 /* c_iflag bits */
1127 fprintf (stderr, "Input flags\n"); 1616 fprintf (stderr, "Input flags\n");
1128 1617
1129 /* cpp token stringize doesn't work on all machines <sigh> */ 1618 /* cpp token stringize doesn't work on all machines <sigh> */
1130# define FOO(flag,name) \ 1619# define FOO(flag,name) \
… …
1193 FOO (VLNEXT, "VLNEXT"); 1682 FOO (VLNEXT, "VLNEXT");
1194# endif 1683# endif
1195 1684
1196 fprintf (stderr, "\n"); 1685 fprintf (stderr, "\n");
1197# undef FOO 1686# undef FOO
1198# endif /* HAVE_TERMIOS_H */ 1687#endif /* DEBUG_TTYMODE */
1199#endif /* DEBUG_TTYMODE */
1200} 1688}
1201 1689
1202/*----------------------------------------------------------------------*/ 1690/*----------------------------------------------------------------------*/
1203/* 1691/*
1204 * Run the command in a subprocess and return a file descriptor for the 1692 * Run the command in a subprocess and return a file descriptor for the
… …
1237 else 1725 else
1238#endif 1726#endif
1239 er = -1; 1727 er = -1;
1240 1728
1241 rxvt_get_ttymode (&tio, er); 1729 rxvt_get_ttymode (&tio, er);
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1730 /* init terminal attributes */
1731 cfsetospeed (&tio, BAUDRATE);
1732 cfsetispeed (&tio, BAUDRATE);
1733 tcsetattr (pty->tty, TCSANOW, &tio);
1243 pty->set_utf8_mode (enc_utf8); 1734 pty->set_utf8_mode (enc_utf8);
1244 1735
1245 /* set initial window size */ 1736 /* set initial window size */
1246 tt_winch (); 1737 tt_winch ();
1247 1738
… …
1307rxvt_term::run_child (const char *const *argv) 1798rxvt_term::run_child (const char *const *argv)
1308{ 1799{
1309 char *login; 1800 char *login;
1310 1801
1311 if (option (Opt_console)) 1802 if (option (Opt_console))
1803 {
1312 { /* be virtual console, fail silently */ 1804 /* be virtual console, fail silently */
1313#ifdef TIOCCONS 1805#ifdef TIOCCONS
1314 unsigned int on = 1; 1806 unsigned int on = 1;
1315 1807
1316 ioctl (STDIN_FILENO, TIOCCONS, &on); 1808 ioctl (STDIN_FILENO, TIOCCONS, &on);
1317#elif defined (SRIOCSREDIR) 1809#elif defined (SRIOCSREDIR)
… …
1319 1811
1320 fd = open (CONSOLE, O_WRONLY, 0); 1812 fd = open (CONSOLE, O_WRONLY, 0);
1321 if (fd >= 0) 1813 if (fd >= 0)
1322 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1814 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1323 close (fd); 1815 close (fd);
1324#endif /* SRIOCSREDIR */ 1816#endif /* SRIOCSREDIR */
1325 } 1817 }
1326 1818
1327 /* reset signals and spin off the command interpreter */ 1819 /* reset signals and spin off the command interpreter */
1328 signal (SIGINT, SIG_DFL); 1820 signal (SIGINT, SIG_DFL);
1329 signal (SIGQUIT, SIG_DFL); 1821 signal (SIGQUIT, SIG_DFL);
… …
1336 */ 1828 */
1337#ifdef SIGTSTP 1829#ifdef SIGTSTP
1338 signal (SIGTSTP, SIG_IGN); 1830 signal (SIGTSTP, SIG_IGN);
1339 signal (SIGTTIN, SIG_IGN); 1831 signal (SIGTTIN, SIG_IGN);
1340 signal (SIGTTOU, SIG_IGN); 1832 signal (SIGTTOU, SIG_IGN);
1341#endif /* SIGTSTP */ 1833#endif /* SIGTSTP */
1342
1343 // unblock signals (signals are blocked by iom.C
1344 sigset_t ss;
1345 sigemptyset (&ss);
1346 sigprocmask (SIG_SETMASK, &ss, 0);
1347 1834
1348 /* command interpreter path */ 1835 /* command interpreter path */
1349 if (argv != NULL) 1836 if (argv)
1350 { 1837 {
1351# ifdef DEBUG_CMD 1838# ifdef DEBUG_CMD
1352 int i; 1839 int i;
1353 1840
1354 for (i = 0; argv[i]; i++) 1841 for (i = 0; argv[i]; i++)
… …
1363 const char *argv0, *shell; 1850 const char *argv0, *shell;
1364 1851
1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1852 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1366 shell = "/bin/sh"; 1853 shell = "/bin/sh";
1367 1854
1368 argv0 = (const char *)rxvt_basename (shell); 1855 argv0 = rxvt_basename (shell);
1369 1856
1370 if (option (Opt_loginShell)) 1857 if (option (Opt_loginShell))
1371 { 1858 {
1372 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1859 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1373 1860
1374 login[0] = '-'; 1861 login[0] = '-';
1375 strcpy (&login[1], argv0); 1862 strcpy (&login[1], argv0);
1376 argv0 = login; 1863 argv0 = login;
1377 } 1864 }
1378 1865
1379 execlp (shell, argv0, NULL); 1866 execlp (shell, argv0, (char *)0);
1380 /* no error message: STDERR is closed! */ 1867 /* no error message: STDERR is closed! */
1381 } 1868 }
1382 1869
1383 return -1; 1870 return -1;
1384} 1871}

Diff Legend

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