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.159 by root, Mon Jan 30 02:21:20 2006 UTC vs.
Revision 1.308 by sf-exg, Sun Dec 18 02:14:59 2011 UTC

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

Diff Legend

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