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.167 by root, Tue Jan 31 19:54:39 2006 UTC vs.
Revision 1.319 by sf-exg, Thu Jan 19 13:33:43 2012 UTC

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

Diff Legend

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