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

Diff Legend

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