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.191 by root, Tue Jul 24 14:32:47 2007 UTC vs.
Revision 1.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC

1 /*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
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(ENABLE_TRANSPARENCY)
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_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
205 547
206 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
207#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1;
214 549
215 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll); 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);
558 set_option (Opt_iso14755);
223 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
224 560 set_option (Opt_buffered);
225 return true;
226}
227
228void
229rxvt_term::init_secondary ()
230{
231 int i;
232
233 /*
234 * Close all unused file descriptors
235 * We don't want them, we don't need them.
236 */
237 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 {
239 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO);
241 }
242 else if (i > STDIN_FILENO)
243 {
244 dup2 (i, STDIN_FILENO);
245 close (i);
246 }
247
248 dup2 (STDERR_FILENO, STDOUT_FILENO);
249
250#if 0 // schmorp sayz closing filies is murder
251 for (i = STDERR_FILENO + 1; i < num_fds; i++)
252 {
253#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
254 if (i == 4 || i == 7)
255 continue;
256#endif
257 close (i);
258 }
259#endif
260} 561}
261 562
262/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
263const char ** 564const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
265{ 566{
266 int i, r_argc; 567 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
269 569
270 /* 570 /*
271 * 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
272 */ 572 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
275 break; 575 break;
276 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
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 592
279 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
281 595
282 r_argv[i] = NULL; 596 r_argv[i] = NULL;
283 597
284 if (r_argc == argc)
285 cmd_argv = NULL;
286 else
287 {
288 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
289
290 for (i = 0; i < argc - r_argc - 1; i++)
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292
293 cmd_argv[i] = NULL;
294 }
295
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
297 599
298 /* 600 /*
299 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
300 */ 602 */
301 603
… …
303 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
304 606
305 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
306 608
307 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
308 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 }
309 614
310 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
311 xa = display->xa; 616 xa = display->xa;
312 617
313 set (display); 618 set (display);
… …
316#if XFT 621#if XFT
317 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 624#endif
320 625
321#ifdef HAVE_AFTERIMAGE
322 ::dpy = NULL ; /* init global var from libAfter... */
323 asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
324#endif
325 free (r_argv); 626 free (r_argv);
326 627
327 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
328 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
329 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
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639 gdk_pixbuf_xlib_init (dpy, display->screen);
640#endif
330 641
331#if ENABLE_PERL 642#if ENABLE_PERL
332 if (!rs[Rs_perl_ext_1]) 643 if (!rs[Rs_perl_ext_1])
333 rs[Rs_perl_ext_1] = "default"; 644 rs[Rs_perl_ext_1] = "default";
334 645
… …
345 * set any defaults not already set 656 * set any defaults not already set
346 */ 657 */
347 if (cmd_argv && cmd_argv[0]) 658 if (cmd_argv && cmd_argv[0])
348 { 659 {
349 if (!rs[Rs_title]) 660 if (!rs[Rs_title])
350 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 661 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
662
351 if (!rs[Rs_iconName]) 663 if (!rs[Rs_iconName])
352 rs[Rs_iconName] = rs[Rs_title]; 664 rs[Rs_iconName] = rs[Rs_title];
353 } 665 }
354 else 666 else
355 { 667 {
356 if (!rs[Rs_title]) 668 if (!rs[Rs_title])
357 rs[Rs_title] = rs[Rs_name]; 669 rs[Rs_title] = rs[Rs_name];
670
358 if (!rs[Rs_iconName]) 671 if (!rs[Rs_iconName])
359 rs[Rs_iconName] = rs[Rs_name]; 672 rs[Rs_iconName] = rs[Rs_name];
360 } 673 }
361 674
362 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 675 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
369 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 682 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
370 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 683 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
371 684
372 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 685 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
373 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 686 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
687
688 if (rs[Rs_letterSpace])
689 letterSpace = atoi (rs[Rs_letterSpace]);
374#endif 690#endif
375 691
376#ifdef POINTER_BLANK 692#ifdef POINTER_BLANK
377 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 693 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
378 pointerBlankDelay = i; 694 pointerBlankDelay = i;
… …
382 698
383 /* no point having a scrollbar without having any scrollback! */ 699 /* no point having a scrollbar without having any scrollback! */
384 if (!saveLines) 700 if (!saveLines)
385 set_option (Opt_scrollBar, 0); 701 set_option (Opt_scrollBar, 0);
386 702
387#ifdef PRINTPIPE
388 if (!rs[Rs_print_pipe])
389 rs[Rs_print_pipe] = PRINTPIPE;
390#endif
391
392 if (!rs[Rs_cutchars]) 703 if (!rs[Rs_cutchars])
393 rs[Rs_cutchars] = CUTCHARS; 704 rs[Rs_cutchars] = CUTCHARS;
394 705
395#ifndef NO_BACKSPACE_KEY 706#ifndef NO_BACKSPACE_KEY
396 if (!rs[Rs_backspace_key]) 707 if (!rs[Rs_backspace_key])
397# ifdef DEFAULT_BACKSPACE 708# ifdef DEFAULT_BACKSPACE
398 key_backspace = DEFAULT_BACKSPACE; 709 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
399# else 710# else
400 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 711 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
401# endif 712# endif
402 else
403 {
404 val = strdup (rs[Rs_backspace_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_backspace = val;
408 }
409#endif 713#endif
410 714
411#ifndef NO_DELETE_KEY 715#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 716 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 717# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 718 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 719# else
416 key_delete = "\033[3~"; 720 rs[Rs_delete_key] = "\033[3~";
417# endif 721# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 rxvt_Str_trim (val);
422 rxvt_Str_escaped (val);
423 key_delete = val;
424 }
425#endif 722#endif
426 if (rs[Rs_answerbackstring])
427 {
428 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
429 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
430 }
431 723
432#ifdef HAVE_SCROLLBARS 724 scrollBar.setup (this);
433 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
434#endif
435 725
436#ifdef XTERM_REVERSE_VIDEO 726#ifdef XTERM_REVERSE_VIDEO
437 /* this is how xterm implements reverseVideo */ 727 /* this is how xterm implements reverseVideo */
438 if (option (Opt_reverseVideo)) 728 if (option (Opt_reverseVideo))
439 { 729 {
… …
459 color_aliases (Color_fg); 749 color_aliases (Color_fg);
460 color_aliases (Color_bg); 750 color_aliases (Color_bg);
461#ifndef NO_CURSORCOLOR 751#ifndef NO_CURSORCOLOR
462 color_aliases (Color_cursor); 752 color_aliases (Color_cursor);
463 color_aliases (Color_cursor2); 753 color_aliases (Color_cursor2);
464#endif /* NO_CURSORCOLOR */ 754#endif /* NO_CURSORCOLOR */
465 color_aliases (Color_pointer_fg); 755 color_aliases (Color_pointer_fg);
466 color_aliases (Color_pointer_bg); 756 color_aliases (Color_pointer_bg);
467 color_aliases (Color_border); 757 color_aliases (Color_border);
468#ifndef NO_BOLD_UNDERLINE_REVERSE 758#ifndef NO_BOLD_UNDERLINE_REVERSE
469 color_aliases (Color_BD); 759 color_aliases (Color_BD);
470 color_aliases (Color_UL); 760 color_aliases (Color_UL);
471 color_aliases (Color_RV); 761 color_aliases (Color_RV);
472#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 762#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
473 763
474 if (!rs[Rs_color + Color_border]) 764 if (!rs[Rs_color + Color_border])
475 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 765 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
476 766
477 return cmd_argv; 767 return cmd_argv;
768}
769
770/*----------------------------------------------------------------------*/
771void
772rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
773{
774 this->envv = envv;
775
776 SET_R (this);
777 set_locale ("");
778 set_environ (envv); // a few things in X do not call setlocale :(
779
780 init_vars ();
781
782 const char **cmd_argv = init_resources (argc, argv);
783
784#ifdef KEYSYM_RESOURCE
785 keyboard->register_done ();
786#endif
787
788 if (const char *path = rs[Rs_chdir])
789 if (*path) // ignored if empty
790 {
791 if (*path != '/')
792 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
793
794 if (chdir (path))
795 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
796 }
797
798 if (option (Opt_scrollBar))
799 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
800
801 pty = ptytty::create ();
802
803 create_windows (argc, argv);
804
805 init_xlocale ();
806
807 scr_poweron (); // initialize screen
808
809#if 0
810 XSynchronize (dpy, True);
811#endif
812
813 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */
815#ifdef HAVE_BG_PIXMAP
816 {
817 bgPixmap.set_target (this);
818 bgPixmap.invalidate ();
819
820#ifdef ENABLE_TRANSPARENCY
821 if (option (Opt_transparent))
822 {
823 bgPixmap.set_transparent ();
824
825 if (rs [Rs_blurradius])
826 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
827
828 if (ISSET_PIXCOLOR (Color_tint))
829 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
830
831 if (rs [Rs_shade])
832 bgPixmap.set_shade (rs [Rs_shade]);
833
834 bgPixmap.set_root_pixmap ();
835 XSelectInput (dpy, display->root, PropertyChangeMask);
836 rootwin_ev.start (display, display->root);
837 }
838#endif
839
840#ifdef BG_IMAGE_FROM_FILE
841 if (rs[Rs_backgroundPixmap])
842 {
843 const char *p = rs[Rs_backgroundPixmap];
844
845 if ((p = strchr (p, ';')) != 0)
846 {
847 p++;
848 bgPixmap.set_geometry (p);
849 }
850 else
851 bgPixmap.set_defaultGeometry ();
852
853 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
854 if (!bgPixmap.window_position_sensitive ())
855 update_background ();
856 }
857#endif
858 }
859#endif
860
861#if ENABLE_PERL
862 rootwin_ev.start (display, display->root);
863#endif
864
865 set_colorfgbg ();
866
867 init_command (cmd_argv);
868
869 free (cmd_argv);
870
871 if (pty->pty >= 0)
872 pty_ev.start (pty->pty, ev::READ);
873
874 HOOK_INVOKE ((this, HOOK_START, DT_END));
875
876#if ENABLE_XEMBED
877 if (rs[Rs_embed])
878 {
879 long info[2] = { 0, XEMBED_MAPPED };
880
881 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
882 32, PropModeReplace, (unsigned char *)&info, 2);
883 }
884#endif
885
886 XMapWindow (dpy, vt);
887 XMapWindow (dpy, parent[0]);
888
889 refresh_check ();
478} 890}
479 891
480/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
481void 893void
482rxvt_term::init_env () 894rxvt_term::init_env ()
483{ 895{
484 int i; 896 int i;
485 unsigned int u;
486 char *val; 897 char *val;
487 898
488#ifdef DISPLAY_IS_IP 899#ifdef DISPLAY_IS_IP
489 /* Fixup display_name for export over pty to any interested terminal 900 /* Fixup display_name for export over pty to any interested terminal
490 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 901 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
498 */ 909 */
499 val = rxvt_network_display (rs[Rs_display_name]); 910 val = rxvt_network_display (rs[Rs_display_name]);
500 rs[Rs_display_name] = (const char *)val; 911 rs[Rs_display_name] = (const char *)val;
501 912
502 if (val == NULL) 913 if (val == NULL)
503#endif /* DISPLAY_IS_IP */ 914#endif /* DISPLAY_IS_IP */
504 val = XDisplayString (dpy); 915 val = XDisplayString (dpy);
505 916
506 if (rs[Rs_display_name] == NULL) 917 if (rs[Rs_display_name] == NULL)
507 rs[Rs_display_name] = val; /* use broken `:0' value */ 918 rs[Rs_display_name] = val; /* use broken `:0' value */
508 919
509 i = strlen (val); 920 i = strlen (val);
510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 921 env_display = (char *)rxvt_malloc (i + 9);
511 922
512 sprintf (env_display, "DISPLAY=%s", val); 923 sprintf (env_display, "DISPLAY=%s", val);
513 924
514 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
515 926
… …
536 else 947 else
537 putenv ("COLORTERM=" COLORTERMENVFULL); 948 putenv ("COLORTERM=" COLORTERMENVFULL);
538 949
539 if (rs[Rs_term_name] != NULL) 950 if (rs[Rs_term_name] != NULL)
540 { 951 {
541 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 952 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
542 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 953 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
543 putenv (env_term); 954 putenv (env_term);
544 } 955 }
545 else 956 else
546 putenv ("TERM=" TERMENV); 957 putenv ("TERM=" TERMENV);
… …
548#ifdef HAVE_UNSETENV 959#ifdef HAVE_UNSETENV
549 /* avoid passing old settings and confusing term size */ 960 /* avoid passing old settings and confusing term size */
550 unsetenv ("LINES"); 961 unsetenv ("LINES");
551 unsetenv ("COLUMNS"); 962 unsetenv ("COLUMNS");
552 unsetenv ("TERMCAP"); /* terminfo should be okay */ 963 unsetenv ("TERMCAP"); /* terminfo should be okay */
553#endif /* HAVE_UNSETENV */ 964#endif /* HAVE_UNSETENV */
554} 965}
555 966
556/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
557/* 968/*
558 * This is more or less stolen straight from XFree86 xterm. 969 * This is more or less stolen straight from XFree86 xterm.
… …
579 990
580 this->locale = "C"; 991 this->locale = "C";
581 } 992 }
582 993
583 994
584 this->locale = rxvt_strdup (this->locale); 995 this->locale = strdup (this->locale);
585 SET_LOCALE (this->locale); 996 SET_LOCALE (this->locale);
586 mbstate.reset (); 997 mbstate.reset ();
587#endif 998#endif
588 999
589#if HAVE_NL_LANGINFO 1000#if HAVE_NL_LANGINFO
… …
646 priv_modes |= PrivMode_Keypress; 1057 priv_modes |= PrivMode_Keypress;
647 if (!option (Opt_jumpScroll)) 1058 if (!option (Opt_jumpScroll))
648 priv_modes |= PrivMode_smoothScroll; 1059 priv_modes |= PrivMode_smoothScroll;
649 1060
650#ifndef NO_BACKSPACE_KEY 1061#ifndef NO_BACKSPACE_KEY
651 if (strcmp (key_backspace, "DEC") == 0) 1062 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
652 priv_modes |= PrivMode_HaveBackSpace; 1063 priv_modes |= PrivMode_HaveBackSpace;
653#endif 1064#endif
654 1065
655 /* add value for scrollBar */ 1066 /* add value for scrollBar */
656 if (scrollBar.state) 1067 if (scrollBar.state)
… …
662 run_command (argv); 1073 run_command (argv);
663} 1074}
664 1075
665/*----------------------------------------------------------------------*/ 1076/*----------------------------------------------------------------------*/
666void 1077void
667rxvt_term::Get_Colours () 1078rxvt_term::get_colours ()
668{ 1079{
669 int i; 1080 int i;
670 1081
671#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
672 pix_colors = pix_colors_focused; 1083 pix_colors = pix_colors_focused;
673#endif 1084#endif
674 1085
675 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1086 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
676 { 1087 {
677 const char *name = rs[Rs_color + i]; 1088 const char *name = rs[Rs_color + i];
678 1089
679 if (!name) 1090 if (!name)
… …
732 * get scrollBar shadow colors 1143 * get scrollBar shadow colors
733 * 1144 *
734 * The calculations of topShadow/bottomShadow values are adapted 1145 * The calculations of topShadow/bottomShadow values are adapted
735 * from the fvwm window manager. 1146 * from the fvwm window manager.
736 */ 1147 */
737#ifdef KEEP_SCROLLCOLOR 1148#ifdef RXVT_SCROLLBAR
738 if (depth <= 2) 1149 if (depth <= 2)
739 { 1150 {
740 /* Monochrome */ 1151 /* Monochrome */
741 alias_color (Color_scroll, Color_fg); 1152 alias_color (Color_scroll, Color_fg);
742 alias_color (Color_topShadow, Color_bg); 1153 alias_color (Color_topShadow, Color_bg);
… …
757 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1168 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
758 cscroll.a) 1169 cscroll.a)
759 )) 1170 ))
760 alias_color (Color_topShadow, Color_White); 1171 alias_color (Color_topShadow, Color_White);
761 } 1172 }
762#endif /* KEEP_SCROLLCOLOR */ 1173#endif
763 1174
764#ifdef OFF_FOCUS_FADING 1175#ifdef OFF_FOCUS_FADING
765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1176 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
766 update_fade_color (i); 1177 update_fade_color (i);
767#endif 1178#endif
… …
775 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1186 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
776 { 1187 {
777 int i = atoi (rs[Rs_color + idx]); 1188 int i = atoi (rs[Rs_color + idx]);
778 1189
779 if (i >= 8 && i <= 15) 1190 if (i >= 8 && i <= 15)
780 { /* bright colors */ 1191 /* bright colors */
781 i -= 8;
782 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1192 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
783 return; 1193 else if (i >= 0 && i <= 7)
784 } 1194 /* normal colors */
785
786 if (i >= 0 && i <= 7) /* normal colors */
787 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1195 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
788 } 1196 }
789} 1197}
790 1198
791/*----------------------------------------------------------------------*/ 1199/*----------------------------------------------------------------------*/
… …
875 1283
876 if (i) 1284 if (i)
877 ModMetaMask = modmasks[i - 1]; 1285 ModMetaMask = modmasks[i - 1];
878} 1286}
879 1287
1288void
1289rxvt_term::set_icon (const char *file)
1290{
1291#ifdef HAVE_AFTERIMAGE
1292 init_asv ();
1293
1294 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1295 if (!im)
1296 {
1297 rxvt_warn ("Loading image icon failed, continuing without.\n");
1298 return;
1299 }
1300
1301 unsigned int w = im->width;
1302 unsigned int h = im->height;
1303
1304 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1305 {
1306 rxvt_warn ("Icon image too big, continuing without.\n");
1307 destroy_asimage (&im);
1308 return;
1309 }
1310
1311 ASImage *result = scale_asimage (asv, im,
1312 w, h, ASA_ARGB32,
1313 100, ASIMAGE_QUALITY_DEFAULT);
1314 destroy_asimage (&im);
1315
1316 if (!result)
1317 {
1318 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1319 return;
1320 }
1321
1322 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1323 if (buffer)
1324 {
1325 ARGB32 *asbuf = result->alt.argb32;
1326 buffer [0] = w;
1327 buffer [1] = h;
1328
1329 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i];
1331
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer);
1335 }
1336 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1338
1339 destroy_asimage (&result);
1340#endif
1341
1342#ifdef HAVE_PIXBUF
1343 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1344 if (!pixbuf)
1345 {
1346 rxvt_warn ("Loading image icon failed, continuing without.\n");
1347 return;
1348 }
1349
1350 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1351 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1352
1353 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1354 {
1355 rxvt_warn ("Icon image too big, continuing without.\n");
1356 g_object_unref (pixbuf);
1357 return;
1358 }
1359
1360 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1361 {
1362 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1363 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1364 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1365
1366 buffer [0] = w;
1367 buffer [1] = h;
1368 for (int i = 0; i < h; i++)
1369 {
1370 for (int j = 0; j < w; j++)
1371 {
1372 unsigned char *pixel = row + j * channels;
1373 long value;
1374
1375 if (channels == 4)
1376 value = pixel[3];
1377 else
1378 value = (unsigned char)0x00ff;
1379
1380 value = (value << 8) + pixel[0];
1381 value = (value << 8) + pixel[1];
1382 value = (value << 8) + pixel[2];
1383 buffer[(i * w + j) + 2] = value;
1384 }
1385
1386 row += rowstride;
1387 }
1388
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer);
1392 }
1393 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1395
1396 g_object_unref (pixbuf);
1397#endif
1398}
1399
880/*----------------------------------------------------------------------*/ 1400/*----------------------------------------------------------------------*/
881/* rxvt_Create_Windows () - Open and map the window */ 1401/* rxvt_Create_Windows () - Open and map the window */
882void 1402void
883rxvt_term::create_windows (int argc, const char *const *argv) 1403rxvt_term::create_windows (int argc, const char *const *argv)
884{ 1404{
885 XClassHint classHint; 1405 XClassHint classHint;
886 XWMHints wmHint; 1406 XWMHints wmHint;
887#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
888 MWMHints mwmhints; 1408 MWMHints mwmhints = { };
889#endif 1409#endif
890 XGCValues gcvalue; 1410 XGCValues gcvalue;
891 XSetWindowAttributes attributes; 1411 XSetWindowAttributes attributes;
892 Window top, parent; 1412 Window top, parent;
893 1413
894 dLocal (Display *, dpy); 1414 dLocal (Display *, dpy);
895 1415
896 /* grab colors before netscape does */ 1416 /* grab colors before netscape does */
897 Get_Colours (); 1417 get_colours ();
898 1418
899 if (!set_fonts ()) 1419 if (!set_fonts ())
900 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1420 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
901 1421
902 parent = display->root; 1422 parent = display->root;
… …
906#if ENABLE_FRILLS 1426#if ENABLE_FRILLS
907 if (option (Opt_borderLess)) 1427 if (option (Opt_borderLess))
908 { 1428 {
909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1429 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
910 { 1430 {
911 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1431 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
912 attributes.override_redirect = true; 1432 attributes.override_redirect = true;
913 mwmhints.flags = 0;
914 } 1433 }
915 else 1434 else
916 { 1435 {
917 mwmhints.flags = MWM_HINTS_DECORATIONS; 1436 mwmhints.flags = MWM_HINTS_DECORATIONS;
918 mwmhints.decorations = 0;
919 } 1437 }
920 } 1438 }
921 else
922 mwmhints.flags = 0;
923#endif 1439#endif
924 1440
925#if ENABLE_XEMBED 1441#if ENABLE_XEMBED
926 if (rs[Rs_embed]) 1442 if (rs[Rs_embed])
927 { 1443 {
… …
954 this->parent[0] = top; 1470 this->parent[0] = top;
955 1471
956 old_width = szHint.width; 1472 old_width = szHint.width;
957 old_height = szHint.height; 1473 old_height = szHint.height;
958 1474
959 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1475 set_title (rs [Rs_title]);
960 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1476 set_icon_name (rs [Rs_iconName]);
961 1477
962 classHint.res_name = (char *)rs[Rs_name]; 1478 classHint.res_name = (char *)rs[Rs_name];
963 classHint.res_class = (char *)RESCLASS; 1479 classHint.res_class = (char *)RESCLASS;
964 1480
965 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1481 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
967 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1483 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
968 wmHint.window_group = top; 1484 wmHint.window_group = top;
969 1485
970 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1486 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
971 &szHint, &wmHint, &classHint); 1487 &szHint, &wmHint, &classHint);
1488#if ENABLE_EWMH
1489 /*
1490 * set up icon hint
1491 * rs [Rs_iconfile] is path to icon
1492 */
1493
1494 if (rs [Rs_iconfile])
1495 {
1496 set_icon (rs [Rs_iconfile]);
1497 }
1498#endif
972 1499
973#if ENABLE_FRILLS 1500#if ENABLE_FRILLS
974 if (mwmhints.flags) 1501 if (mwmhints.flags)
975 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1502 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
976 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1503 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1010 1537
1011 termwin_ev.start (display, top); 1538 termwin_ev.start (display, top);
1012 1539
1013 /* vt cursor: Black-on-White is standard, but this is more popular */ 1540 /* vt cursor: Black-on-White is standard, but this is more popular */
1014 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1541 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1015
1016#ifdef HAVE_SCROLLBARS
1017 /* cursor scrollBar: Black-on-White */
1018 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1019#endif
1020 1542
1021 /* the vt window */ 1543 /* the vt window */
1022 vt = XCreateSimpleWindow (dpy, top, 1544 vt = XCreateSimpleWindow (dpy, top,
1023 window_vt_x, window_vt_y, 1545 window_vt_x, window_vt_y,
1024 width, height, 1546 width, height,
… …
1038 1560
1039 vt_select_input (); 1561 vt_select_input ();
1040 1562
1041 vt_ev.start (display, vt); 1563 vt_ev.start (display, vt);
1042 1564
1043#ifdef XPM_BACKGROUND
1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1046 && !option (Opt_transparent)
1047#endif
1048 )
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 scale_pixmap (p);
1056 }
1057
1058 set_bgPixmap (rs[Rs_backgroundPixmap]);
1059 scr_touch (true);
1060 }
1061#endif
1062
1063 /* graphics context for the vt window */ 1565 /* graphics context for the vt window */
1064 gcvalue.foreground = pix_colors[Color_fg]; 1566 gcvalue.foreground = pix_colors[Color_fg];
1065 gcvalue.background = pix_colors[Color_bg]; 1567 gcvalue.background = pix_colors[Color_bg];
1066 gcvalue.graphics_exposures = 0; 1568 gcvalue.graphics_exposures = 0;
1067 1569
… …
1069 GCForeground | GCBackground | GCGraphicsExposures, 1571 GCForeground | GCBackground | GCGraphicsExposures,
1070 &gcvalue); 1572 &gcvalue);
1071 1573
1072 drawable = new rxvt_drawable (this, vt); 1574 drawable = new rxvt_drawable (this, vt);
1073 1575
1074#ifdef RXVT_SCROLLBAR
1075 gcvalue.foreground = pix_colors[Color_topShadow];
1076 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077 gcvalue.foreground = pix_colors[Color_bottomShadow];
1078 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1080 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081#endif
1082
1083#ifdef OFF_FOCUS_FADING 1576#ifdef OFF_FOCUS_FADING
1084 // initially we are in unfocused state 1577 // initially we are in unfocused state
1085 if (rs[Rs_fade]) 1578 if (rs[Rs_fade])
1086 pix_colors = pix_colors_unfocused; 1579 pix_colors = pix_colors_unfocused;
1087#endif 1580#endif
1088 1581
1089 pointer_unblank (); 1582 pointer_unblank ();
1090 scr_recolour (); 1583 scr_recolour ();
1091}
1092
1093/* ------------------------------------------------------------------------- *
1094 * GET TTY CURRENT STATE *
1095 * ------------------------------------------------------------------------- */
1096void
1097rxvt_get_ttymode (ttymode_t *tio, int erase)
1098{
1099 /*
1100 * standard System V termios interface
1101 */
1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1103 {
1104 // return error - use system defaults,
1105 // where possible, and zero elsewhere
1106 memset (tio, 0, sizeof (ttymode_t));
1107
1108 tio->c_cc[VINTR] = CINTR;
1109 tio->c_cc[VQUIT] = CQUIT;
1110 tio->c_cc[VERASE] = CERASE;
1111#ifdef VERASE2
1112 tio->c_cc[VERASE2] = CERASE2;
1113#endif
1114 tio->c_cc[VKILL] = CKILL;
1115 tio->c_cc[VSTART] = CSTART;
1116 tio->c_cc[VSTOP] = CSTOP;
1117 tio->c_cc[VSUSP] = CSUSP;
1118# ifdef VDSUSP
1119 tio->c_cc[VDSUSP] = CDSUSP;
1120# endif
1121# ifdef VREPRINT
1122 tio->c_cc[VREPRINT] = CRPRNT;
1123# endif
1124# ifdef VDISCRD
1125 tio->c_cc[VDISCRD] = CFLUSH;
1126# endif
1127# ifdef VWERSE
1128 tio->c_cc[VWERSE] = CWERASE;
1129# endif
1130# ifdef VLNEXT
1131 tio->c_cc[VLNEXT] = CLNEXT;
1132# endif
1133 }
1134
1135 tio->c_cc[VEOF] = CEOF;
1136 tio->c_cc[VEOL] = VDISABLE;
1137# ifdef VEOL2
1138 tio->c_cc[VEOL2] = VDISABLE;
1139# endif
1140# ifdef VSWTC
1141 tio->c_cc[VSWTC] = VDISABLE;
1142# endif
1143# ifdef VSWTCH
1144 tio->c_cc[VSWTCH] = VDISABLE;
1145# endif
1146# if VMIN != VEOF
1147 tio->c_cc[VMIN] = 1;
1148# endif
1149# if VTIME != VEOL
1150 tio->c_cc[VTIME] = 0;
1151# endif
1152
1153 if (erase != -1)
1154 tio->c_cc[VERASE] = (char)erase;
1155
1156 /* input modes */
1157 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1158# ifdef IMAXBEL
1159 | IMAXBEL
1160# endif
1161 | IXON);
1162
1163 /* output modes */
1164 tio->c_oflag = (OPOST | ONLCR);
1165
1166 /* control modes */
1167 tio->c_cflag = (CS8 | CREAD);
1168
1169 /* line discipline modes */
1170 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1171# if defined (ECHOCTL) && defined (ECHOKE)
1172 | ECHOCTL | ECHOKE
1173# endif
1174 | ECHOE | ECHOK);
1175
1176 /*
1177 * Debugging
1178 */
1179#ifdef DEBUG_TTYMODE
1180#ifdef HAVE_TERMIOS_H
1181 /* c_iflag bits */
1182 fprintf (stderr, "Input flags\n");
1183
1184 /* cpp token stringize doesn't work on all machines <sigh> */
1185# define FOO(flag,name) \
1186 if ((tio->c_iflag) & flag) \
1187 fprintf (stderr, "%s ", name)
1188
1189 /* c_iflag bits */
1190 FOO (IGNBRK, "IGNBRK");
1191 FOO (BRKINT, "BRKINT");
1192 FOO (IGNPAR, "IGNPAR");
1193 FOO (PARMRK, "PARMRK");
1194 FOO (INPCK, "INPCK");
1195 FOO (ISTRIP, "ISTRIP");
1196 FOO (INLCR, "INLCR");
1197 FOO (IGNCR, "IGNCR");
1198 FOO (ICRNL, "ICRNL");
1199 FOO (IXON, "IXON");
1200 FOO (IXOFF, "IXOFF");
1201# ifdef IUCLC
1202 FOO (IUCLC, "IUCLC");
1203# endif
1204# ifdef IXANY
1205 FOO (IXANY, "IXANY");
1206# endif
1207# ifdef IMAXBEL
1208 FOO (IMAXBEL, "IMAXBEL");
1209# endif
1210
1211 fprintf (stderr, "\n");
1212
1213# undef FOO
1214# define FOO(entry, name) \
1215 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1216
1217 FOO (VINTR, "VINTR");
1218 FOO (VQUIT, "VQUIT");
1219 FOO (VERASE, "VERASE");
1220 FOO (VKILL, "VKILL");
1221 FOO (VEOF, "VEOF");
1222 FOO (VEOL, "VEOL");
1223# ifdef VEOL2
1224 FOO (VEOL2, "VEOL2");
1225# endif
1226# ifdef VSWTC
1227 FOO (VSWTC, "VSWTC");
1228# endif
1229# ifdef VSWTCH
1230 FOO (VSWTCH, "VSWTCH");
1231# endif
1232 FOO (VSTART, "VSTART");
1233 FOO (VSTOP, "VSTOP");
1234 FOO (VSUSP, "VSUSP");
1235# ifdef VDSUSP
1236 FOO (VDSUSP, "VDSUSP");
1237# endif
1238# ifdef VREPRINT
1239 FOO (VREPRINT, "VREPRINT");
1240# endif
1241# ifdef VDISCRD
1242 FOO (VDISCRD, "VDISCRD");
1243# endif
1244# ifdef VWERSE
1245 FOO (VWERSE, "VWERSE");
1246# endif
1247# ifdef VLNEXT
1248 FOO (VLNEXT, "VLNEXT");
1249# endif
1250
1251 fprintf (stderr, "\n");
1252# undef FOO
1253# endif /* HAVE_TERMIOS_H */
1254#endif /* DEBUG_TTYMODE */
1255} 1584}
1256 1585
1257/*----------------------------------------------------------------------*/ 1586/*----------------------------------------------------------------------*/
1258/* 1587/*
1259 * Run the command in a subprocess and return a file descriptor for the 1588 * Run the command in a subprocess and return a file descriptor for the
… …
1280 else 1609 else
1281#endif 1610#endif
1282 if (!pty->get ()) 1611 if (!pty->get ())
1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1612 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1284 1613
1285 int er; 1614 struct termios tio = def_tio;
1286 1615
1287#ifndef NO_BACKSPACE_KEY 1616#ifndef NO_BACKSPACE_KEY
1288 if (key_backspace[0] && !key_backspace[1]) 1617 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1289 er = key_backspace[0]; 1618 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1290 else if (strcmp (key_backspace, "DEC") == 0) 1619 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1291 er = '\177'; /* the initial state anyway */ 1620 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1292 else
1293#endif 1621#endif
1294 er = -1;
1295 1622
1296 rxvt_get_ttymode (&tio, er); 1623 /* init terminal attributes */
1297 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1624 cfsetospeed (&tio, BAUDRATE);
1625 cfsetispeed (&tio, BAUDRATE);
1626 tcsetattr (pty->tty, TCSANOW, &tio);
1298 pty->set_utf8_mode (enc_utf8); 1627 pty->set_utf8_mode (enc_utf8);
1299 1628
1300 /* set initial window size */ 1629 /* set initial window size */
1301 tt_winch (); 1630 tt_winch ();
1302 1631
… …
1362rxvt_term::run_child (const char *const *argv) 1691rxvt_term::run_child (const char *const *argv)
1363{ 1692{
1364 char *login; 1693 char *login;
1365 1694
1366 if (option (Opt_console)) 1695 if (option (Opt_console))
1696 {
1367 { /* be virtual console, fail silently */ 1697 /* be virtual console, fail silently */
1368#ifdef TIOCCONS 1698#ifdef TIOCCONS
1369 unsigned int on = 1; 1699 unsigned int on = 1;
1370 1700
1371 ioctl (STDIN_FILENO, TIOCCONS, &on); 1701 ioctl (STDIN_FILENO, TIOCCONS, &on);
1372#elif defined (SRIOCSREDIR) 1702#elif defined (SRIOCSREDIR)
… …
1374 1704
1375 fd = open (CONSOLE, O_WRONLY, 0); 1705 fd = open (CONSOLE, O_WRONLY, 0);
1376 if (fd >= 0) 1706 if (fd >= 0)
1377 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1707 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1378 close (fd); 1708 close (fd);
1379#endif /* SRIOCSREDIR */ 1709#endif /* SRIOCSREDIR */
1380 } 1710 }
1381 1711
1382 /* reset signals and spin off the command interpreter */ 1712 /* reset signals and spin off the command interpreter */
1383 signal (SIGINT, SIG_DFL); 1713 signal (SIGINT, SIG_DFL);
1384 signal (SIGQUIT, SIG_DFL); 1714 signal (SIGQUIT, SIG_DFL);
1385 signal (SIGCHLD, SIG_DFL); 1715 signal (SIGCHLD, SIG_DFL);
1386 signal (SIGHUP, SIG_DFL); 1716 signal (SIGHUP, SIG_DFL);
1387 signal (SIGPIPE, SIG_DFL); 1717 signal (SIGPIPE, SIG_DFL);
1388 /* 1718 /*
1389 * mimick login's behavior by disabling the job control signals 1719 * mimic login's behavior by disabling the job control signals
1390 * a shell that wants them can turn them back on 1720 * a shell that wants them can turn them back on
1391 */ 1721 */
1392#ifdef SIGTSTP 1722#ifdef SIGTSTP
1393 signal (SIGTSTP, SIG_IGN); 1723 signal (SIGTSTP, SIG_IGN);
1394 signal (SIGTTIN, SIG_IGN); 1724 signal (SIGTTIN, SIG_IGN);
1395 signal (SIGTTOU, SIG_IGN); 1725 signal (SIGTTOU, SIG_IGN);
1396#endif /* SIGTSTP */ 1726#endif /* SIGTSTP */
1397
1398 // unblock signals (signals are blocked by iom.C
1399 sigset_t ss;
1400 sigemptyset (&ss);
1401 sigprocmask (SIG_SETMASK, &ss, 0);
1402 1727
1403 /* command interpreter path */ 1728 /* command interpreter path */
1404 if (argv != NULL) 1729 if (argv)
1405 { 1730 {
1406# ifdef DEBUG_CMD 1731# ifdef DEBUG_CMD
1407 int i; 1732 int i;
1408 1733
1409 for (i = 0; argv[i]; i++) 1734 for (i = 0; argv[i]; i++)
… …
1418 const char *argv0, *shell; 1743 const char *argv0, *shell;
1419 1744
1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1745 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1421 shell = "/bin/sh"; 1746 shell = "/bin/sh";
1422 1747
1423 argv0 = (const char *)rxvt_r_basename (shell); 1748 argv0 = rxvt_basename (shell);
1424 1749
1425 if (option (Opt_loginShell)) 1750 if (option (Opt_loginShell))
1426 { 1751 {
1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1752 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1428 1753
1429 login[0] = '-'; 1754 login[0] = '-';
1430 strcpy (&login[1], argv0); 1755 strcpy (&login[1], argv0);
1431 argv0 = login; 1756 argv0 = login;
1432 } 1757 }
1433 1758
1434 execlp (shell, argv0, NULL); 1759 execlp (shell, argv0, (char *)0);
1435 /* no error message: STDERR is closed! */ 1760 /* no error message: STDERR is closed! */
1436 } 1761 }
1437 1762
1438 return -1; 1763 return -1;
1439} 1764}

Diff Legend

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