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.163 by root, Tue Jan 31 16:57:35 2006 UTC vs.
Revision 1.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC

1/*--------------------------------*-C-*---------------------------------* 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 <schmorp@schmorp.de>
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 HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
65#ifdef DISPLAY_IS_IP
66/* On Solaris link with -lsocket and -lnsl */
67#include <sys/types.h>
68#include <sys/socket.h>
69
70/* these next two are probably only on Sun (not Solaris) */
71#ifdef HAVE_SYS_SOCKIO_H
72#include <sys/sockio.h>
73#endif
74#ifdef HAVE_SYS_BYTEORDER_H
75#include <sys/byteorder.h>
76#endif
77
78#include <netinet/in.h>
79#include <arpa/inet.h>
80#include <net/if.h>
81#include <net/if_arp.h>
82
83static char *
84rxvt_network_display (const char *display)
85{
86 char buffer[1024], *rval = NULL;
87 struct ifconf ifc;
88 struct ifreq *ifr;
89 int i, skfd;
90
91 if (display[0] != ':' && strncmp (display, "unix:", 5))
92 return (char *) display; /* nothing to do */
93
94 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
95 ifc.ifc_buf = buffer;
96
97 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
98 {
99 perror ("socket");
100 return NULL;
101 }
102
103 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
104 {
105 perror ("SIOCGIFCONF");
106 close (skfd);
107 return NULL;
108 }
109
110 for (i = 0, ifr = ifc.ifc_req;
111 i < (ifc.ifc_len / sizeof (struct ifreq));
112 i++, ifr++)
113 {
114 struct ifreq ifr2;
115
116 strcpy (ifr2.ifr_name, ifr->ifr_name);
117
118 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
119 {
120 unsigned long addr;
121 struct sockaddr_in *p_addr;
122
123 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
124 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
125
126 /*
127 * not "0.0.0.0" or "127.0.0.1" - so format the address
128 */
129 if (addr && addr != 0x7F000001)
130 {
131 char *colon = strchr (display, ':');
132
133 if (colon == NULL)
134 colon = ":0.0";
135
136 rval = rxvt_malloc (strlen (colon) + 16);
137 sprintf (rval, "%d.%d.%d.%d%s",
138 (int) ((addr >> 030) & 0xFF),
139 (int) ((addr >> 020) & 0xFF),
140 (int) ((addr >> 010) & 0xFF),
141 (int) (addr & 0xFF), colon);
142 break;
143 }
144 }
145 }
146
147 close (skfd);
148
149 return rval;
150}
151#endif
152
43const char *const def_colorName[] = 153static const char *const def_colorName[] =
44 { 154 {
45 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
47 /* low-intensity colors */ 157 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 159 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 160 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 161 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 162 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 163 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 164 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 166 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 167# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 168 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 169# endif
60 /* high-intensity colors */ 170 /* high-intensity colors */
61# ifdef XTERM_COLORS 171# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 172 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 183
184#if !USE_256_COLORS
74 // 88 xterm colours 185 // 88 xterm colours
75 "rgb:00/00/00", 186 "rgb:00/00/00",
76 "rgb:00/00/8b", 187 "rgb:00/00/8b",
77 "rgb:00/00/cd", 188 "rgb:00/00/cd",
78 "rgb:00/00/ff", 189 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 253 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 254 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 255 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 256 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
476 "rgb:08/08/08",
477 "rgb:12/12/12",
478 "rgb:1c/1c/1c",
479 "rgb:26/26/26",
480 "rgb:30/30/30",
481 "rgb:3a/3a/3a",
482 "rgb:44/44/44",
483 "rgb:4e/4e/4e",
484 "rgb:58/58/58",
485 "rgb:62/62/62",
486 "rgb:6c/6c/6c",
487 "rgb:76/76/76",
488 "rgb:80/80/80",
489 "rgb:8a/8a/8a",
490 "rgb:94/94/94",
491 "rgb:9e/9e/9e",
492 "rgb:a8/a8/a8",
493 "rgb:b2/b2/b2",
494 "rgb:bc/bc/bc",
495 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0",
497 "rgb:da/da/da",
498 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee",
500#endif
147 501
148#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 506 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 507 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 508 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 509#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 510 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 511 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 512 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 513 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 514#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 515#if ENABLE_FRILLS
162 NULL, // Color_underline 516 NULL, // Color_underline
163#endif 517#endif
164#ifdef OPTION_HC 518#ifdef OPTION_HC
165 NULL, 519 NULL,
520 NULL,
166#endif 521#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 525#endif
171#if TINTING 526#if ENABLE_TRANSPARENCY
172 NULL, 527 NULL,
173#endif 528#endif
174#if OFF_FOCUS_FADING 529#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 530 "rgb:00/00/00",
176#endif 531#endif
177 }; 532 };
178 533
179bool 534void
180rxvt_term::init_vars () 535rxvt_term::init_vars ()
181{ 536{
182 pix_colors = // 537 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 538
192 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 541 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 543 ncol = 80;
198 nrow = 24; 544 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 549 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 550
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
207 552
208 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 554
215 last_bot = last_state = -1; 555 set_option (Opt_scrollBar);
216 556 set_option (Opt_scrollTtyOutput);
217 return true; 557 set_option (Opt_jumpScroll);
218} 558 set_option (Opt_skipScroll);
219 559 set_option (Opt_secondaryScreen);
220void 560 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 561 set_option (Opt_pastableTabs);
222{ 562 set_option (Opt_intensityStyles);
223 int i; 563 set_option (Opt_iso14755);
224 564 set_option (Opt_iso14755_52);
225 /* 565 set_option (Opt_buffered);
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO);
233 }
234 else if (i > STDIN_FILENO)
235 {
236 dup2 (i, STDIN_FILENO);
237 close (i);
238 }
239
240 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 566}
253 567
254/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
255const char ** 569const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
257{ 571{
258 int i, r_argc; 572 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
261 574
262 /* 575 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 577 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 579 if (!strcmp (argv[r_argc], "-e"))
267 break; 580 break;
268
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270
271 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i];
273
274 r_argv[i] = NULL;
275 581
276 if (r_argc == argc) 582 if (r_argc == argc)
277 cmd_argv = NULL; 583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
278 else 586 else
279 { 587 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281 589
282 for (i = 0; i < argc - r_argc - 1; i++) 590 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 592
285 cmd_argv[i] = NULL; 593 cmd_argv[i] = NULL;
286 } 594 }
287 595
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 596 rs[Rs_name] = rxvt_basename (argv[0]);
289 597
290 /* 598 /*
291 * Open display, get options/resources and create the window 599 * Open display, get options/resources and create the window
292 */ 600 */
293 601
294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
295 rs[Rs_display_name] = ":0"; 603 rs[Rs_display_name] = ":0";
296 604
297 get_options (r_argc, r_argv); 605 get_options (r_argc, argv);
298 606
299 if (!(display = displays.get (rs[Rs_display_name]))) 607 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 609
610 // using a local pointer decreases code size a lot
302 xa = display->xa; 611 xa = display->xa;
612
613 set (display);
614 extract_resources ();
303 615
304#if XFT 616#if XFT
305 if (rs[Rs_depth]) 617 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 618 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 619#endif
309 set (display);
310 620
311 extract_resources (); 621 for (int i = NUM_RESOURCES; i--; )
312 622 if (rs [i] == resval_undef)
313 free (r_argv); 623 rs [i] = 0;
314 624
315#if ENABLE_PERL 625#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 626 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 627 rs[Rs_perl_ext_1] = "default";
318 628
… …
322 { 632 {
323 rxvt_perl.init (this); 633 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 634 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 } 635 }
326#endif 636#endif
637
638 // must be called after initialising the perl interpreter as it
639 // may invoke the `on_register_command' hook
640 extract_keysym_resources ();
327 641
328 /* 642 /*
329 * set any defaults not already set 643 * set any defaults not already set
330 */ 644 */
331 if (cmd_argv && cmd_argv[0]) 645 if (cmd_argv && cmd_argv[0])
332 { 646 {
333 if (!rs[Rs_title]) 647 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 648 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
649
335 if (!rs[Rs_iconName]) 650 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 651 rs[Rs_iconName] = rs[Rs_title];
337 } 652 }
338 else 653 else
339 { 654 {
340 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
341 rs[Rs_title] = rs[Rs_name]; 656 rs[Rs_title] = rs[Rs_name];
657
342 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
343 rs[Rs_iconName] = rs[Rs_name]; 659 rs[Rs_iconName] = rs[Rs_name];
344 } 660 }
345 661
346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 662 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 669 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 670 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355 671
356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 672 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
357 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 673 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
674
675 if (rs[Rs_letterSpace])
676 letterSpace = atoi (rs[Rs_letterSpace]);
358#endif 677#endif
359 678
360#ifdef POINTER_BLANK 679#ifdef POINTER_BLANK
361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
362 pointerBlankDelay = i; 681 pointerBlankDelay = i;
… …
366 685
367 /* no point having a scrollbar without having any scrollback! */ 686 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 687 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 688 set_option (Opt_scrollBar, 0);
370 689
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 690 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 691 rs[Rs_cutchars] = CUTCHARS;
378 692
379#ifndef NO_BACKSPACE_KEY 693#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 694 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 695# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 696 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 697# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 698 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 699# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 700#endif
394 701
395#ifndef NO_DELETE_KEY 702#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 703 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 704# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 705 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 706# else
400 key_delete = "\033[3~"; 707 rs[Rs_delete_key] = "\033[3~";
401# endif 708# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 709#endif
410 if (rs[Rs_answerbackstring])
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415 710
416#ifdef HAVE_SCROLLBARS 711 scrollBar.setup (this);
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif
419 712
420#ifdef XTERM_REVERSE_VIDEO 713#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 714 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 715 if (option (Opt_reverseVideo))
423 { 716 {
424 if (!rs[Rs_color + Color_fg]) 717 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 718 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
719
426 if (!rs[Rs_color + Color_bg]) 720 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 721 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 722 }
429#endif 723#endif
430 724
… …
432 if (!rs[Rs_color + i]) 726 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 727 rs[Rs_color + i] = def_colorName[i];
434 728
435#ifndef XTERM_REVERSE_VIDEO 729#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 730 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 731 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 732 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 733#endif
440 734
441 /* convenient aliases for setting fg/bg to colors */ 735 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 736 color_aliases (Color_fg);
443 color_aliases (Color_bg); 737 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 738#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 739 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 740 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 741#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 742 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 743 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 744 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 745#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 746 color_aliases (Color_BD);
453 color_aliases (Color_UL); 747 color_aliases (Color_UL);
454 color_aliases (Color_RV); 748 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 749#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 750
457 if (!rs[Rs_color + Color_border]) 751 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 752 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 753
460 return cmd_argv; 754 return cmd_argv;
755}
756
757/*----------------------------------------------------------------------*/
758void
759rxvt_term::init (int argc, const char *const *argv)
760{
761 SET_R (this);
762 set_locale ("");
763 set_environ (envv); // a few things in X do not call setlocale :(
764
765 init_vars ();
766
767 const char **cmd_argv = init_resources (argc, argv);
768
769#ifdef KEYSYM_RESOURCE
770 keyboard->register_done ();
771#endif
772
773 if (const char *path = rs[Rs_chdir])
774 if (*path) // ignored if empty
775 {
776 if (*path != '/')
777 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
778
779 if (chdir (path))
780 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
781 }
782
783 if (option (Opt_scrollBar))
784 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
785
786 pty = ptytty::create ();
787
788#ifdef HAVE_AFTERIMAGE
789 set_application_name ((char *)rs[Rs_name]);
790 set_output_threshold (OUTPUT_LEVEL_WARNING);
791#endif
792
793 // must be called before create_windows, because the latter may call set_icon
794#ifdef HAVE_PIXBUF
795 g_type_init ();
796#endif
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bg_init ();
813
814#ifdef ENABLE_TRANSPARENCY
815 if (option (Opt_transparent))
816 {
817 bg_set_transparent ();
818
819 if (rs [Rs_blurradius])
820 bg_set_blur (rs [Rs_blurradius]);
821
822 if (ISSET_PIXCOLOR (Color_tint))
823 bg_set_tint (pix_colors_focused [Color_tint]);
824
825 if (rs [Rs_shade])
826 bg_set_shade (rs [Rs_shade]);
827
828 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root);
831 }
832#endif
833
834#ifdef BG_IMAGE_FROM_FILE
835 if (rs[Rs_backgroundPixmap])
836 {
837 if (bg_set_file (rs[Rs_backgroundPixmap]))
838 if (!bg_window_position_sensitive ())
839 update_background ();
840 }
841#endif
842 }
843#endif
844
845#if ENABLE_PERL
846 rootwin_ev.start (display, display->root);
847#endif
848
849 set_colorfgbg ();
850
851 init_command (cmd_argv);
852
853 free (cmd_argv);
854
855 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ);
857
858 HOOK_INVOKE ((this, HOOK_START, DT_END));
859
860#if ENABLE_XEMBED
861 if (rs[Rs_embed])
862 {
863 long info[2] = { 0, XEMBED_MAPPED };
864
865 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
866 32, PropModeReplace, (unsigned char *)&info, 2);
867 }
868#endif
869
870#if HAVE_STARTUP_NOTIFICATION
871 SnDisplay *snDisplay;
872 SnLauncheeContext *snContext;
873
874 snDisplay = sn_display_new (dpy, NULL, NULL);
875 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
876
877 /* Tell the window manager that this window is part of the startup context */
878 if (snContext)
879 sn_launchee_context_setup_window (snContext, parent);
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent);
884
885#if HAVE_STARTUP_NOTIFICATION
886 if (snContext)
887 {
888 /* Mark the startup process as complete */
889 sn_launchee_context_complete (snContext);
890
891 sn_launchee_context_unref (snContext);
892 }
893
894 sn_display_unref (snDisplay);
895#endif
896
897 refresh_check ();
461} 898}
462 899
463/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
464void 901void
465rxvt_term::init_env () 902rxvt_term::init_env ()
466{ 903{
467 int i;
468 unsigned int u;
469 char *val; 904 char *val;
470 905
471#ifdef DISPLAY_IS_IP 906#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 907 /* Fixup display_name for export over pty to any interested terminal
473 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 908 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 916 */
482 val = rxvt_network_display (rs[Rs_display_name]); 917 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 918 rs[Rs_display_name] = (const char *)val;
484 919
485 if (val == NULL) 920 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 921#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 922 val = XDisplayString (dpy);
488 923
489 if (rs[Rs_display_name] == NULL) 924 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 925 rs[Rs_display_name] = val; /* use broken `:0' value */
491 926
492 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 927 env_display = (char *)rxvt_malloc (strlen (val) + 9);
494 928
495 sprintf (env_display, "DISPLAY=%s", val); 929 sprintf (env_display, "DISPLAY=%s", val);
496 930
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 931 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
498 932
499 /* add entries to the environment: 933 /* add entries to the environment:
500 * @ DISPLAY: in case we started with -display 934 * @ DISPLAY: in case we started with -display
501 * @ WINDOWID: X window id number of the window 935 * @ WINDOWID: X window id number of the window
502 * @ COLORTERM: terminal sub-name and also indicates its color 936 * @ COLORTERM: terminal sub-name and also indicates its color
… …
519 else 953 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 954 putenv ("COLORTERM=" COLORTERMENVFULL);
521 955
522 if (rs[Rs_term_name] != NULL) 956 if (rs[Rs_term_name] != NULL)
523 { 957 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 958 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 959 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 960 putenv (env_term);
527 } 961 }
528 else 962 else
529 putenv ("TERM=" TERMENV); 963 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 965#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 966 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 967 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 968 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 969 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 970#endif /* HAVE_UNSETENV */
537} 971}
538 972
539/*----------------------------------------------------------------------*/ 973/*----------------------------------------------------------------------*/
540/* 974/*
541 * This is more or less stolen straight from XFree86 xterm. 975 * This is more or less stolen straight from XFree86 xterm.
… …
562 996
563 this->locale = "C"; 997 this->locale = "C";
564 } 998 }
565 999
566 1000
567 this->locale = rxvt_strdup (this->locale); 1001 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 1002 SET_LOCALE (this->locale);
569 mbstate.reset (); 1003 mbstate.reset ();
570#endif 1004#endif
571 1005
572#if HAVE_NL_LANGINFO 1006#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 1050 * Initialize the command connection.
617 * This should be called after the X server connection is established. 1051 * This should be called after the X server connection is established.
618 */ 1052 */
619 1053
620#ifdef META8_OPTION 1054#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1055 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 1056#endif
623 1057
624 get_ourmods (); 1058 get_ourmods ();
625 1059
626 if (!OPTION (Opt_scrollTtyOutput)) 1060 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 1061 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 1062 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 1063 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 1064 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 1065 priv_modes |= PrivMode_smoothScroll;
632 1066
633#ifndef NO_BACKSPACE_KEY 1067#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 1068 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 1069 priv_modes |= PrivMode_HaveBackSpace;
636#endif 1070#endif
637 1071
638 /* add value for scrollBar */ 1072 /* add value for scrollBar */
639 if (scrollBar.state) 1073 if (scrollBar.state)
… …
645 run_command (argv); 1079 run_command (argv);
646} 1080}
647 1081
648/*----------------------------------------------------------------------*/ 1082/*----------------------------------------------------------------------*/
649void 1083void
650rxvt_term::Get_Colours () 1084rxvt_term::get_colours ()
651{ 1085{
652 int i; 1086 int i;
653 1087
654#ifdef OFF_FOCUS_FADING 1088#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 1089 pix_colors = pix_colors_focused;
656#endif 1090#endif
657 1091
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1092 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 1093 {
1094 const char *name = rs[Rs_color + i];
1095
1096 if (!name)
1097 continue;
1098
660 rxvt_color xcol; 1099 rxvt_color xcol;
661 1100
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 1101 if (!set_color (xcol, name))
666 { 1102 {
667#ifndef XTERM_REVERSE_VIDEO 1103#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 1104 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 1105 name = def_colorName [1 - i];
670 else 1106 else
671#endif 1107#endif
672 rs[Rs_color + i] = def_colorName[i]; 1108 name = def_colorName [i];
673 1109
674 if (!rs[Rs_color + i]) 1110 if (!name)
675 continue; 1111 continue;
676 1112
677 if (!set_color (xcol, rs[Rs_color + i])) 1113 if (!set_color (xcol, name))
678 { 1114 {
679 switch (i) 1115 switch (i)
680 { 1116 {
681 case Color_fg: 1117 case Color_fg:
682 case Color_bg: 1118 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 1119 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1120 name = "";
685 break; 1121 break;
686#ifndef NO_CURSORCOLOR 1122#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 1123 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 1124#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 1125 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 1126 name = rs[Rs_color + Color_fg];
1127 xcol.set (this, name);
693 break; 1128 break;
694 default: 1129 default:
695 xcol = pix_colors[Color_bg]; /* None */ 1130 name = rs[Rs_color + Color_bg];
1131 xcol.set (this, name);
696 break; 1132 break;
697 } 1133 }
698 } 1134 }
699 } 1135 }
700 1136
701 pix_colors[i] = xcol; 1137 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 1138 rs[Rs_color + i] = name;
703 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
711 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
712 } 1139 }
713#endif
714 1140
715 if (depth <= 2) 1141 if (depth <= 2)
716 { 1142 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1143 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 1144 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 1145 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 1146 }
721 1147
722 /* 1148 /*
723 * get scrollBar shadow colors 1149 * get scrollBar shadow colors
724 * 1150 *
725 * The calculations of topShadow/bottomShadow values are adapted 1151 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 1152 * from the fvwm window manager.
727 */ 1153 */
728#ifdef KEEP_SCROLLCOLOR 1154#ifdef RXVT_SCROLLBAR
729
730 if (depth <= 2) 1155 if (depth <= 2)
731 { 1156 {
732 /* Monochrome */ 1157 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1158 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1159 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1160 alias_color (Color_bottomShadow, Color_bg);
736 } 1161 }
737 else 1162 else
738 { 1163 {
739 rxvt_color xcol[2]; 1164 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740 /* xcol[0] == white
741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */
743 1165
744 xcol[1] = pix_colors[Color_scroll]; 1166 rgba cscroll;
745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 1167 pix_colors [Color_scroll].get (cscroll);
746
747 rxvt_rgba c0, c1;
748
749 xcol[0].get (this, c0);
750 xcol[1].get (this, c1);
751
752 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
753 1168
754 /* topShadowColor */ 1169 /* topShadowColor */
755 if (!xcol[1].set (this, 1170 if (!pix_colors[Color_topShadow].set (this,
756 rxvt_rgba ( 1171 rgba (
757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 1172 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 1173 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 1174 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary 1175 cscroll.a)
761 )); 1176 ))
762 xcol[1] = pix_colors[Color_White]; 1177 alias_color (Color_topShadow, Color_White);
763
764 pix_colors[Color_topShadow] = xcol[1];
765 } 1178 }
766#endif /* KEEP_SCROLLCOLOR */ 1179#endif
1180
1181#ifdef OFF_FOCUS_FADING
1182 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1183 update_fade_color (i);
1184#endif
767} 1185}
768 1186
769/*----------------------------------------------------------------------*/ 1187/*----------------------------------------------------------------------*/
770/* color aliases, fg/bg bright-bold */ 1188/* color aliases, fg/bg bright-bold */
771void 1189void
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1192 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 1193 {
776 int i = atoi (rs[Rs_color + idx]); 1194 int i = atoi (rs[Rs_color + idx]);
777 1195
778 if (i >= 8 && i <= 15) 1196 if (i >= 8 && i <= 15)
779 { /* bright colors */ 1197 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1198 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 1199 else if (i >= 0 && i <= 7)
783 } 1200 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1201 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 1202 }
788} 1203}
789 1204
790/*----------------------------------------------------------------------*/ 1205/*----------------------------------------------------------------------*/
… …
810 1225
811 if (rsmod 1226 if (rsmod
812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1227 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
813 requestedmeta = rsmod[3] - '0'; 1228 requestedmeta = rsmod[3] - '0';
814 1229
815 map = XGetModifierMapping (xdisp); 1230 map = XGetModifierMapping (dpy);
816 kc = map->modifiermap; 1231 kc = map->modifiermap;
817 1232
818 for (i = 1; i < 6; i++) 1233 for (i = 1; i < 6; i++)
819 { 1234 {
820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1235 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
822 for (j = map->max_keypermod; j--; k++) 1237 for (j = map->max_keypermod; j--; k++)
823 { 1238 {
824 if (kc[k] == 0) 1239 if (kc[k] == 0)
825 break; 1240 break;
826 1241
827 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1242 switch (XKeycodeToKeysym (dpy, kc[k], 0))
828 { 1243 {
829 case XK_Num_Lock: 1244 case XK_Num_Lock:
830 ModNumLockMask = modmasks[i - 1]; 1245 ModNumLockMask = modmasks[i - 1];
831 continue; 1246 continue;
832 1247
… …
874 1289
875 if (i) 1290 if (i)
876 ModMetaMask = modmasks[i - 1]; 1291 ModMetaMask = modmasks[i - 1];
877} 1292}
878 1293
1294void
1295rxvt_term::set_icon (const char *file)
1296{
1297#ifdef HAVE_AFTERIMAGE
1298 init_asv ();
1299
1300 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1301 if (!im)
1302 {
1303 rxvt_warn ("Loading image icon failed, continuing without.\n");
1304 return;
1305 }
1306
1307 unsigned int w = im->width;
1308 unsigned int h = im->height;
1309
1310 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1311 {
1312 rxvt_warn ("Icon image too big, continuing without.\n");
1313 destroy_asimage (&im);
1314 return;
1315 }
1316
1317 ASImage *result = scale_asimage (asv, im,
1318 w, h, ASA_ARGB32,
1319 100, ASIMAGE_QUALITY_DEFAULT);
1320 destroy_asimage (&im);
1321
1322 if (!result)
1323 {
1324 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1325 return;
1326 }
1327
1328 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1329 if (buffer)
1330 {
1331 ARGB32 *asbuf = result->alt.argb32;
1332 buffer [0] = w;
1333 buffer [1] = h;
1334
1335 for (unsigned int i = 0; i < w * h; ++i)
1336 buffer [i + 2] = asbuf [i];
1337
1338 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1339 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1340 free (buffer);
1341 }
1342 else
1343 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1344
1345 destroy_asimage (&result);
1346#endif
1347
1348#ifdef HAVE_PIXBUF
1349 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1350 if (!pixbuf)
1351 {
1352 rxvt_warn ("Loading image icon failed, continuing without.\n");
1353 return;
1354 }
1355
1356 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1357 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1358
1359 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1360 {
1361 rxvt_warn ("Icon image too big, continuing without.\n");
1362 g_object_unref (pixbuf);
1363 return;
1364 }
1365
1366 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1367 {
1368 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1369 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1370 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1371
1372 buffer [0] = w;
1373 buffer [1] = h;
1374 for (int i = 0; i < h; i++)
1375 {
1376 for (int j = 0; j < w; j++)
1377 {
1378 unsigned char *pixel = row + j * channels;
1379 long value;
1380
1381 if (channels == 4)
1382 value = pixel[3];
1383 else
1384 value = (unsigned char)0x00ff;
1385
1386 value = (value << 8) + pixel[0];
1387 value = (value << 8) + pixel[1];
1388 value = (value << 8) + pixel[2];
1389 buffer[(i * w + j) + 2] = value;
1390 }
1391
1392 row += rowstride;
1393 }
1394
1395 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1396 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1397 free (buffer);
1398 }
1399 else
1400 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1401
1402 g_object_unref (pixbuf);
1403#endif
1404}
1405
879/*----------------------------------------------------------------------*/ 1406/*----------------------------------------------------------------------*/
880/* rxvt_Create_Windows () - Open and map the window */ 1407/* Open and map the window */
881void 1408void
882rxvt_term::create_windows (int argc, const char *const *argv) 1409rxvt_term::create_windows (int argc, const char *const *argv)
883{ 1410{
884 XClassHint classHint; 1411 XClassHint classHint;
885 XWMHints wmHint; 1412 XWMHints wmHint;
886#if ENABLE_FRILLS 1413#if ENABLE_FRILLS
887 MWMHints mwmhints; 1414 MWMHints mwmhints = { };
888#endif 1415#endif
889 XGCValues gcvalue; 1416 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 1417 XSetWindowAttributes attributes;
891 Window top, parent; 1418 Window top, parent;
892 1419
893 dLocal (Display *, xdisp); 1420 dLocal (Display *, dpy);
894 1421
895 /* grab colors before netscape does */ 1422 /* grab colors before netscape does */
896 Get_Colours (); 1423 get_colours ();
897 1424
898 if (!set_fonts ()) 1425 if (!set_fonts ())
899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1426 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
900 1427
901 parent = display->root; 1428 parent = display->root;
902 1429
903 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1430 attributes.override_redirect = !!option (Opt_override_redirect);
904 1431
905#if ENABLE_FRILLS 1432#if ENABLE_FRILLS
906 if (OPTION (Opt_borderLess)) 1433 if (option (Opt_borderLess))
907 { 1434 {
908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1435 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 1436 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1437 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 1438 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 1439 }
914 else 1440 else
915 { 1441 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 1442 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 1443 }
919 } 1444 }
920 else
921 mwmhints.flags = 0;
922#endif 1445#endif
923 1446
924#if ENABLE_XEMBED 1447#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 1448 if (rs[Rs_embed])
926 { 1449 {
927 XWindowAttributes wattr; 1450 XWindowAttributes wattr;
928 1451
929 parent = strtol (rs[Rs_embed], 0, 0); 1452 parent = strtol (rs[Rs_embed], 0, 0);
930 1453
931 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1454 if (!XGetWindowAttributes (dpy, parent, &wattr))
932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1455 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
933 1456
934 window_calc (wattr.width, wattr.height); 1457 window_calc (wattr.width, wattr.height);
935 } 1458 }
936#endif 1459#endif
937 1460
938 window_calc (0, 0); 1461 window_calc (0, 0);
939 1462
940 /* sub-window placement & size in rxvt_resize_subwindows () */ 1463 /* sub-window placement & size in rxvt_term::resize_all_windows () */
941 attributes.background_pixel = pix_colors_focused [Color_border]; 1464 attributes.background_pixel = pix_colors_focused [Color_border];
942 attributes.border_pixel = pix_colors_focused [Color_border]; 1465 attributes.border_pixel = pix_colors_focused [Color_border];
943 attributes.colormap = cmap; 1466 attributes.colormap = cmap;
944 1467
945 top = XCreateWindow (xdisp, parent, 1468 top = XCreateWindow (dpy, parent,
946 szHint.x, szHint.y, 1469 szHint.x, szHint.y,
947 szHint.width, szHint.height, 1470 szHint.width, szHint.height,
948 ext_bwidth, 1471 ext_bwidth,
949 depth, InputOutput, visual, 1472 depth, InputOutput, visual,
950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
951 &attributes); 1474 &attributes);
952 1475
953 this->parent[0] = top; 1476 this->parent = top;
954 1477
955 old_width = szHint.width; 1478 old_width = szHint.width;
956 old_height = szHint.height; 1479 old_height = szHint.height;
957 1480
958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1481 set_title (rs [Rs_title]);
959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1482 set_icon_name (rs [Rs_iconName]);
960 1483
961 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
962 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
963 1486
964 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1487 wmHint.flags = InputHint | StateHint | WindowGroupHint;
965 wmHint.input = True; 1488 wmHint.input = True;
966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 1490 wmHint.window_group = top;
968 1491
969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 1493 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH
1495 /*
1496 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon
1498 */
1499
1500 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif
971 1505
972#if ENABLE_FRILLS 1506#if ENABLE_FRILLS
973 if (mwmhints.flags) 1507 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1509 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif 1510#endif
977 1511
978 Atom protocols[] = { 1512 Atom protocols[] = {
979 xa[XA_WM_DELETE_WINDOW], 1513 xa[XA_WM_DELETE_WINDOW],
980#if ENABLE_EWMH 1514#if ENABLE_EWMH
981 xa[XA_NET_WM_PING], 1515 xa[XA_NET_WM_PING],
982#endif 1516#endif
983 }; 1517 };
984 1518
985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1519 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
986 1520
987#if ENABLE_FRILLS 1521#if ENABLE_FRILLS
988 if (rs[Rs_transient_for]) 1522 if (rs[Rs_transient_for])
989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1523 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif 1524#endif
991 1525
992#if ENABLE_EWMH 1526#if ENABLE_EWMH
993 long pid = getpid (); 1527 long pid = getpid ();
994 1528
995 XChangeProperty (xdisp, top, 1529 XChangeProperty (dpy, top,
996 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1530 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
997 PropModeReplace, (unsigned char *)&pid, 1); 1531 PropModeReplace, (unsigned char *)&pid, 1);
998 1532
999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1533 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000#endif 1534#endif
1001 1535
1002 XSelectInput (xdisp, top, 1536 XSelectInput (dpy, top,
1003 KeyPressMask 1537 KeyPressMask
1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1538#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1005 | KeyReleaseMask 1539 | KeyReleaseMask
1006#endif 1540#endif
1007 | FocusChangeMask | VisibilityChangeMask 1541 | FocusChangeMask | VisibilityChangeMask
1008 | ExposureMask | StructureNotifyMask); 1542 | ExposureMask | StructureNotifyMask);
1009 1543
1010 termwin_ev.start (display, top); 1544 termwin_ev.start (display, top);
1011 1545
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1546 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014
1015#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1018#endif
1019 1548
1020 /* the vt window */ 1549 /* the vt window */
1021 vt = XCreateSimpleWindow (xdisp, top, 1550 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1551 window_vt_x, window_vt_y,
1023 width, height, 1552 width, height,
1024 0, 1553 0,
1025 pix_colors_focused[Color_fg], 1554 pix_colors_focused[Color_fg],
1026 pix_colors_focused[Color_bg]); 1555 pix_colors_focused[Color_bg]);
1027 1556
1028 attributes.bit_gravity = NorthWestGravity; 1557 attributes.bit_gravity = NorthWestGravity;
1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1558 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1030 1559
1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1560 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1032 1561
1033 if (OPTION (Opt_pointerBlank)) 1562 if (option (Opt_pointerBlank))
1034 vt_emask |= PointerMotionMask; 1563 vt_emask |= PointerMotionMask;
1035 else 1564 else
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1565 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1566
1038 vt_select_input (); 1567 vt_select_input ();
1039 1568
1040 vt_ev.start (display, vt); 1569 vt_ev.start (display, vt);
1041 1570
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL
1044 && !OPTION (Opt_transparent))
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 */ 1571 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1572 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1573 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 1; 1574 gcvalue.graphics_exposures = 0;
1063 1575
1064 gc = XCreateGC (xdisp, vt, 1576 gc = XCreateGC (dpy, vt,
1065 GCForeground | GCBackground | GCGraphicsExposures, 1577 GCForeground | GCBackground | GCGraphicsExposures,
1066 &gcvalue); 1578 &gcvalue);
1067 1579
1068 drawable = new rxvt_drawable (this, vt); 1580 drawable = new rxvt_drawable (this, vt);
1069
1070#ifdef RXVT_SCROLLBAR
1071 gcvalue.foreground = pix_colors[Color_topShadow];
1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1077#endif
1078 1581
1079#ifdef OFF_FOCUS_FADING 1582#ifdef OFF_FOCUS_FADING
1080 // initially we are in unfocused state 1583 // initially we are in unfocused state
1081 if (rs[Rs_fade]) 1584 if (rs[Rs_fade])
1082 pix_colors = pix_colors_unfocused; 1585 pix_colors = pix_colors_unfocused;
1083#endif 1586#endif
1084 1587
1085 pointer_unblank (); 1588 pointer_unblank ();
1086 scr_recolour (); 1589 scr_recolour ();
1087}
1088
1089/* ------------------------------------------------------------------------- *
1090 * GET TTY CURRENT STATE *
1091 * ------------------------------------------------------------------------- */
1092void
1093rxvt_get_ttymode (ttymode_t *tio, int erase)
1094{
1095#ifdef HAVE_TERMIOS_H
1096 /*
1097 * standard System V termios interface
1098 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1100 {
1101 // return error - use system defaults,
1102 // where possible, and zero elsewhere
1103 memset (tio, 0, sizeof (ttymode_t));
1104
1105 tio->c_cc[VINTR] = CINTR;
1106 tio->c_cc[VQUIT] = CQUIT;
1107 tio->c_cc[VERASE] = CERASE;
1108#ifdef VERASE2
1109 tio->c_cc[VERASE2] = CERASE2;
1110#endif
1111 tio->c_cc[VKILL] = CKILL;
1112 tio->c_cc[VSTART] = CSTART;
1113 tio->c_cc[VSTOP] = CSTOP;
1114 tio->c_cc[VSUSP] = CSUSP;
1115# ifdef VDSUSP
1116 tio->c_cc[VDSUSP] = CDSUSP;
1117# endif
1118# ifdef VREPRINT
1119 tio->c_cc[VREPRINT] = CRPRNT;
1120# endif
1121# ifdef VDISCRD
1122 tio->c_cc[VDISCRD] = CFLUSH;
1123# endif
1124# ifdef VWERSE
1125 tio->c_cc[VWERSE] = CWERASE;
1126# endif
1127# ifdef VLNEXT
1128 tio->c_cc[VLNEXT] = CLNEXT;
1129# endif
1130 }
1131
1132 tio->c_cc[VEOF] = CEOF;
1133 tio->c_cc[VEOL] = VDISABLE;
1134# ifdef VEOL2
1135 tio->c_cc[VEOL2] = VDISABLE;
1136# endif
1137# ifdef VSWTC
1138 tio->c_cc[VSWTC] = VDISABLE;
1139# endif
1140# ifdef VSWTCH
1141 tio->c_cc[VSWTCH] = VDISABLE;
1142# endif
1143# if VMIN != VEOF
1144 tio->c_cc[VMIN] = 1;
1145# endif
1146# if VTIME != VEOL
1147 tio->c_cc[VTIME] = 0;
1148# endif
1149
1150 if (erase != -1)
1151 tio->c_cc[VERASE] = (char)erase;
1152
1153 /* input modes */
1154 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1155# ifdef IMAXBEL
1156 | IMAXBEL
1157# endif
1158 | IXON);
1159
1160 /* output modes */
1161 tio->c_oflag = (OPOST | ONLCR);
1162
1163 /* control modes */
1164 tio->c_cflag = (CS8 | CREAD);
1165
1166 /* line discipline modes */
1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1168# if defined (ECHOCTL) && defined (ECHOKE)
1169 | ECHOCTL | ECHOKE
1170# endif
1171 | ECHOE | ECHOK);
1172# else /* HAVE_TERMIOS_H */
1173
1174 /*
1175 * sgtty interface
1176 */
1177
1178 /* get parameters -- gtty */
1179 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1180 {
1181 tio->sg.sg_erase = CERASE; /* ^H */
1182 tio->sg.sg_kill = CKILL; /* ^U */
1183 }
1184
1185 if (erase != -1)
1186 tio->sg.sg_erase = (char)erase;
1187
1188 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1189
1190 /* get special characters */
1191 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1192 {
1193 tio->tc.t_intrc = CINTR; /* ^C */
1194 tio->tc.t_quitc = CQUIT; /* ^\ */
1195 tio->tc.t_startc = CSTART; /* ^Q */
1196 tio->tc.t_stopc = CSTOP; /* ^S */
1197 tio->tc.t_eofc = CEOF; /* ^D */
1198 tio->tc.t_brkc = -1;
1199 }
1200
1201 /* get local special chars */
1202 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1203 {
1204 tio->lc.t_suspc = CSUSP; /* ^Z */
1205 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1206 tio->lc.t_rprntc = CRPRNT; /* ^R */
1207 tio->lc.t_flushc = CFLUSH; /* ^O */
1208 tio->lc.t_werasc = CWERASE; /* ^W */
1209 tio->lc.t_lnextc = CLNEXT; /* ^V */
1210 }
1211 /* get line discipline */
1212 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1213# ifdef NTTYDISC
1214 tio->line = NTTYDISC;
1215# endif /* NTTYDISC */
1216
1217 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1218#endif /* HAVE_TERMIOS_H */
1219
1220 /*
1221 * Debugging
1222 */
1223#ifdef DEBUG_TTYMODE
1224#ifdef HAVE_TERMIOS_H
1225 /* c_iflag bits */
1226 fprintf (stderr, "Input flags\n");
1227
1228 /* cpp token stringize doesn't work on all machines <sigh> */
1229# define FOO(flag,name) \
1230 if ((tio->c_iflag) & flag) \
1231 fprintf (stderr, "%s ", name)
1232
1233 /* c_iflag bits */
1234 FOO (IGNBRK, "IGNBRK");
1235 FOO (BRKINT, "BRKINT");
1236 FOO (IGNPAR, "IGNPAR");
1237 FOO (PARMRK, "PARMRK");
1238 FOO (INPCK, "INPCK");
1239 FOO (ISTRIP, "ISTRIP");
1240 FOO (INLCR, "INLCR");
1241 FOO (IGNCR, "IGNCR");
1242 FOO (ICRNL, "ICRNL");
1243 FOO (IXON, "IXON");
1244 FOO (IXOFF, "IXOFF");
1245# ifdef IUCLC
1246 FOO (IUCLC, "IUCLC");
1247# endif
1248# ifdef IXANY
1249 FOO (IXANY, "IXANY");
1250# endif
1251# ifdef IMAXBEL
1252 FOO (IMAXBEL, "IMAXBEL");
1253# endif
1254
1255 fprintf (stderr, "\n");
1256
1257# undef FOO
1258# define FOO(entry, name) \
1259 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1260
1261 FOO (VINTR, "VINTR");
1262 FOO (VQUIT, "VQUIT");
1263 FOO (VERASE, "VERASE");
1264 FOO (VKILL, "VKILL");
1265 FOO (VEOF, "VEOF");
1266 FOO (VEOL, "VEOL");
1267# ifdef VEOL2
1268 FOO (VEOL2, "VEOL2");
1269# endif
1270# ifdef VSWTC
1271 FOO (VSWTC, "VSWTC");
1272# endif
1273# ifdef VSWTCH
1274 FOO (VSWTCH, "VSWTCH");
1275# endif
1276 FOO (VSTART, "VSTART");
1277 FOO (VSTOP, "VSTOP");
1278 FOO (VSUSP, "VSUSP");
1279# ifdef VDSUSP
1280 FOO (VDSUSP, "VDSUSP");
1281# endif
1282# ifdef VREPRINT
1283 FOO (VREPRINT, "VREPRINT");
1284# endif
1285# ifdef VDISCRD
1286 FOO (VDISCRD, "VDISCRD");
1287# endif
1288# ifdef VWERSE
1289 FOO (VWERSE, "VWERSE");
1290# endif
1291# ifdef VLNEXT
1292 FOO (VLNEXT, "VLNEXT");
1293# endif
1294
1295 fprintf (stderr, "\n");
1296# undef FOO
1297# endif /* HAVE_TERMIOS_H */
1298#endif /* DEBUG_TTYMODE */
1299} 1590}
1300 1591
1301/*----------------------------------------------------------------------*/ 1592/*----------------------------------------------------------------------*/
1302/* 1593/*
1303 * Run the command in a subprocess and return a file descriptor for the 1594 * Run the command in a subprocess and return a file descriptor for the
… …
1324 else 1615 else
1325#endif 1616#endif
1326 if (!pty->get ()) 1617 if (!pty->get ())
1327 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1328 1619
1620 struct termios tio = def_tio;
1621
1622#ifndef NO_BACKSPACE_KEY
1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1624 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1625 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1626 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1627#endif
1628
1629 /* init terminal attributes */
1630 cfsetospeed (&tio, BAUDRATE);
1631 cfsetispeed (&tio, BAUDRATE);
1632 tcsetattr (pty->tty, TCSANOW, &tio);
1329 pty->set_utf8_mode (enc_utf8); 1633 pty->set_utf8_mode (enc_utf8);
1330 1634
1331 /* set initial window size */ 1635 /* set initial window size */
1332 tt_winch (); 1636 tt_winch ();
1333
1334 int er;
1335
1336#ifndef NO_BACKSPACE_KEY
1337 if (key_backspace[0] && !key_backspace[1])
1338 er = key_backspace[0];
1339 else if (strcmp (key_backspace, "DEC") == 0)
1340 er = '\177'; /* the initial state anyway */
1341 else
1342#endif
1343 er = -1;
1344
1345 rxvt_get_ttymode (&tio, er);
1346 1637
1347#if ENABLE_FRILLS 1638#if ENABLE_FRILLS
1348 if (rs[Rs_pty_fd]) 1639 if (rs[Rs_pty_fd])
1349 return; 1640 return;
1350#endif 1641#endif
… …
1381 } 1672 }
1382 1673
1383 _exit (EXIT_FAILURE); 1674 _exit (EXIT_FAILURE);
1384 1675
1385 default: 1676 default:
1386 if (!OPTION (Opt_utmpInhibit)) 1677 if (!option (Opt_utmpInhibit))
1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1678 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1388 1679
1389 pty->close_tty (); 1680 pty->close_tty ();
1390 1681
1391 child_ev.start (cmd_pid); 1682 child_ev.start (cmd_pid);
1392 1683
… …
1405int 1696int
1406rxvt_term::run_child (const char *const *argv) 1697rxvt_term::run_child (const char *const *argv)
1407{ 1698{
1408 char *login; 1699 char *login;
1409 1700
1410 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1411
1412 if (OPTION (Opt_console)) 1701 if (option (Opt_console))
1702 {
1413 { /* be virtual console, fail silently */ 1703 /* be virtual console, fail silently */
1414#ifdef TIOCCONS 1704#ifdef TIOCCONS
1415 unsigned int on = 1; 1705 unsigned int on = 1;
1416 1706
1417 ioctl (STDIN_FILENO, TIOCCONS, &on); 1707 ioctl (STDIN_FILENO, TIOCCONS, &on);
1418#elif defined (SRIOCSREDIR) 1708#elif defined (SRIOCSREDIR)
… …
1420 1710
1421 fd = open (CONSOLE, O_WRONLY, 0); 1711 fd = open (CONSOLE, O_WRONLY, 0);
1422 if (fd >= 0) 1712 if (fd >= 0)
1423 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1713 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1424 close (fd); 1714 close (fd);
1425#endif /* SRIOCSREDIR */ 1715#endif /* SRIOCSREDIR */
1426 } 1716 }
1427 1717
1428 /* reset signals and spin off the command interpreter */ 1718 /* reset signals and spin off the command interpreter */
1429 signal (SIGINT, SIG_DFL); 1719 signal (SIGINT, SIG_DFL);
1430 signal (SIGQUIT, SIG_DFL); 1720 signal (SIGQUIT, SIG_DFL);
1431 signal (SIGCHLD, SIG_DFL); 1721 signal (SIGCHLD, SIG_DFL);
1432 signal (SIGHUP, SIG_DFL); 1722 signal (SIGHUP, SIG_DFL);
1433 signal (SIGPIPE, SIG_DFL); 1723 signal (SIGPIPE, SIG_DFL);
1434 /* 1724 /*
1435 * mimick login's behavior by disabling the job control signals 1725 * mimic login's behavior by disabling the job control signals
1436 * a shell that wants them can turn them back on 1726 * a shell that wants them can turn them back on
1437 */ 1727 */
1438#ifdef SIGTSTP 1728#ifdef SIGTSTP
1439 signal (SIGTSTP, SIG_IGN); 1729 signal (SIGTSTP, SIG_IGN);
1440 signal (SIGTTIN, SIG_IGN); 1730 signal (SIGTTIN, SIG_IGN);
1441 signal (SIGTTOU, SIG_IGN); 1731 signal (SIGTTOU, SIG_IGN);
1442#endif /* SIGTSTP */ 1732#endif /* SIGTSTP */
1443
1444 // unblock signals (signals are blocked by iom.C
1445 sigset_t ss;
1446 sigemptyset (&ss);
1447 sigprocmask (SIG_SETMASK, &ss, 0);
1448 1733
1449 /* command interpreter path */ 1734 /* command interpreter path */
1450 if (argv != NULL) 1735 if (argv)
1451 { 1736 {
1452# ifdef DEBUG_CMD 1737# ifdef DEBUG_CMD
1453 int i; 1738 int i;
1454 1739
1455 for (i = 0; argv[i]; i++) 1740 for (i = 0; argv[i]; i++)
… …
1464 const char *argv0, *shell; 1749 const char *argv0, *shell;
1465 1750
1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1751 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1467 shell = "/bin/sh"; 1752 shell = "/bin/sh";
1468 1753
1469 argv0 = (const char *)rxvt_r_basename (shell); 1754 argv0 = rxvt_basename (shell);
1470 1755
1471 if (OPTION (Opt_loginShell)) 1756 if (option (Opt_loginShell))
1472 { 1757 {
1473 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1758 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1474 1759
1475 login[0] = '-'; 1760 login[0] = '-';
1476 strcpy (&login[1], argv0); 1761 strcpy (&login[1], argv0);
1477 argv0 = login; 1762 argv0 = login;
1478 } 1763 }
1479 1764
1480 execlp (shell, argv0, NULL); 1765 execlp (shell, argv0, (char *)0);
1481 /* no error message: STDERR is closed! */ 1766 /* no error message: STDERR is closed! */
1482 } 1767 }
1483 1768
1484 return -1; 1769 return -1;
1485} 1770}

Diff Legend

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