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

Diff Legend

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