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.189 by root, Tue Jun 26 00:40:18 2007 UTC vs.
Revision 1.289 by root, Mon Jan 3 03:05:47 2011 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>
42 44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef 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 is probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69
70#include <netinet/in.h>
71#include <arpa/inet.h>
72#include <net/if.h>
73#include <net/if_arp.h>
74
75static char *
76rxvt_network_display (const char *display)
77{
78 char buffer[1024], *rval = NULL;
79 struct ifconf ifc;
80 struct ifreq *ifr;
81 int i, skfd;
82
83 if (display[0] != ':' && strncmp (display, "unix:", 5))
84 return (char *) display; /* nothing to do */
85
86 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
87 ifc.ifc_buf = buffer;
88
89 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
90 {
91 perror ("socket");
92 return NULL;
93 }
94
95 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
96 {
97 perror ("SIOCGIFCONF");
98 close (skfd);
99 return NULL;
100 }
101
102 for (i = 0, ifr = ifc.ifc_req;
103 i < (ifc.ifc_len / sizeof (struct ifreq));
104 i++, ifr++)
105 {
106 struct ifreq ifr2;
107
108 strcpy (ifr2.ifr_name, ifr->ifr_name);
109
110 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
111 {
112 unsigned long addr;
113 struct sockaddr_in *p_addr;
114
115 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
116 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
117
118 /*
119 * not "0.0.0.0" or "127.0.0.1" - so format the address
120 */
121 if (addr && addr != 0x7F000001)
122 {
123 char *colon = strchr (display, ':');
124
125 if (colon == NULL)
126 colon = ":0.0";
127
128 rval = rxvt_malloc (strlen (colon) + 16);
129 sprintf (rval, "%d.%d.%d.%d%s",
130 (int) ((addr >> 030) & 0xFF),
131 (int) ((addr >> 020) & 0xFF),
132 (int) ((addr >> 010) & 0xFF),
133 (int) (addr & 0xFF), colon);
134 break;
135 }
136 }
137 }
138
139 close (skfd);
140
141 return rval;
142}
143#endif
144
43const char *const def_colorName[] = 145static const char *const def_colorName[] =
44 { 146 {
45 COLOR_FOREGROUND, 147 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 148 COLOR_BACKGROUND,
47 /* low-intensity colors */ 149 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 150 "rgb:00/00/00", // 0: black (Black)
… …
50 "rgb:00/cd/00", // 2: green (Green3) 152 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 153 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 154 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 155 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 156 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 157# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 158 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 159# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 160 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 161# endif
60 /* high-intensity colors */ 162 /* high-intensity colors */
61# ifdef XTERM_COLORS 163# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 164 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 171 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 172 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 173 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 174 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 175
176#if !USE_256_COLORS
74 // 88 xterm colours 177 // 88 xterm colours
75 "rgb:00/00/00", 178 "rgb:00/00/00",
76 "rgb:00/00/8b", 179 "rgb:00/00/8b",
77 "rgb:00/00/cd", 180 "rgb:00/00/cd",
78 "rgb:00/00/ff", 181 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 245 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 246 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 247 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 248 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 249 "rgb:e7/e7/e7",
250#else
251 // 256 xterm colours
252 "rgb:00/00/00",
253 "rgb:00/00/5f",
254 "rgb:00/00/87",
255 "rgb:00/00/af",
256 "rgb:00/00/d7",
257 "rgb:00/00/ff",
258 "rgb:00/5f/00",
259 "rgb:00/5f/5f",
260 "rgb:00/5f/87",
261 "rgb:00/5f/af",
262 "rgb:00/5f/d7",
263 "rgb:00/5f/ff",
264 "rgb:00/87/00",
265 "rgb:00/87/5f",
266 "rgb:00/87/87",
267 "rgb:00/87/af",
268 "rgb:00/87/d7",
269 "rgb:00/87/ff",
270 "rgb:00/af/00",
271 "rgb:00/af/5f",
272 "rgb:00/af/87",
273 "rgb:00/af/af",
274 "rgb:00/af/d7",
275 "rgb:00/af/ff",
276 "rgb:00/d7/00",
277 "rgb:00/d7/5f",
278 "rgb:00/d7/87",
279 "rgb:00/d7/af",
280 "rgb:00/d7/d7",
281 "rgb:00/d7/ff",
282 "rgb:00/ff/00",
283 "rgb:00/ff/5f",
284 "rgb:00/ff/87",
285 "rgb:00/ff/af",
286 "rgb:00/ff/d7",
287 "rgb:00/ff/ff",
288 "rgb:5f/00/00",
289 "rgb:5f/00/5f",
290 "rgb:5f/00/87",
291 "rgb:5f/00/af",
292 "rgb:5f/00/d7",
293 "rgb:5f/00/ff",
294 "rgb:5f/5f/00",
295 "rgb:5f/5f/5f",
296 "rgb:5f/5f/87",
297 "rgb:5f/5f/af",
298 "rgb:5f/5f/d7",
299 "rgb:5f/5f/ff",
300 "rgb:5f/87/00",
301 "rgb:5f/87/5f",
302 "rgb:5f/87/87",
303 "rgb:5f/87/af",
304 "rgb:5f/87/d7",
305 "rgb:5f/87/ff",
306 "rgb:5f/af/00",
307 "rgb:5f/af/5f",
308 "rgb:5f/af/87",
309 "rgb:5f/af/af",
310 "rgb:5f/af/d7",
311 "rgb:5f/af/ff",
312 "rgb:5f/d7/00",
313 "rgb:5f/d7/5f",
314 "rgb:5f/d7/87",
315 "rgb:5f/d7/af",
316 "rgb:5f/d7/d7",
317 "rgb:5f/d7/ff",
318 "rgb:5f/ff/00",
319 "rgb:5f/ff/5f",
320 "rgb:5f/ff/87",
321 "rgb:5f/ff/af",
322 "rgb:5f/ff/d7",
323 "rgb:5f/ff/ff",
324 "rgb:87/00/00",
325 "rgb:87/00/5f",
326 "rgb:87/00/87",
327 "rgb:87/00/af",
328 "rgb:87/00/d7",
329 "rgb:87/00/ff",
330 "rgb:87/5f/00",
331 "rgb:87/5f/5f",
332 "rgb:87/5f/87",
333 "rgb:87/5f/af",
334 "rgb:87/5f/d7",
335 "rgb:87/5f/ff",
336 "rgb:87/87/00",
337 "rgb:87/87/5f",
338 "rgb:87/87/87",
339 "rgb:87/87/af",
340 "rgb:87/87/d7",
341 "rgb:87/87/ff",
342 "rgb:87/af/00",
343 "rgb:87/af/5f",
344 "rgb:87/af/87",
345 "rgb:87/af/af",
346 "rgb:87/af/d7",
347 "rgb:87/af/ff",
348 "rgb:87/d7/00",
349 "rgb:87/d7/5f",
350 "rgb:87/d7/87",
351 "rgb:87/d7/af",
352 "rgb:87/d7/d7",
353 "rgb:87/d7/ff",
354 "rgb:87/ff/00",
355 "rgb:87/ff/5f",
356 "rgb:87/ff/87",
357 "rgb:87/ff/af",
358 "rgb:87/ff/d7",
359 "rgb:87/ff/ff",
360 "rgb:af/00/00",
361 "rgb:af/00/5f",
362 "rgb:af/00/87",
363 "rgb:af/00/af",
364 "rgb:af/00/d7",
365 "rgb:af/00/ff",
366 "rgb:af/5f/00",
367 "rgb:af/5f/5f",
368 "rgb:af/5f/87",
369 "rgb:af/5f/af",
370 "rgb:af/5f/d7",
371 "rgb:af/5f/ff",
372 "rgb:af/87/00",
373 "rgb:af/87/5f",
374 "rgb:af/87/87",
375 "rgb:af/87/af",
376 "rgb:af/87/d7",
377 "rgb:af/87/ff",
378 "rgb:af/af/00",
379 "rgb:af/af/5f",
380 "rgb:af/af/87",
381 "rgb:af/af/af",
382 "rgb:af/af/d7",
383 "rgb:af/af/ff",
384 "rgb:af/d7/00",
385 "rgb:af/d7/5f",
386 "rgb:af/d7/87",
387 "rgb:af/d7/af",
388 "rgb:af/d7/d7",
389 "rgb:af/d7/ff",
390 "rgb:af/ff/00",
391 "rgb:af/ff/5f",
392 "rgb:af/ff/87",
393 "rgb:af/ff/af",
394 "rgb:af/ff/d7",
395 "rgb:af/ff/ff",
396 "rgb:d7/00/00",
397 "rgb:d7/00/5f",
398 "rgb:d7/00/87",
399 "rgb:d7/00/af",
400 "rgb:d7/00/d7",
401 "rgb:d7/00/ff",
402 "rgb:d7/5f/00",
403 "rgb:d7/5f/5f",
404 "rgb:d7/5f/87",
405 "rgb:d7/5f/af",
406 "rgb:d7/5f/d7",
407 "rgb:d7/5f/ff",
408 "rgb:d7/87/00",
409 "rgb:d7/87/5f",
410 "rgb:d7/87/87",
411 "rgb:d7/87/af",
412 "rgb:d7/87/d7",
413 "rgb:d7/87/ff",
414 "rgb:d7/af/00",
415 "rgb:d7/af/5f",
416 "rgb:d7/af/87",
417 "rgb:d7/af/af",
418 "rgb:d7/af/d7",
419 "rgb:d7/af/ff",
420 "rgb:d7/d7/00",
421 "rgb:d7/d7/5f",
422 "rgb:d7/d7/87",
423 "rgb:d7/d7/af",
424 "rgb:d7/d7/d7",
425 "rgb:d7/d7/ff",
426 "rgb:d7/ff/00",
427 "rgb:d7/ff/5f",
428 "rgb:d7/ff/87",
429 "rgb:d7/ff/af",
430 "rgb:d7/ff/d7",
431 "rgb:d7/ff/ff",
432 "rgb:ff/00/00",
433 "rgb:ff/00/5f",
434 "rgb:ff/00/87",
435 "rgb:ff/00/af",
436 "rgb:ff/00/d7",
437 "rgb:ff/00/ff",
438 "rgb:ff/5f/00",
439 "rgb:ff/5f/5f",
440 "rgb:ff/5f/87",
441 "rgb:ff/5f/af",
442 "rgb:ff/5f/d7",
443 "rgb:ff/5f/ff",
444 "rgb:ff/87/00",
445 "rgb:ff/87/5f",
446 "rgb:ff/87/87",
447 "rgb:ff/87/af",
448 "rgb:ff/87/d7",
449 "rgb:ff/87/ff",
450 "rgb:ff/af/00",
451 "rgb:ff/af/5f",
452 "rgb:ff/af/87",
453 "rgb:ff/af/af",
454 "rgb:ff/af/d7",
455 "rgb:ff/af/ff",
456 "rgb:ff/d7/00",
457 "rgb:ff/d7/5f",
458 "rgb:ff/d7/87",
459 "rgb:ff/d7/af",
460 "rgb:ff/d7/d7",
461 "rgb:ff/d7/ff",
462 "rgb:ff/ff/00",
463 "rgb:ff/ff/5f",
464 "rgb:ff/ff/87",
465 "rgb:ff/ff/af",
466 "rgb:ff/ff/d7",
467 "rgb:ff/ff/ff",
468 "rgb:08/08/08",
469 "rgb:12/12/12",
470 "rgb:1c/1c/1c",
471 "rgb:26/26/26",
472 "rgb:30/30/30",
473 "rgb:3a/3a/3a",
474 "rgb:44/44/44",
475 "rgb:4e/4e/4e",
476 "rgb:58/58/58",
477 "rgb:62/62/62",
478 "rgb:6c/6c/6c",
479 "rgb:76/76/76",
480 "rgb:80/80/80",
481 "rgb:8a/8a/8a",
482 "rgb:94/94/94",
483 "rgb:9e/9e/9e",
484 "rgb:a8/a8/a8",
485 "rgb:b2/b2/b2",
486 "rgb:bc/bc/bc",
487 "rgb:c6/c6/c6",
488 "rgb:d0/d0/d0",
489 "rgb:da/da/da",
490 "rgb:e4/e4/e4",
491 "rgb:ee/ee/ee",
492#endif
147 493
148#ifndef NO_CURSORCOLOR 494#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 495 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 496 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 497#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 498 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 499 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 500 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 501#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 502 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 503 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 504 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 505 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 506#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 507#if ENABLE_FRILLS
162 NULL, // Color_underline 508 NULL, // Color_underline
163#endif 509#endif
164#ifdef OPTION_HC 510#ifdef OPTION_HC
165 NULL, 511 NULL,
512 NULL,
166#endif 513#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 514 COLOR_SCROLLBAR,
515#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 516 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 517#endif
171#if TINTING 518#if ENABLE_TRANSPARENCY
172 NULL, 519 NULL,
173#endif 520#endif
174#if OFF_FOCUS_FADING 521#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 522 "rgb:00/00/00",
176#endif 523#endif
177 }; 524 };
178 525
179bool 526void
180rxvt_term::init_vars () 527rxvt_term::init_vars ()
181{ 528{
182 pix_colors = // 529 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 530
192 MEvent.time = CurrentTime; 531 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 532 MEvent.button = AnyButton;
194 want_refresh = 1; 533 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 534 priv_modes = SavedModes = PrivMode_Default;
196 ncol = 80; 535 ncol = 80;
197 nrow = 24; 536 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 537 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 538 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 539 lineSpace = LINESPACE;
540 letterSpace = LETTERSPACE;
201 saveLines = SAVELINES; 541 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 542
204 refresh_type = SLOW_REFRESH; 543 refresh_type = SLOW_REFRESH;
205 544
206 oldcursor.row = oldcursor.col = -1; 545 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 546
215 set_option (Opt_scrollBar); 547 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 548 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 549 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll); 550 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 551 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 552 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 553 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 554 set_option (Opt_intensityStyles);
555 set_option (Opt_iso14755);
223 set_option (Opt_iso14755_52); 556 set_option (Opt_iso14755_52);
224 557 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} 558}
261 559
262/*----------------------------------------------------------------------*/ 560/*----------------------------------------------------------------------*/
263const char ** 561const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 562rxvt_term::init_resources (int argc, const char *const *argv)
265{ 563{
266 int i, r_argc; 564 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 565 const char **cmd_argv, **r_argv;
269 566
270 /* 567 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args 568 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */ 569 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 570 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 571 if (!strcmp (argv[r_argc], "-e"))
275 break; 572 break;
276 573
574 if (r_argc == argc)
575 cmd_argv = NULL;
576 else if (!argv[r_argc + 1])
577 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
578 else
579 {
580 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
581
582 for (i = 0; i < argc - r_argc - 1; i++)
583 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
584
585 cmd_argv[i] = NULL;
586 }
587
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 588 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 589
279 for (i = 0; i < r_argc; i++) 590 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 591 r_argv[i] = (const char *)argv[i];
281 592
282 r_argv[i] = NULL; 593 r_argv[i] = NULL;
283 594
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]); 595 rs[Rs_name] = rxvt_basename (argv[0]);
297 596
298 /* 597 /*
299 * Open display, get options/resources and create the window 598 * Open display, get options/resources and create the window
300 */ 599 */
301 600
… …
303 rs[Rs_display_name] = ":0"; 602 rs[Rs_display_name] = ":0";
304 603
305 get_options (r_argc, r_argv); 604 get_options (r_argc, r_argv);
306 605
307 if (!(display = displays.get (rs[Rs_display_name]))) 606 if (!(display = displays.get (rs[Rs_display_name])))
607 {
608 free (r_argv);
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 609 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
610 }
309 611
310 // using a local pointer decreases code size a lot 612 // using a local pointer decreases code size a lot
311 xa = display->xa; 613 xa = display->xa;
312 614
313 set (display); 615 set (display);
… …
321 free (r_argv); 623 free (r_argv);
322 624
323 for (int i = NUM_RESOURCES; i--; ) 625 for (int i = NUM_RESOURCES; i--; )
324 if (rs [i] == resval_undef) 626 if (rs [i] == resval_undef)
325 rs [i] = 0; 627 rs [i] = 0;
628
629#ifdef HAVE_AFTERIMAGE
630 set_application_name ((char *)rs[Rs_name]);
631 set_output_threshold (OUTPUT_LEVEL_WARNING);
632#endif
633
634#ifdef HAVE_PIXBUF
635 g_type_init ();
636#endif
326 637
327#if ENABLE_PERL 638#if ENABLE_PERL
328 if (!rs[Rs_perl_ext_1]) 639 if (!rs[Rs_perl_ext_1])
329 rs[Rs_perl_ext_1] = "default"; 640 rs[Rs_perl_ext_1] = "default";
330 641
… …
341 * set any defaults not already set 652 * set any defaults not already set
342 */ 653 */
343 if (cmd_argv && cmd_argv[0]) 654 if (cmd_argv && cmd_argv[0])
344 { 655 {
345 if (!rs[Rs_title]) 656 if (!rs[Rs_title])
346 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 657 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
658
347 if (!rs[Rs_iconName]) 659 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_title]; 660 rs[Rs_iconName] = rs[Rs_title];
349 } 661 }
350 else 662 else
351 { 663 {
352 if (!rs[Rs_title]) 664 if (!rs[Rs_title])
353 rs[Rs_title] = rs[Rs_name]; 665 rs[Rs_title] = rs[Rs_name];
666
354 if (!rs[Rs_iconName]) 667 if (!rs[Rs_iconName])
355 rs[Rs_iconName] = rs[Rs_name]; 668 rs[Rs_iconName] = rs[Rs_name];
356 } 669 }
357 670
358 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 671 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
365 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 678 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
366 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 679 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
367 680
368 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 681 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
369 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 682 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
683
684 if (rs[Rs_letterSpace])
685 letterSpace = atoi (rs[Rs_letterSpace]);
370#endif 686#endif
371 687
372#ifdef POINTER_BLANK 688#ifdef POINTER_BLANK
373 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 689 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
374 pointerBlankDelay = i; 690 pointerBlankDelay = i;
… …
378 694
379 /* no point having a scrollbar without having any scrollback! */ 695 /* no point having a scrollbar without having any scrollback! */
380 if (!saveLines) 696 if (!saveLines)
381 set_option (Opt_scrollBar, 0); 697 set_option (Opt_scrollBar, 0);
382 698
383#ifdef PRINTPIPE
384 if (!rs[Rs_print_pipe])
385 rs[Rs_print_pipe] = PRINTPIPE;
386#endif
387
388 if (!rs[Rs_cutchars]) 699 if (!rs[Rs_cutchars])
389 rs[Rs_cutchars] = CUTCHARS; 700 rs[Rs_cutchars] = CUTCHARS;
390 701
391#ifndef NO_BACKSPACE_KEY 702#ifndef NO_BACKSPACE_KEY
392 if (!rs[Rs_backspace_key]) 703 if (!rs[Rs_backspace_key])
393# ifdef DEFAULT_BACKSPACE 704# ifdef DEFAULT_BACKSPACE
394 key_backspace = DEFAULT_BACKSPACE; 705 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
395# else 706# else
396 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 707 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
397# endif 708# endif
398 else
399 {
400 val = strdup (rs[Rs_backspace_key]);
401 rxvt_Str_trim (val);
402 rxvt_Str_escaped (val);
403 key_backspace = val;
404 }
405#endif 709#endif
406 710
407#ifndef NO_DELETE_KEY 711#ifndef NO_DELETE_KEY
408 if (!rs[Rs_delete_key]) 712 if (!rs[Rs_delete_key])
409# ifdef DEFAULT_DELETE 713# ifdef DEFAULT_DELETE
410 key_delete = DEFAULT_DELETE; 714 rs[Rs_delete_key] = DEFAULT_DELETE;
411# else 715# else
412 key_delete = "\033[3~"; 716 rs[Rs_delete_key] = "\033[3~";
413# endif 717# endif
414 else
415 {
416 val = strdup (rs[Rs_delete_key]);
417 rxvt_Str_trim (val);
418 rxvt_Str_escaped (val);
419 key_delete = val;
420 }
421#endif 718#endif
422 if (rs[Rs_answerbackstring])
423 {
424 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
425 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
426 }
427 719
428#ifdef HAVE_SCROLLBARS 720 scrollBar.setup (this);
429 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
430#endif
431 721
432#ifdef XTERM_REVERSE_VIDEO 722#ifdef XTERM_REVERSE_VIDEO
433 /* this is how xterm implements reverseVideo */ 723 /* this is how xterm implements reverseVideo */
434 if (option (Opt_reverseVideo)) 724 if (option (Opt_reverseVideo))
435 { 725 {
… …
455 color_aliases (Color_fg); 745 color_aliases (Color_fg);
456 color_aliases (Color_bg); 746 color_aliases (Color_bg);
457#ifndef NO_CURSORCOLOR 747#ifndef NO_CURSORCOLOR
458 color_aliases (Color_cursor); 748 color_aliases (Color_cursor);
459 color_aliases (Color_cursor2); 749 color_aliases (Color_cursor2);
460#endif /* NO_CURSORCOLOR */ 750#endif /* NO_CURSORCOLOR */
461 color_aliases (Color_pointer_fg); 751 color_aliases (Color_pointer_fg);
462 color_aliases (Color_pointer_bg); 752 color_aliases (Color_pointer_bg);
463 color_aliases (Color_border); 753 color_aliases (Color_border);
464#ifndef NO_BOLD_UNDERLINE_REVERSE 754#ifndef NO_BOLD_UNDERLINE_REVERSE
465 color_aliases (Color_BD); 755 color_aliases (Color_BD);
466 color_aliases (Color_UL); 756 color_aliases (Color_UL);
467 color_aliases (Color_RV); 757 color_aliases (Color_RV);
468#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 758#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
469 759
470 if (!rs[Rs_color + Color_border]) 760 if (!rs[Rs_color + Color_border])
471 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 761 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
472 762
473 return cmd_argv; 763 return cmd_argv;
764}
765
766/*----------------------------------------------------------------------*/
767void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
769{
770 this->envv = envv;
771
772 SET_R (this);
773 set_locale ("");
774 set_environ (envv); // a few things in X do not call setlocale :(
775
776 init_vars ();
777
778 const char **cmd_argv = init_resources (argc, argv);
779
780#ifdef KEYSYM_RESOURCE
781 keyboard->register_done ();
782#endif
783
784 if (const char *path = rs[Rs_chdir])
785 if (*path) // ignored if empty
786 {
787 if (*path != '/')
788 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
789
790 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 }
793
794 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
796
797 pty = ptytty::create ();
798
799 create_windows (argc, argv);
800
801 init_xlocale ();
802
803 scr_poweron (); // initialize screen
804
805#if 0
806 XSynchronize (dpy, True);
807#endif
808
809 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP
812 {
813 bgPixmap.set_target (this);
814 bgPixmap.invalidate ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bgPixmap.set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856
857#if ENABLE_PERL
858 rootwin_ev.start (display, display->root);
859#endif
860
861 set_colorfgbg ();
862
863 init_command (cmd_argv);
864
865 free (cmd_argv);
866
867 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ);
869
870 HOOK_INVOKE ((this, HOOK_START, DT_END));
871
872#if ENABLE_XEMBED
873 if (rs[Rs_embed])
874 {
875 long info[2] = { 0, XEMBED_MAPPED };
876
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2);
879 }
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]);
884
885 refresh_check ();
474} 886}
475 887
476/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
477void 889void
478rxvt_term::init_env () 890rxvt_term::init_env ()
479{ 891{
480 int i;
481 unsigned int u;
482 char *val; 892 char *val;
483 893
484#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
485 /* Fixup display_name for export over pty to any interested terminal 895 /* Fixup display_name for export over pty to any interested terminal
486 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 896 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
494 */ 904 */
495 val = rxvt_network_display (rs[Rs_display_name]); 905 val = rxvt_network_display (rs[Rs_display_name]);
496 rs[Rs_display_name] = (const char *)val; 906 rs[Rs_display_name] = (const char *)val;
497 907
498 if (val == NULL) 908 if (val == NULL)
499#endif /* DISPLAY_IS_IP */ 909#endif /* DISPLAY_IS_IP */
500 val = XDisplayString (dpy); 910 val = XDisplayString (dpy);
501 911
502 if (rs[Rs_display_name] == NULL) 912 if (rs[Rs_display_name] == NULL)
503 rs[Rs_display_name] = val; /* use broken `:0' value */ 913 rs[Rs_display_name] = val; /* use broken `:0' value */
504 914
505 i = strlen (val);
506 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
507 916
508 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
509 918
510 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
511 920
… …
532 else 941 else
533 putenv ("COLORTERM=" COLORTERMENVFULL); 942 putenv ("COLORTERM=" COLORTERMENVFULL);
534 943
535 if (rs[Rs_term_name] != NULL) 944 if (rs[Rs_term_name] != NULL)
536 { 945 {
537 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 946 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
538 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 947 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
539 putenv (env_term); 948 putenv (env_term);
540 } 949 }
541 else 950 else
542 putenv ("TERM=" TERMENV); 951 putenv ("TERM=" TERMENV);
… …
544#ifdef HAVE_UNSETENV 953#ifdef HAVE_UNSETENV
545 /* avoid passing old settings and confusing term size */ 954 /* avoid passing old settings and confusing term size */
546 unsetenv ("LINES"); 955 unsetenv ("LINES");
547 unsetenv ("COLUMNS"); 956 unsetenv ("COLUMNS");
548 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
549#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
550} 959}
551 960
552/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
553/* 962/*
554 * This is more or less stolen straight from XFree86 xterm. 963 * This is more or less stolen straight from XFree86 xterm.
… …
575 984
576 this->locale = "C"; 985 this->locale = "C";
577 } 986 }
578 987
579 988
580 this->locale = rxvt_strdup (this->locale); 989 this->locale = strdup (this->locale);
581 SET_LOCALE (this->locale); 990 SET_LOCALE (this->locale);
582 mbstate.reset (); 991 mbstate.reset ();
583#endif 992#endif
584 993
585#if HAVE_NL_LANGINFO 994#if HAVE_NL_LANGINFO
… …
642 priv_modes |= PrivMode_Keypress; 1051 priv_modes |= PrivMode_Keypress;
643 if (!option (Opt_jumpScroll)) 1052 if (!option (Opt_jumpScroll))
644 priv_modes |= PrivMode_smoothScroll; 1053 priv_modes |= PrivMode_smoothScroll;
645 1054
646#ifndef NO_BACKSPACE_KEY 1055#ifndef NO_BACKSPACE_KEY
647 if (strcmp (key_backspace, "DEC") == 0) 1056 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
648 priv_modes |= PrivMode_HaveBackSpace; 1057 priv_modes |= PrivMode_HaveBackSpace;
649#endif 1058#endif
650 1059
651 /* add value for scrollBar */ 1060 /* add value for scrollBar */
652 if (scrollBar.state) 1061 if (scrollBar.state)
… …
658 run_command (argv); 1067 run_command (argv);
659} 1068}
660 1069
661/*----------------------------------------------------------------------*/ 1070/*----------------------------------------------------------------------*/
662void 1071void
663rxvt_term::Get_Colours () 1072rxvt_term::get_colours ()
664{ 1073{
665 int i; 1074 int i;
666 1075
667#ifdef OFF_FOCUS_FADING 1076#ifdef OFF_FOCUS_FADING
668 pix_colors = pix_colors_focused; 1077 pix_colors = pix_colors_focused;
669#endif 1078#endif
670 1079
671 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1080 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
672 { 1081 {
673 const char *name = rs[Rs_color + i]; 1082 const char *name = rs[Rs_color + i];
674 1083
675 if (!name) 1084 if (!name)
… …
728 * get scrollBar shadow colors 1137 * get scrollBar shadow colors
729 * 1138 *
730 * The calculations of topShadow/bottomShadow values are adapted 1139 * The calculations of topShadow/bottomShadow values are adapted
731 * from the fvwm window manager. 1140 * from the fvwm window manager.
732 */ 1141 */
733#ifdef KEEP_SCROLLCOLOR 1142#ifdef RXVT_SCROLLBAR
734 if (depth <= 2) 1143 if (depth <= 2)
735 { 1144 {
736 /* Monochrome */ 1145 /* Monochrome */
737 alias_color (Color_scroll, Color_fg); 1146 alias_color (Color_scroll, Color_fg);
738 alias_color (Color_topShadow, Color_bg); 1147 alias_color (Color_topShadow, Color_bg);
… …
753 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1162 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
754 cscroll.a) 1163 cscroll.a)
755 )) 1164 ))
756 alias_color (Color_topShadow, Color_White); 1165 alias_color (Color_topShadow, Color_White);
757 } 1166 }
758#endif /* KEEP_SCROLLCOLOR */ 1167#endif
759 1168
760#ifdef OFF_FOCUS_FADING 1169#ifdef OFF_FOCUS_FADING
761 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1170 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
762 update_fade_color (i); 1171 update_fade_color (i);
763#endif 1172#endif
… …
771 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1180 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772 { 1181 {
773 int i = atoi (rs[Rs_color + idx]); 1182 int i = atoi (rs[Rs_color + idx]);
774 1183
775 if (i >= 8 && i <= 15) 1184 if (i >= 8 && i <= 15)
776 { /* bright colors */ 1185 /* bright colors */
777 i -= 8;
778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1186 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779 return; 1187 else if (i >= 0 && i <= 7)
780 } 1188 /* normal colors */
781
782 if (i >= 0 && i <= 7) /* normal colors */
783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1189 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784 } 1190 }
785} 1191}
786 1192
787/*----------------------------------------------------------------------*/ 1193/*----------------------------------------------------------------------*/
… …
871 1277
872 if (i) 1278 if (i)
873 ModMetaMask = modmasks[i - 1]; 1279 ModMetaMask = modmasks[i - 1];
874} 1280}
875 1281
1282void
1283rxvt_term::set_icon (const char *file)
1284{
1285#ifdef HAVE_AFTERIMAGE
1286 init_asv ();
1287
1288 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1289 if (!im)
1290 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return;
1293 }
1294
1295 unsigned int w = im->width;
1296 unsigned int h = im->height;
1297
1298 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1299 {
1300 rxvt_warn ("Icon image too big, continuing without.\n");
1301 destroy_asimage (&im);
1302 return;
1303 }
1304
1305 ASImage *result = scale_asimage (asv, im,
1306 w, h, ASA_ARGB32,
1307 100, ASIMAGE_QUALITY_DEFAULT);
1308 destroy_asimage (&im);
1309
1310 if (!result)
1311 {
1312 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1313 return;
1314 }
1315
1316 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1317 if (buffer)
1318 {
1319 ARGB32 *asbuf = result->alt.argb32;
1320 buffer [0] = w;
1321 buffer [1] = h;
1322
1323 for (unsigned int i = 0; i < w * h; ++i)
1324 buffer [i + 2] = asbuf [i];
1325
1326 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1327 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1328 free (buffer);
1329 }
1330 else
1331 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1332
1333 destroy_asimage (&result);
1334#endif
1335
1336#ifdef HAVE_PIXBUF
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf)
1339 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n");
1341 return;
1342 }
1343
1344 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1345 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1346
1347 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1348 {
1349 rxvt_warn ("Icon image too big, continuing without.\n");
1350 g_object_unref (pixbuf);
1351 return;
1352 }
1353
1354 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1355 {
1356 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1357 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1358 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1359
1360 buffer [0] = w;
1361 buffer [1] = h;
1362 for (int i = 0; i < h; i++)
1363 {
1364 for (int j = 0; j < w; j++)
1365 {
1366 unsigned char *pixel = row + j * channels;
1367 long value;
1368
1369 if (channels == 4)
1370 value = pixel[3];
1371 else
1372 value = (unsigned char)0x00ff;
1373
1374 value = (value << 8) + pixel[0];
1375 value = (value << 8) + pixel[1];
1376 value = (value << 8) + pixel[2];
1377 buffer[(i * w + j) + 2] = value;
1378 }
1379
1380 row += rowstride;
1381 }
1382
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer);
1386 }
1387 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1389
1390 g_object_unref (pixbuf);
1391#endif
1392}
1393
876/*----------------------------------------------------------------------*/ 1394/*----------------------------------------------------------------------*/
877/* rxvt_Create_Windows () - Open and map the window */ 1395/* rxvt_Create_Windows () - Open and map the window */
878void 1396void
879rxvt_term::create_windows (int argc, const char *const *argv) 1397rxvt_term::create_windows (int argc, const char *const *argv)
880{ 1398{
881 XClassHint classHint; 1399 XClassHint classHint;
882 XWMHints wmHint; 1400 XWMHints wmHint;
883#if ENABLE_FRILLS 1401#if ENABLE_FRILLS
884 MWMHints mwmhints; 1402 MWMHints mwmhints = { };
885#endif 1403#endif
886 XGCValues gcvalue; 1404 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 1405 XSetWindowAttributes attributes;
888 Window top, parent; 1406 Window top, parent;
889 1407
890 dLocal (Display *, dpy); 1408 dLocal (Display *, dpy);
891 1409
892 /* grab colors before netscape does */ 1410 /* grab colors before netscape does */
893 Get_Colours (); 1411 get_colours ();
894 1412
895 if (!set_fonts ()) 1413 if (!set_fonts ())
896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1414 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897 1415
898 parent = display->root; 1416 parent = display->root;
… …
902#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
903 if (option (Opt_borderLess)) 1421 if (option (Opt_borderLess))
904 { 1422 {
905 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1423 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 1424 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1425 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908 attributes.override_redirect = true; 1426 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 1427 }
911 else 1428 else
912 { 1429 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 1430 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 1431 }
916 } 1432 }
917 else
918 mwmhints.flags = 0;
919#endif 1433#endif
920 1434
921#if ENABLE_XEMBED 1435#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 1436 if (rs[Rs_embed])
923 { 1437 {
… …
950 this->parent[0] = top; 1464 this->parent[0] = top;
951 1465
952 old_width = szHint.width; 1466 old_width = szHint.width;
953 old_height = szHint.height; 1467 old_height = szHint.height;
954 1468
955 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1469 set_title (rs [Rs_title]);
956 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1470 set_icon_name (rs [Rs_iconName]);
957 1471
958 classHint.res_name = (char *)rs[Rs_name]; 1472 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 1473 classHint.res_class = (char *)RESCLASS;
960 1474
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1475 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
963 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1477 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 1478 wmHint.window_group = top;
965 1479
966 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1480 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 1481 &szHint, &wmHint, &classHint);
1482#if ENABLE_EWMH
1483 /*
1484 * set up icon hint
1485 * rs [Rs_iconfile] is path to icon
1486 */
1487
1488 if (rs [Rs_iconfile])
1489 {
1490 set_icon (rs [Rs_iconfile]);
1491 }
1492#endif
968 1493
969#if ENABLE_FRILLS 1494#if ENABLE_FRILLS
970 if (mwmhints.flags) 1495 if (mwmhints.flags)
971 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1496 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1497 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
977#if ENABLE_EWMH 1502#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 1503 xa[XA_NET_WM_PING],
979#endif 1504#endif
980 }; 1505 };
981 1506
982 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
983 1508
984#if ENABLE_FRILLS 1509#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 1510 if (rs[Rs_transient_for])
986 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 1512#endif
… …
1006 1531
1007 termwin_ev.start (display, top); 1532 termwin_ev.start (display, top);
1008 1533
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1534 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1535 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011
1012#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1015#endif
1016 1536
1017 /* the vt window */ 1537 /* the vt window */
1018 vt = XCreateSimpleWindow (dpy, top, 1538 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1539 window_vt_x, window_vt_y,
1020 width, height, 1540 width, height,
… …
1034 1554
1035 vt_select_input (); 1555 vt_select_input ();
1036 1556
1037 vt_ev.start (display, vt); 1557 vt_ev.start (display, vt);
1038 1558
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041#ifndef HAVE_AFTERIMAGE
1042 && !option (Opt_transparent)
1043#endif
1044 )
1045 {
1046 const char *p = rs[Rs_backgroundPixmap];
1047
1048 if ((p = strchr (p, ';')) != NULL)
1049 {
1050 p++;
1051 scale_pixmap (p);
1052 }
1053
1054 set_bgPixmap (rs[Rs_backgroundPixmap]);
1055 scr_touch (true);
1056 }
1057#endif
1058
1059 /* graphics context for the vt window */ 1559 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1560 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1561 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 0; 1562 gcvalue.graphics_exposures = 0;
1063 1563
… …
1065 GCForeground | GCBackground | GCGraphicsExposures, 1565 GCForeground | GCBackground | GCGraphicsExposures,
1066 &gcvalue); 1566 &gcvalue);
1067 1567
1068 drawable = new rxvt_drawable (this, vt); 1568 drawable = new rxvt_drawable (this, vt);
1069 1569
1070#ifdef RXVT_SCROLLBAR
1071 gcvalue.foreground = pix_colors[Color_topShadow];
1072 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1074 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077#endif
1078
1079#ifdef OFF_FOCUS_FADING 1570#ifdef OFF_FOCUS_FADING
1080 // initially we are in unfocused state 1571 // initially we are in unfocused state
1081 if (rs[Rs_fade]) 1572 if (rs[Rs_fade])
1082 pix_colors = pix_colors_unfocused; 1573 pix_colors = pix_colors_unfocused;
1083#endif 1574#endif
1084 1575
1085 pointer_unblank (); 1576 pointer_unblank ();
1086 scr_recolour (); 1577 scr_recolour ();
1087}
1088
1089/* ------------------------------------------------------------------------- *
1090 * GET TTY CURRENT STATE *
1091 * ------------------------------------------------------------------------- */
1092void
1093rxvt_get_ttymode (ttymode_t *tio, int erase)
1094{
1095 /*
1096 * standard System V termios interface
1097 */
1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1099 {
1100 // return error - use system defaults,
1101 // where possible, and zero elsewhere
1102 memset (tio, 0, sizeof (ttymode_t));
1103
1104 tio->c_cc[VINTR] = CINTR;
1105 tio->c_cc[VQUIT] = CQUIT;
1106 tio->c_cc[VERASE] = CERASE;
1107#ifdef VERASE2
1108 tio->c_cc[VERASE2] = CERASE2;
1109#endif
1110 tio->c_cc[VKILL] = CKILL;
1111 tio->c_cc[VSTART] = CSTART;
1112 tio->c_cc[VSTOP] = CSTOP;
1113 tio->c_cc[VSUSP] = CSUSP;
1114# ifdef VDSUSP
1115 tio->c_cc[VDSUSP] = CDSUSP;
1116# endif
1117# ifdef VREPRINT
1118 tio->c_cc[VREPRINT] = CRPRNT;
1119# endif
1120# ifdef VDISCRD
1121 tio->c_cc[VDISCRD] = CFLUSH;
1122# endif
1123# ifdef VWERSE
1124 tio->c_cc[VWERSE] = CWERASE;
1125# endif
1126# ifdef VLNEXT
1127 tio->c_cc[VLNEXT] = CLNEXT;
1128# endif
1129 }
1130
1131 tio->c_cc[VEOF] = CEOF;
1132 tio->c_cc[VEOL] = VDISABLE;
1133# ifdef VEOL2
1134 tio->c_cc[VEOL2] = VDISABLE;
1135# endif
1136# ifdef VSWTC
1137 tio->c_cc[VSWTC] = VDISABLE;
1138# endif
1139# ifdef VSWTCH
1140 tio->c_cc[VSWTCH] = VDISABLE;
1141# endif
1142# if VMIN != VEOF
1143 tio->c_cc[VMIN] = 1;
1144# endif
1145# if VTIME != VEOL
1146 tio->c_cc[VTIME] = 0;
1147# endif
1148
1149 if (erase != -1)
1150 tio->c_cc[VERASE] = (char)erase;
1151
1152 /* input modes */
1153 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1154# ifdef IMAXBEL
1155 | IMAXBEL
1156# endif
1157 | IXON);
1158
1159 /* output modes */
1160 tio->c_oflag = (OPOST | ONLCR);
1161
1162 /* control modes */
1163 tio->c_cflag = (CS8 | CREAD);
1164
1165 /* line discipline modes */
1166 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1167# if defined (ECHOCTL) && defined (ECHOKE)
1168 | ECHOCTL | ECHOKE
1169# endif
1170 | ECHOE | ECHOK);
1171
1172 /*
1173 * Debugging
1174 */
1175#ifdef DEBUG_TTYMODE
1176#ifdef HAVE_TERMIOS_H
1177 /* c_iflag bits */
1178 fprintf (stderr, "Input flags\n");
1179
1180 /* cpp token stringize doesn't work on all machines <sigh> */
1181# define FOO(flag,name) \
1182 if ((tio->c_iflag) & flag) \
1183 fprintf (stderr, "%s ", name)
1184
1185 /* c_iflag bits */
1186 FOO (IGNBRK, "IGNBRK");
1187 FOO (BRKINT, "BRKINT");
1188 FOO (IGNPAR, "IGNPAR");
1189 FOO (PARMRK, "PARMRK");
1190 FOO (INPCK, "INPCK");
1191 FOO (ISTRIP, "ISTRIP");
1192 FOO (INLCR, "INLCR");
1193 FOO (IGNCR, "IGNCR");
1194 FOO (ICRNL, "ICRNL");
1195 FOO (IXON, "IXON");
1196 FOO (IXOFF, "IXOFF");
1197# ifdef IUCLC
1198 FOO (IUCLC, "IUCLC");
1199# endif
1200# ifdef IXANY
1201 FOO (IXANY, "IXANY");
1202# endif
1203# ifdef IMAXBEL
1204 FOO (IMAXBEL, "IMAXBEL");
1205# endif
1206
1207 fprintf (stderr, "\n");
1208
1209# undef FOO
1210# define FOO(entry, name) \
1211 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1212
1213 FOO (VINTR, "VINTR");
1214 FOO (VQUIT, "VQUIT");
1215 FOO (VERASE, "VERASE");
1216 FOO (VKILL, "VKILL");
1217 FOO (VEOF, "VEOF");
1218 FOO (VEOL, "VEOL");
1219# ifdef VEOL2
1220 FOO (VEOL2, "VEOL2");
1221# endif
1222# ifdef VSWTC
1223 FOO (VSWTC, "VSWTC");
1224# endif
1225# ifdef VSWTCH
1226 FOO (VSWTCH, "VSWTCH");
1227# endif
1228 FOO (VSTART, "VSTART");
1229 FOO (VSTOP, "VSTOP");
1230 FOO (VSUSP, "VSUSP");
1231# ifdef VDSUSP
1232 FOO (VDSUSP, "VDSUSP");
1233# endif
1234# ifdef VREPRINT
1235 FOO (VREPRINT, "VREPRINT");
1236# endif
1237# ifdef VDISCRD
1238 FOO (VDISCRD, "VDISCRD");
1239# endif
1240# ifdef VWERSE
1241 FOO (VWERSE, "VWERSE");
1242# endif
1243# ifdef VLNEXT
1244 FOO (VLNEXT, "VLNEXT");
1245# endif
1246
1247 fprintf (stderr, "\n");
1248# undef FOO
1249# endif /* HAVE_TERMIOS_H */
1250#endif /* DEBUG_TTYMODE */
1251} 1578}
1252 1579
1253/*----------------------------------------------------------------------*/ 1580/*----------------------------------------------------------------------*/
1254/* 1581/*
1255 * Run the command in a subprocess and return a file descriptor for the 1582 * Run the command in a subprocess and return a file descriptor for the
… …
1276 else 1603 else
1277#endif 1604#endif
1278 if (!pty->get ()) 1605 if (!pty->get ())
1279 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1606 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1280 1607
1281 int er; 1608 struct termios tio = def_tio;
1282 1609
1283#ifndef NO_BACKSPACE_KEY 1610#ifndef NO_BACKSPACE_KEY
1284 if (key_backspace[0] && !key_backspace[1]) 1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1285 er = key_backspace[0]; 1612 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1286 else if (strcmp (key_backspace, "DEC") == 0) 1613 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1287 er = '\177'; /* the initial state anyway */ 1614 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1288 else
1289#endif 1615#endif
1290 er = -1;
1291 1616
1292 rxvt_get_ttymode (&tio, er); 1617 /* init terminal attributes */
1293 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1618 cfsetospeed (&tio, BAUDRATE);
1619 cfsetispeed (&tio, BAUDRATE);
1620 tcsetattr (pty->tty, TCSANOW, &tio);
1294 pty->set_utf8_mode (enc_utf8); 1621 pty->set_utf8_mode (enc_utf8);
1295 1622
1296 /* set initial window size */ 1623 /* set initial window size */
1297 tt_winch (); 1624 tt_winch ();
1298 1625
… …
1358rxvt_term::run_child (const char *const *argv) 1685rxvt_term::run_child (const char *const *argv)
1359{ 1686{
1360 char *login; 1687 char *login;
1361 1688
1362 if (option (Opt_console)) 1689 if (option (Opt_console))
1690 {
1363 { /* be virtual console, fail silently */ 1691 /* be virtual console, fail silently */
1364#ifdef TIOCCONS 1692#ifdef TIOCCONS
1365 unsigned int on = 1; 1693 unsigned int on = 1;
1366 1694
1367 ioctl (STDIN_FILENO, TIOCCONS, &on); 1695 ioctl (STDIN_FILENO, TIOCCONS, &on);
1368#elif defined (SRIOCSREDIR) 1696#elif defined (SRIOCSREDIR)
… …
1370 1698
1371 fd = open (CONSOLE, O_WRONLY, 0); 1699 fd = open (CONSOLE, O_WRONLY, 0);
1372 if (fd >= 0) 1700 if (fd >= 0)
1373 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1701 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1374 close (fd); 1702 close (fd);
1375#endif /* SRIOCSREDIR */ 1703#endif /* SRIOCSREDIR */
1376 } 1704 }
1377 1705
1378 /* reset signals and spin off the command interpreter */ 1706 /* reset signals and spin off the command interpreter */
1379 signal (SIGINT, SIG_DFL); 1707 signal (SIGINT, SIG_DFL);
1380 signal (SIGQUIT, SIG_DFL); 1708 signal (SIGQUIT, SIG_DFL);
1381 signal (SIGCHLD, SIG_DFL); 1709 signal (SIGCHLD, SIG_DFL);
1382 signal (SIGHUP, SIG_DFL); 1710 signal (SIGHUP, SIG_DFL);
1383 signal (SIGPIPE, SIG_DFL); 1711 signal (SIGPIPE, SIG_DFL);
1384 /* 1712 /*
1385 * mimick login's behavior by disabling the job control signals 1713 * mimic login's behavior by disabling the job control signals
1386 * a shell that wants them can turn them back on 1714 * a shell that wants them can turn them back on
1387 */ 1715 */
1388#ifdef SIGTSTP 1716#ifdef SIGTSTP
1389 signal (SIGTSTP, SIG_IGN); 1717 signal (SIGTSTP, SIG_IGN);
1390 signal (SIGTTIN, SIG_IGN); 1718 signal (SIGTTIN, SIG_IGN);
1391 signal (SIGTTOU, SIG_IGN); 1719 signal (SIGTTOU, SIG_IGN);
1392#endif /* SIGTSTP */ 1720#endif /* SIGTSTP */
1393
1394 // unblock signals (signals are blocked by iom.C
1395 sigset_t ss;
1396 sigemptyset (&ss);
1397 sigprocmask (SIG_SETMASK, &ss, 0);
1398 1721
1399 /* command interpreter path */ 1722 /* command interpreter path */
1400 if (argv != NULL) 1723 if (argv)
1401 { 1724 {
1402# ifdef DEBUG_CMD 1725# ifdef DEBUG_CMD
1403 int i; 1726 int i;
1404 1727
1405 for (i = 0; argv[i]; i++) 1728 for (i = 0; argv[i]; i++)
… …
1414 const char *argv0, *shell; 1737 const char *argv0, *shell;
1415 1738
1416 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1739 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1417 shell = "/bin/sh"; 1740 shell = "/bin/sh";
1418 1741
1419 argv0 = (const char *)rxvt_r_basename (shell); 1742 argv0 = rxvt_basename (shell);
1420 1743
1421 if (option (Opt_loginShell)) 1744 if (option (Opt_loginShell))
1422 { 1745 {
1423 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1746 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1424 1747
1425 login[0] = '-'; 1748 login[0] = '-';
1426 strcpy (&login[1], argv0); 1749 strcpy (&login[1], argv0);
1427 argv0 = login; 1750 argv0 = login;
1428 } 1751 }
1429 1752
1430 execlp (shell, argv0, NULL); 1753 execlp (shell, argv0, (char *)0);
1431 /* no error message: STDERR is closed! */ 1754 /* no error message: STDERR is closed! */
1432 } 1755 }
1433 1756
1434 return -1; 1757 return -1;
1435} 1758}

Diff Legend

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