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.184 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.269 by root, Tue Jun 15 10:33:47 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 TINTING 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#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 533
192 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
194 want_refresh = 1; 536 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
196 ncol = 80; 538 ncol = 80;
197 nrow = 24; 539 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
201 saveLines = SAVELINES; 544 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 545
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
206 547
207 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1;
215 549
216 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
553 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
223 558 set_option (Opt_iso14755);
224 return true; 559 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered);
225} 561}
226 562
227void 563static void
228rxvt_term::init_secondary () 564init_secondary ()
229{ 565{
230 int i; 566 int i;
231 567
232 /*
233 * Close all unused file descriptors
234 * We don't want them, we don't need them.
235 */
236 if ((i = open ("/dev/null", O_RDONLY)) < 0) 568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 { 569 {
238 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO); 570 dup2 (STDERR_FILENO, STDIN_FILENO);
240 } 571 }
241 else if (i > STDIN_FILENO) 572 else if (i != STDIN_FILENO)
242 { 573 {
243 dup2 (i, STDIN_FILENO); 574 dup2 (i, STDIN_FILENO);
244 close (i); 575 close (i);
245 } 576 }
246 577
247 dup2 (STDERR_FILENO, STDOUT_FILENO); 578 dup2 (STDERR_FILENO, STDOUT_FILENO);
248
249#if 0 // schmorp sayz closing filies is murder
250 for (i = STDERR_FILENO + 1; i < num_fds; i++)
251 {
252#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
253 if (i == 4 || i == 7)
254 continue;
255#endif
256 close (i);
257 }
258#endif
259} 579}
260 580
261/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
262const char ** 582const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 583rxvt_term::init_resources (int argc, const char *const *argv)
264{ 584{
265 int i, r_argc; 585 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 586 const char **cmd_argv, **r_argv;
268 587
269 /* 588 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 589 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 590 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 591 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 592 if (!strcmp (argv[r_argc], "-e"))
274 break; 593 break;
275 594
595 if (r_argc == argc)
596 cmd_argv = NULL;
597 else if (!argv[r_argc + 1])
598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599 else
600 {
601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
602
603 for (i = 0; i < argc - r_argc - 1; i++)
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605
606 cmd_argv[i] = NULL;
607 }
608
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 610
278 for (i = 0; i < r_argc; i++) 611 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 612 r_argv[i] = (const char *)argv[i];
280 613
281 r_argv[i] = NULL; 614 r_argv[i] = NULL;
282 615
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 616 rs[Rs_name] = rxvt_basename (argv[0]);
296 617
297 /* 618 /*
298 * Open display, get options/resources and create the window 619 * Open display, get options/resources and create the window
299 */ 620 */
300 621
… …
302 rs[Rs_display_name] = ":0"; 623 rs[Rs_display_name] = ":0";
303 624
304 get_options (r_argc, r_argv); 625 get_options (r_argc, r_argv);
305 626
306 if (!(display = displays.get (rs[Rs_display_name]))) 627 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
308 632
309 // using a local pointer decreases code size a lot 633 // using a local pointer decreases code size a lot
310 xa = display->xa; 634 xa = display->xa;
311 635
312 set (display); 636 set (display);
… …
320 free (r_argv); 644 free (r_argv);
321 645
322 for (int i = NUM_RESOURCES; i--; ) 646 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 647 if (rs [i] == resval_undef)
324 rs [i] = 0; 648 rs [i] = 0;
649
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
325 654
326#if ENABLE_PERL 655#if ENABLE_PERL
327 if (!rs[Rs_perl_ext_1]) 656 if (!rs[Rs_perl_ext_1])
328 rs[Rs_perl_ext_1] = "default"; 657 rs[Rs_perl_ext_1] = "default";
329 658
… …
340 * set any defaults not already set 669 * set any defaults not already set
341 */ 670 */
342 if (cmd_argv && cmd_argv[0]) 671 if (cmd_argv && cmd_argv[0])
343 { 672 {
344 if (!rs[Rs_title]) 673 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 674 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
675
346 if (!rs[Rs_iconName]) 676 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 677 rs[Rs_iconName] = rs[Rs_title];
348 } 678 }
349 else 679 else
350 { 680 {
351 if (!rs[Rs_title]) 681 if (!rs[Rs_title])
352 rs[Rs_title] = rs[Rs_name]; 682 rs[Rs_title] = rs[Rs_name];
683
353 if (!rs[Rs_iconName]) 684 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_name]; 685 rs[Rs_iconName] = rs[Rs_name];
355 } 686 }
356 687
357 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 688 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
364 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 695 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
365 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 696 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
366 697
367 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 698 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
368 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 699 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
700
701 if (rs[Rs_letterSpace])
702 letterSpace = atoi (rs[Rs_letterSpace]);
369#endif 703#endif
370 704
371#ifdef POINTER_BLANK 705#ifdef POINTER_BLANK
372 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
373 pointerBlankDelay = i; 707 pointerBlankDelay = i;
… …
377 711
378 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
379 if (!saveLines) 713 if (!saveLines)
380 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
381 715
382#ifdef PRINTPIPE
383 if (!rs[Rs_print_pipe])
384 rs[Rs_print_pipe] = PRINTPIPE;
385#endif
386
387 if (!rs[Rs_cutchars]) 716 if (!rs[Rs_cutchars])
388 rs[Rs_cutchars] = CUTCHARS; 717 rs[Rs_cutchars] = CUTCHARS;
389 718
390#ifndef NO_BACKSPACE_KEY 719#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 720 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 721# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 722 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 723# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 724 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 725# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 726#endif
405 727
406#ifndef NO_DELETE_KEY 728#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 729 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 730# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 731 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 732# else
411 key_delete = "\033[3~"; 733 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 734# endif
421 if (rs[Rs_answerbackstring])
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426
427#ifdef HAVE_SCROLLBARS
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 735#endif
736
737 scrollBar.setup (this);
430 738
431#ifdef XTERM_REVERSE_VIDEO 739#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 740 /* this is how xterm implements reverseVideo */
433 if (option (Opt_reverseVideo)) 741 if (option (Opt_reverseVideo))
434 { 742 {
… …
454 color_aliases (Color_fg); 762 color_aliases (Color_fg);
455 color_aliases (Color_bg); 763 color_aliases (Color_bg);
456#ifndef NO_CURSORCOLOR 764#ifndef NO_CURSORCOLOR
457 color_aliases (Color_cursor); 765 color_aliases (Color_cursor);
458 color_aliases (Color_cursor2); 766 color_aliases (Color_cursor2);
459#endif /* NO_CURSORCOLOR */ 767#endif /* NO_CURSORCOLOR */
460 color_aliases (Color_pointer_fg); 768 color_aliases (Color_pointer_fg);
461 color_aliases (Color_pointer_bg); 769 color_aliases (Color_pointer_bg);
462 color_aliases (Color_border); 770 color_aliases (Color_border);
463#ifndef NO_BOLD_UNDERLINE_REVERSE 771#ifndef NO_BOLD_UNDERLINE_REVERSE
464 color_aliases (Color_BD); 772 color_aliases (Color_BD);
465 color_aliases (Color_UL); 773 color_aliases (Color_UL);
466 color_aliases (Color_RV); 774 color_aliases (Color_RV);
467#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 775#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468 776
469 if (!rs[Rs_color + Color_border]) 777 if (!rs[Rs_color + Color_border])
470 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 778 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471 779
472 return cmd_argv; 780 return cmd_argv;
781}
782
783/*----------------------------------------------------------------------*/
784void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
786{
787 this->envv = envv;
788
789 SET_R (this);
790 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :(
792
793 init_vars ();
794
795 init_secondary ();
796
797 const char **cmd_argv = init_resources (argc, argv);
798
799#ifdef KEYSYM_RESOURCE
800 keyboard->register_done ();
801#endif
802
803 if (const char *path = rs[Rs_chdir])
804 if (*path) // ignored if empty
805 {
806 if (*path != '/')
807 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
808
809 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 }
812
813 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
815
816 pty = ptytty::create ();
817
818 create_windows (argc, argv);
819
820 init_xlocale ();
821
822 scr_poweron (); // initialize screen
823
824#if 0
825 XSynchronize (dpy, True);
826#endif
827
828 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */
830#ifdef HAVE_BG_PIXMAP
831 {
832 bgPixmap.set_target (this);
833 bgPixmap.invalidate ();
834
835#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent))
837 {
838 bgPixmap.set_transparent ();
839
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843#endif
844 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846
847 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]);
849
850 bgPixmap.set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root);
853 }
854#endif
855
856#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ())
871 update_background ();
872 }
873#endif
874 }
875#endif
876
877#if ENABLE_PERL
878 rootwin_ev.start (display, display->root);
879#endif
880
881 set_colorfgbg ();
882
883 init_command (cmd_argv);
884
885 free (cmd_argv);
886
887 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ);
889
890 HOOK_INVOKE ((this, HOOK_START, DT_END));
891
892#if ENABLE_XEMBED
893 if (rs[Rs_embed])
894 {
895 long info[2] = { 0, XEMBED_MAPPED };
896
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2);
899 }
900#endif
901
902 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]);
904
905 refresh_check ();
473} 906}
474 907
475/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
476void 909void
477rxvt_term::init_env () 910rxvt_term::init_env ()
478{ 911{
479 int i; 912 int i;
480 unsigned int u;
481 char *val; 913 char *val;
482 914
483#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 916 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
493 */ 925 */
494 val = rxvt_network_display (rs[Rs_display_name]); 926 val = rxvt_network_display (rs[Rs_display_name]);
495 rs[Rs_display_name] = (const char *)val; 927 rs[Rs_display_name] = (const char *)val;
496 928
497 if (val == NULL) 929 if (val == NULL)
498#endif /* DISPLAY_IS_IP */ 930#endif /* DISPLAY_IS_IP */
499 val = XDisplayString (dpy); 931 val = XDisplayString (dpy);
500 932
501 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
503 935
504 i = strlen (val); 936 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 937 env_display = (char *)rxvt_malloc (i + 9);
506 938
507 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
508 940
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 942
… …
531 else 963 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 964 putenv ("COLORTERM=" COLORTERMENVFULL);
533 965
534 if (rs[Rs_term_name] != NULL) 966 if (rs[Rs_term_name] != NULL)
535 { 967 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 968 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 969 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 970 putenv (env_term);
539 } 971 }
540 else 972 else
541 putenv ("TERM=" TERMENV); 973 putenv ("TERM=" TERMENV);
… …
543#ifdef HAVE_UNSETENV 975#ifdef HAVE_UNSETENV
544 /* avoid passing old settings and confusing term size */ 976 /* avoid passing old settings and confusing term size */
545 unsetenv ("LINES"); 977 unsetenv ("LINES");
546 unsetenv ("COLUMNS"); 978 unsetenv ("COLUMNS");
547 unsetenv ("TERMCAP"); /* terminfo should be okay */ 979 unsetenv ("TERMCAP"); /* terminfo should be okay */
548#endif /* HAVE_UNSETENV */ 980#endif /* HAVE_UNSETENV */
549} 981}
550 982
551/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
552/* 984/*
553 * This is more or less stolen straight from XFree86 xterm. 985 * This is more or less stolen straight from XFree86 xterm.
… …
574 1006
575 this->locale = "C"; 1007 this->locale = "C";
576 } 1008 }
577 1009
578 1010
579 this->locale = rxvt_strdup (this->locale); 1011 this->locale = strdup (this->locale);
580 SET_LOCALE (this->locale); 1012 SET_LOCALE (this->locale);
581 mbstate.reset (); 1013 mbstate.reset ();
582#endif 1014#endif
583 1015
584#if HAVE_NL_LANGINFO 1016#if HAVE_NL_LANGINFO
… …
641 priv_modes |= PrivMode_Keypress; 1073 priv_modes |= PrivMode_Keypress;
642 if (!option (Opt_jumpScroll)) 1074 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 1075 priv_modes |= PrivMode_smoothScroll;
644 1076
645#ifndef NO_BACKSPACE_KEY 1077#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 1078 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 1079 priv_modes |= PrivMode_HaveBackSpace;
648#endif 1080#endif
649 1081
650 /* add value for scrollBar */ 1082 /* add value for scrollBar */
651 if (scrollBar.state) 1083 if (scrollBar.state)
… …
657 run_command (argv); 1089 run_command (argv);
658} 1090}
659 1091
660/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
661void 1093void
662rxvt_term::Get_Colours () 1094rxvt_term::get_colours ()
663{ 1095{
664 int i; 1096 int i;
665 1097
666#ifdef OFF_FOCUS_FADING 1098#ifdef OFF_FOCUS_FADING
667 pix_colors = pix_colors_focused; 1099 pix_colors = pix_colors_focused;
668#endif 1100#endif
669 1101
670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671 { 1103 {
672 const char *name = rs[Rs_color + i]; 1104 const char *name = rs[Rs_color + i];
673 1105
674 if (!name) 1106 if (!name)
… …
727 * get scrollBar shadow colors 1159 * get scrollBar shadow colors
728 * 1160 *
729 * The calculations of topShadow/bottomShadow values are adapted 1161 * The calculations of topShadow/bottomShadow values are adapted
730 * from the fvwm window manager. 1162 * from the fvwm window manager.
731 */ 1163 */
732#ifdef KEEP_SCROLLCOLOR 1164#ifdef RXVT_SCROLLBAR
733 if (depth <= 2) 1165 if (depth <= 2)
734 { 1166 {
735 /* Monochrome */ 1167 /* Monochrome */
736 alias_color (Color_scroll, Color_fg); 1168 alias_color (Color_scroll, Color_fg);
737 alias_color (Color_topShadow, Color_bg); 1169 alias_color (Color_topShadow, Color_bg);
… …
752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753 cscroll.a) 1185 cscroll.a)
754 )) 1186 ))
755 alias_color (Color_topShadow, Color_White); 1187 alias_color (Color_topShadow, Color_White);
756 } 1188 }
757#endif /* KEEP_SCROLLCOLOR */ 1189#endif
758 1190
759#ifdef OFF_FOCUS_FADING 1191#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i); 1193 update_fade_color (i);
762#endif 1194#endif
… …
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 1203 {
772 int i = atoi (rs[Rs_color + idx]); 1204 int i = atoi (rs[Rs_color + idx]);
773 1205
774 if (i >= 8 && i <= 15) 1206 if (i >= 8 && i <= 15)
775 { /* bright colors */ 1207 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1208 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 1209 else if (i >= 0 && i <= 7)
779 } 1210 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1211 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 1212 }
784} 1213}
785 1214
786/*----------------------------------------------------------------------*/ 1215/*----------------------------------------------------------------------*/
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 1307rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1308{
880 XClassHint classHint; 1309 XClassHint classHint;
881 XWMHints wmHint; 1310 XWMHints wmHint;
882#if ENABLE_FRILLS 1311#if ENABLE_FRILLS
883 MWMHints mwmhints; 1312 MWMHints mwmhints = { };
884#endif 1313#endif
885 XGCValues gcvalue; 1314 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1315 XSetWindowAttributes attributes;
887 Window top, parent; 1316 Window top, parent;
888 1317
889 dLocal (Display *, dpy); 1318 dLocal (Display *, dpy);
890 1319
891 /* grab colors before netscape does */ 1320 /* grab colors before netscape does */
892 Get_Colours (); 1321 get_colours ();
893 1322
894 if (!set_fonts ()) 1323 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 1325
897 parent = display->root; 1326 parent = display->root;
… …
901#if ENABLE_FRILLS 1330#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 1331 if (option (Opt_borderLess))
903 { 1332 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1333 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1334 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1335 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1336 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1337 }
910 else 1338 else
911 { 1339 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1340 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1341 }
915 } 1342 }
916 else
917 mwmhints.flags = 0;
918#endif 1343#endif
919 1344
920#if ENABLE_XEMBED 1345#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1346 if (rs[Rs_embed])
922 { 1347 {
… …
949 this->parent[0] = top; 1374 this->parent[0] = top;
950 1375
951 old_width = szHint.width; 1376 old_width = szHint.width;
952 old_height = szHint.height; 1377 old_height = szHint.height;
953 1378
954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1379 set_title (rs [Rs_title]);
955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1380 set_icon_name (rs [Rs_iconName]);
956 1381
957 classHint.res_name = (char *)rs[Rs_name]; 1382 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1383 classHint.res_class = (char *)RESCLASS;
959 1384
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1385 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1388 wmHint.window_group = top;
964 1389
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1391 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /*
1395 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1397 */
1398
1399 if (rs [Rs_iconfile])
1400 {
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif
967 1442
968#if ENABLE_FRILLS 1443#if ENABLE_FRILLS
969 if (mwmhints.flags) 1444 if (mwmhints.flags)
970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1446 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1005 1480
1006 termwin_ev.start (display, top); 1481 termwin_ev.start (display, top);
1007 1482
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1483 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif
1015 1485
1016 /* the vt window */ 1486 /* the vt window */
1017 vt = XCreateSimpleWindow (dpy, top, 1487 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1488 window_vt_x, window_vt_y,
1019 width, height, 1489 width, height,
… …
1033 1503
1034 vt_select_input (); 1504 vt_select_input ();
1035 1505
1036 vt_ev.start (display, vt); 1506 vt_ev.start (display, vt);
1037 1507
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1041 && !OPTION (Opt_transparent)
1042#endif
1043 )
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057
1058 /* graphics context for the vt window */ 1508 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1509 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1510 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1511 gcvalue.graphics_exposures = 0;
1062 1512
… …
1064 GCForeground | GCBackground | GCGraphicsExposures, 1514 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1515 &gcvalue);
1066 1516
1067 drawable = new rxvt_drawable (this, vt); 1517 drawable = new rxvt_drawable (this, vt);
1068 1518
1069#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif
1077
1078#ifdef OFF_FOCUS_FADING 1519#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1520 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1521 if (rs[Rs_fade])
1081 pix_colors = pix_colors_unfocused; 1522 pix_colors = pix_colors_unfocused;
1082#endif 1523#endif
… …
1087 1528
1088/* ------------------------------------------------------------------------- * 1529/* ------------------------------------------------------------------------- *
1089 * GET TTY CURRENT STATE * 1530 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */ 1531 * ------------------------------------------------------------------------- */
1091void 1532void
1092rxvt_get_ttymode (ttymode_t *tio, int erase) 1533rxvt_get_ttymode (struct termios *tio, int erase)
1093{ 1534{
1094 /* 1535 /*
1095 * standard System V termios interface 1536 * standard System V termios interface
1096 */ 1537 */
1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1538 // does not work as stdin is not a tty
1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1098 { 1541 {
1099 // return error - use system defaults, 1542 // return error - use system defaults,
1100 // where possible, and zero elsewhere 1543 // where possible, and zero elsewhere
1101 memset (tio, 0, sizeof (ttymode_t)); 1544 memset (tio, 0, sizeof (struct termios));
1545 if (VDISABLE)
1546 for (int i = 0; i < NCCS; i++)
1547 tio->c_cc[i] = VDISABLE;
1102 1548
1103 tio->c_cc[VINTR] = CINTR; 1549 tio->c_cc[VINTR] = CINTR;
1104 tio->c_cc[VQUIT] = CQUIT; 1550 tio->c_cc[VQUIT] = CQUIT;
1105 tio->c_cc[VERASE] = CERASE; 1551 tio->c_cc[VERASE] = CERASE;
1106#ifdef VERASE2 1552#ifdef VERASE2
… …
1126 tio->c_cc[VLNEXT] = CLNEXT; 1572 tio->c_cc[VLNEXT] = CLNEXT;
1127# endif 1573# endif
1128 } 1574 }
1129 1575
1130 tio->c_cc[VEOF] = CEOF; 1576 tio->c_cc[VEOF] = CEOF;
1131 tio->c_cc[VEOL] = VDISABLE;
1132# ifdef VEOL2
1133 tio->c_cc[VEOL2] = VDISABLE;
1134# endif
1135# ifdef VSWTC
1136 tio->c_cc[VSWTC] = VDISABLE;
1137# endif
1138# ifdef VSWTCH
1139 tio->c_cc[VSWTCH] = VDISABLE;
1140# endif
1141# if VMIN != VEOF 1577# if VMIN != VEOF
1142 tio->c_cc[VMIN] = 1; 1578 tio->c_cc[VMIN] = 1;
1143# endif 1579# endif
1144# if VTIME != VEOL 1580# if VTIME != VEOL
1145 tio->c_cc[VTIME] = 0; 1581 tio->c_cc[VTIME] = 0;
1146# endif 1582# endif
1147 1583
1148 if (erase != -1) 1584 if (erase != -1)
1149 tio->c_cc[VERASE] = (char)erase; 1585 tio->c_cc[VERASE] = erase;
1150 1586
1151 /* input modes */ 1587 /* input modes */
1152 tio->c_iflag = (BRKINT | IGNPAR | ICRNL 1588 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1153# ifdef IMAXBEL 1589# ifdef IMAXBEL
1154 | IMAXBEL 1590 | IMAXBEL
… …
1170 1606
1171 /* 1607 /*
1172 * Debugging 1608 * Debugging
1173 */ 1609 */
1174#ifdef DEBUG_TTYMODE 1610#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */ 1611 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n"); 1612 fprintf (stderr, "Input flags\n");
1178 1613
1179 /* cpp token stringize doesn't work on all machines <sigh> */ 1614 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \ 1615# define FOO(flag,name) \
1181 if ((tio->c_iflag) & flag) \ 1616 if ((tio->c_iflag) & flag) \
1182 fprintf (stderr, "%s ", name) 1617 fprintf (stderr, "%s ", name)
1183 1618
1184 /* c_iflag bits */ 1619 /* c_iflag bits */
1185 FOO (IGNBRK, "IGNBRK"); 1620 FOO (IGNBRK, "IGNBRK");
1186 FOO (BRKINT, "BRKINT"); 1621 FOO (BRKINT, "BRKINT");
1187 FOO (IGNPAR, "IGNPAR"); 1622 FOO (IGNPAR, "IGNPAR");
… …
1243 FOO (VLNEXT, "VLNEXT"); 1678 FOO (VLNEXT, "VLNEXT");
1244# endif 1679# endif
1245 1680
1246 fprintf (stderr, "\n"); 1681 fprintf (stderr, "\n");
1247# undef FOO 1682# undef FOO
1248# endif /* HAVE_TERMIOS_H */ 1683#endif /* DEBUG_TTYMODE */
1249#endif /* DEBUG_TTYMODE */
1250} 1684}
1251 1685
1252/*----------------------------------------------------------------------*/ 1686/*----------------------------------------------------------------------*/
1253/* 1687/*
1254 * Run the command in a subprocess and return a file descriptor for the 1688 * Run the command in a subprocess and return a file descriptor for the
… …
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1712 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1713
1280 int er; 1714 int er;
1281 1715
1282#ifndef NO_BACKSPACE_KEY 1716#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1717 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1718 er = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1719 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1720 er = '\177'; /* the initial state anyway */
1287 else 1721 else
1288#endif 1722#endif
1289 er = -1; 1723 er = -1;
1290 1724
1291 rxvt_get_ttymode (&tio, er); 1725 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1726 /* init terminal attributes */
1727 cfsetospeed (&tio, BAUDRATE);
1728 cfsetispeed (&tio, BAUDRATE);
1729 tcsetattr (pty->tty, TCSANOW, &tio);
1293 pty->set_utf8_mode (enc_utf8); 1730 pty->set_utf8_mode (enc_utf8);
1294 1731
1295 /* set initial window size */ 1732 /* set initial window size */
1296 tt_winch (); 1733 tt_winch ();
1297 1734
… …
1357rxvt_term::run_child (const char *const *argv) 1794rxvt_term::run_child (const char *const *argv)
1358{ 1795{
1359 char *login; 1796 char *login;
1360 1797
1361 if (option (Opt_console)) 1798 if (option (Opt_console))
1799 {
1362 { /* be virtual console, fail silently */ 1800 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1801#ifdef TIOCCONS
1364 unsigned int on = 1; 1802 unsigned int on = 1;
1365 1803
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1804 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1805#elif defined (SRIOCSREDIR)
… …
1369 1807
1370 fd = open (CONSOLE, O_WRONLY, 0); 1808 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1809 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1810 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1811 close (fd);
1374#endif /* SRIOCSREDIR */ 1812#endif /* SRIOCSREDIR */
1375 } 1813 }
1376 1814
1377 /* reset signals and spin off the command interpreter */ 1815 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1816 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1817 signal (SIGQUIT, SIG_DFL);
… …
1386 */ 1824 */
1387#ifdef SIGTSTP 1825#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1826 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1827 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1828 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1829#endif /* SIGTSTP */
1392
1393 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss;
1395 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1830
1398 /* command interpreter path */ 1831 /* command interpreter path */
1399 if (argv != NULL) 1832 if (argv)
1400 { 1833 {
1401# ifdef DEBUG_CMD 1834# ifdef DEBUG_CMD
1402 int i; 1835 int i;
1403 1836
1404 for (i = 0; argv[i]; i++) 1837 for (i = 0; argv[i]; i++)
… …
1413 const char *argv0, *shell; 1846 const char *argv0, *shell;
1414 1847
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1848 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1849 shell = "/bin/sh";
1417 1850
1418 argv0 = (const char *)rxvt_r_basename (shell); 1851 argv0 = rxvt_basename (shell);
1419 1852
1420 if (option (Opt_loginShell)) 1853 if (option (Opt_loginShell))
1421 { 1854 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1855 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1856
1424 login[0] = '-'; 1857 login[0] = '-';
1425 strcpy (&login[1], argv0); 1858 strcpy (&login[1], argv0);
1426 argv0 = login; 1859 argv0 = login;
1427 } 1860 }
1428 1861
1429 execlp (shell, argv0, NULL); 1862 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1863 /* no error message: STDERR is closed! */
1431 } 1864 }
1432 1865
1433 return -1; 1866 return -1;
1434} 1867}

Diff Legend

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