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.158 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.306 by sf-exg, Tue Dec 6 11:39:30 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 "Black", /* 0: black (#000000) */ 158 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 159 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 160 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 161 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 162 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 163 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 164 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 166 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 167# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 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 "Grey30", /* 8: bright black (#4D4D4D) */ 172 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 173# else
64 "Grey25", /* 8: bright black (#404040) */ 174 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 175# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 176 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 177 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 178 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 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 "black", 530 "rgb:00/00/00",
176#endif 531#endif
177 }; 532 };
178 533
179bool 534void
180rxvt_term::init_vars () 535rxvt_term::init_vars ()
181{ 536{
182 pix_colors = // 537 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 538
192 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 541 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 543 ncol = 80;
198 nrow = 24; 544 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 549 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 550
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
207 552
208 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 554
215 last_bot = last_state = -1; 555 set_option (Opt_scrollBar);
216 556 set_option (Opt_scrollTtyOutput);
217 return true; 557 set_option (Opt_jumpScroll);
218} 558 set_option (Opt_skipScroll);
219 559 set_option (Opt_secondaryScreen);
220void 560 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 561 set_option (Opt_pastableTabs);
222{ 562 set_option (Opt_intensityStyles);
223 int i; 563 set_option (Opt_iso14755);
224 564 set_option (Opt_iso14755_52);
225 /* 565 set_option (Opt_buffered);
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO);
233 }
234 else if (i > STDIN_FILENO)
235 {
236 dup2 (i, STDIN_FILENO);
237 close (i);
238 }
239
240 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 566}
253 567
254/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
255const char ** 569const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
257{ 571{
258 int i, r_argc; 572 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
261 574
262 /* 575 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 577 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 579 if (!strcmp (argv[r_argc], "-e"))
267 break; 580 break;
268
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270
271 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i];
273
274 r_argv[i] = NULL;
275 581
276 if (r_argc == argc) 582 if (r_argc == argc)
277 cmd_argv = NULL; 583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
278 else 586 else
279 {
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]; 587 cmd_argv = (const char **)argv + r_argc + 1;
284 588
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 589 rs[Rs_name] = rxvt_basename (argv[0]);
289 590
290 /* 591 /*
291 * Open display, get options/resources and create the window 592 * Open display, get options/resources and create the window
292 */ 593 */
293 594
294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
295 rs[Rs_display_name] = ":0"; 596 rs[Rs_display_name] = ":0";
296 597
297 get_options (r_argc, r_argv); 598 get_options (r_argc, argv);
298 599
299 if (!(display = displays.get (rs[Rs_display_name]))) 600 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 601 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 602
603 // using a local pointer decreases code size a lot
302 xa = display->xa; 604 xa = display->xa;
303 605
304#if ENABLE_FRILLS 606 set (display);
607 extract_resources ();
608
609#if XFT
305 if (rs[Rs_depth]) 610 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 611 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 612#endif
309 set (display);
310 613
311 extract_resources (); 614 for (int i = NUM_RESOURCES; i--; )
312 615 if (rs [i] == resval_undef)
313 free (r_argv); 616 rs [i] = 0;
314 617
315#if ENABLE_PERL 618#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 619 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 620 rs[Rs_perl_ext_1] = "default";
318 621
… …
322 { 625 {
323 rxvt_perl.init (this); 626 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 627 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 } 628 }
326#endif 629#endif
630
631 // must be called after initialising the perl interpreter as it
632 // may invoke the `on_register_command' hook
633 extract_keysym_resources ();
327 634
328 /* 635 /*
329 * set any defaults not already set 636 * set any defaults not already set
330 */ 637 */
331 if (cmd_argv && cmd_argv[0]) 638 if (cmd_argv && cmd_argv[0])
332 { 639 {
333 if (!rs[Rs_title]) 640 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 641 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
642
335 if (!rs[Rs_iconName]) 643 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 644 rs[Rs_iconName] = rs[Rs_title];
337 } 645 }
338 else 646 else
339 { 647 {
340 if (!rs[Rs_title]) 648 if (!rs[Rs_title])
341 rs[Rs_title] = rs[Rs_name]; 649 rs[Rs_title] = rs[Rs_name];
650
342 if (!rs[Rs_iconName]) 651 if (!rs[Rs_iconName])
343 rs[Rs_iconName] = rs[Rs_name]; 652 rs[Rs_iconName] = rs[Rs_name];
344 } 653 }
345 654
346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 655 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 662 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 663 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355 664
356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 665 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
357 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 666 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
667
668 if (rs[Rs_letterSpace])
669 letterSpace = atoi (rs[Rs_letterSpace]);
358#endif 670#endif
359 671
360#ifdef POINTER_BLANK 672#ifdef POINTER_BLANK
361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
362 pointerBlankDelay = i; 674 pointerBlankDelay = i;
… …
366 678
367 /* no point having a scrollbar without having any scrollback! */ 679 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 680 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 681 set_option (Opt_scrollBar, 0);
370 682
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 683 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 684 rs[Rs_cutchars] = CUTCHARS;
378 685
379#ifndef NO_BACKSPACE_KEY 686#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 687 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 688# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 689 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 690# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 691 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 692# 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 693#endif
394 694
395#ifndef NO_DELETE_KEY 695#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 696 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 697# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 698 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 699# else
400 key_delete = "\033[3~"; 700 rs[Rs_delete_key] = "\033[3~";
401# endif 701# 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 702#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 703
416#ifdef HAVE_SCROLLBARS 704 scrollBar.setup (this);
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif
419 705
420#ifdef XTERM_REVERSE_VIDEO 706#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 707 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 708 if (option (Opt_reverseVideo))
423 { 709 {
424 if (!rs[Rs_color + Color_fg]) 710 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 711 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
712
426 if (!rs[Rs_color + Color_bg]) 713 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 714 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 715 }
429#endif 716#endif
430 717
… …
432 if (!rs[Rs_color + i]) 719 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 720 rs[Rs_color + i] = def_colorName[i];
434 721
435#ifndef XTERM_REVERSE_VIDEO 722#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 723 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 724 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 725 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 726#endif
440 727
441 /* convenient aliases for setting fg/bg to colors */ 728 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 729 color_aliases (Color_fg);
443 color_aliases (Color_bg); 730 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 731#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 732 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 733 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 734#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 735 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 736 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 737 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 738#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 739 color_aliases (Color_BD);
453 color_aliases (Color_UL); 740 color_aliases (Color_UL);
454 color_aliases (Color_RV); 741 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 742#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 743
457 if (!rs[Rs_color + Color_border]) 744 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 745 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 746
460 return cmd_argv; 747 return cmd_argv;
748}
749
750/*----------------------------------------------------------------------*/
751void
752rxvt_term::init (int argc, const char *const *argv)
753{
754 SET_R (this);
755 set_locale ("");
756 set_environ (envv); // a few things in X do not call setlocale :(
757
758 init_vars ();
759
760 const char **cmd_argv = init_resources (argc, argv);
761
762#ifdef KEYSYM_RESOURCE
763 keyboard->register_done ();
764#endif
765
766 if (const char *path = rs[Rs_chdir])
767 if (*path) // ignored if empty
768 {
769 if (*path != '/')
770 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
771
772 if (chdir (path))
773 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
774 }
775
776 if (option (Opt_scrollBar))
777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
778
779 pty = ptytty::create ();
780
781#ifdef HAVE_AFTERIMAGE
782 set_application_name ((char *)rs[Rs_name]);
783 set_output_threshold (OUTPUT_LEVEL_WARNING);
784#endif
785
786 // must be called before create_windows, because the latter may call set_icon
787#ifdef HAVE_PIXBUF
788 g_type_init ();
789#endif
790
791 create_windows (argc, argv);
792
793 init_xlocale ();
794
795 scr_poweron (); // initialize screen
796
797#if 0
798 XSynchronize (dpy, True);
799#endif
800
801 if (option (Opt_scrollBar))
802 scrollBar.resize (); /* create and map scrollbar */
803#ifdef HAVE_BG_PIXMAP
804 {
805 bg_init ();
806
807#ifdef ENABLE_TRANSPARENCY
808 if (option (Opt_transparent))
809 {
810 bg_set_transparent ();
811
812 if (rs [Rs_blurradius])
813 bg_set_blur (rs [Rs_blurradius]);
814
815 if (ISSET_PIXCOLOR (Color_tint))
816 bg_set_tint (pix_colors_focused [Color_tint]);
817
818 if (rs [Rs_shade])
819 bg_set_shade (rs [Rs_shade]);
820
821 bg_set_root_pixmap ();
822 XSelectInput (dpy, display->root, PropertyChangeMask);
823 rootwin_ev.start (display, display->root);
824 }
825#endif
826
827#ifdef BG_IMAGE_FROM_FILE
828 if (rs[Rs_backgroundPixmap])
829 {
830 if (bg_set_file (rs[Rs_backgroundPixmap]))
831 if (!bg_window_position_sensitive ())
832 update_background ();
833 }
834#endif
835 }
836#endif
837
838#if ENABLE_PERL
839 rootwin_ev.start (display, display->root);
840#endif
841
842 set_colorfgbg ();
843
844 init_command (cmd_argv);
845
846 if (pty->pty >= 0)
847 pty_ev.start (pty->pty, ev::READ);
848
849 HOOK_INVOKE ((this, HOOK_START, DT_END));
850
851#if ENABLE_XEMBED
852 if (rs[Rs_embed])
853 {
854 long info[2] = { 0, XEMBED_MAPPED };
855
856 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
857 32, PropModeReplace, (unsigned char *)&info, 2);
858 }
859#endif
860
861#if HAVE_STARTUP_NOTIFICATION
862 SnDisplay *snDisplay;
863 SnLauncheeContext *snContext;
864
865 snDisplay = sn_display_new (dpy, NULL, NULL);
866 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
867
868 /* Tell the window manager that this window is part of the startup context */
869 if (snContext)
870 sn_launchee_context_setup_window (snContext, parent);
871#endif
872
873 XMapWindow (dpy, vt);
874 XMapWindow (dpy, parent);
875
876#if HAVE_STARTUP_NOTIFICATION
877 if (snContext)
878 {
879 /* Mark the startup process as complete */
880 sn_launchee_context_complete (snContext);
881
882 sn_launchee_context_unref (snContext);
883 }
884
885 sn_display_unref (snDisplay);
886#endif
887
888 refresh_check ();
461} 889}
462 890
463/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
464void 892void
465rxvt_term::init_env () 893rxvt_term::init_env ()
466{ 894{
467 int i;
468 unsigned int u;
469 char *val; 895 char *val;
470 896
471#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 898 /* 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 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 907 */
482 val = rxvt_network_display (rs[Rs_display_name]); 908 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 909 rs[Rs_display_name] = (const char *)val;
484 910
485 if (val == NULL) 911 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 912#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 913 val = XDisplayString (dpy);
488 914
489 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
491 917
492 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
494 919
495 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
496 921
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
498 923
499 /* add entries to the environment: 924 /* add entries to the environment:
500 * @ DISPLAY: in case we started with -display 925 * @ DISPLAY: in case we started with -display
501 * @ WINDOWID: X window id number of the window 926 * @ WINDOWID: X window id number of the window
502 * @ COLORTERM: terminal sub-name and also indicates its color 927 * @ COLORTERM: terminal sub-name and also indicates its color
… …
519 else 944 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 945 putenv ("COLORTERM=" COLORTERMENVFULL);
521 946
522 if (rs[Rs_term_name] != NULL) 947 if (rs[Rs_term_name] != NULL)
523 { 948 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 949 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 950 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 951 putenv (env_term);
527 } 952 }
528 else 953 else
529 putenv ("TERM=" TERMENV); 954 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 956#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 957 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 958 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 959 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 960 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 961#endif /* HAVE_UNSETENV */
537} 962}
538 963
539/*----------------------------------------------------------------------*/ 964/*----------------------------------------------------------------------*/
540/* 965/*
541 * This is more or less stolen straight from XFree86 xterm. 966 * This is more or less stolen straight from XFree86 xterm.
… …
562 987
563 this->locale = "C"; 988 this->locale = "C";
564 } 989 }
565 990
566 991
567 this->locale = rxvt_strdup (this->locale); 992 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 993 SET_LOCALE (this->locale);
569 mbstate.reset (); 994 mbstate.reset ();
570#endif 995#endif
571 996
572#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 1041 * Initialize the command connection.
617 * This should be called after the X server connection is established. 1042 * This should be called after the X server connection is established.
618 */ 1043 */
619 1044
620#ifdef META8_OPTION 1045#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1046 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 1047#endif
623 1048
624 get_ourmods (); 1049 get_ourmods ();
625 1050
626 if (!OPTION (Opt_scrollTtyOutput)) 1051 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 1052 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 1053 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 1054 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 1055 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 1056 priv_modes |= PrivMode_smoothScroll;
632 1057
633#ifndef NO_BACKSPACE_KEY 1058#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 1059 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 1060 priv_modes |= PrivMode_HaveBackSpace;
636#endif 1061#endif
637 1062
638 /* add value for scrollBar */ 1063 /* add value for scrollBar */
639 if (scrollBar.state) 1064 if (scrollBar.state)
… …
645 run_command (argv); 1070 run_command (argv);
646} 1071}
647 1072
648/*----------------------------------------------------------------------*/ 1073/*----------------------------------------------------------------------*/
649void 1074void
650rxvt_term::Get_Colours () 1075rxvt_term::get_colours ()
651{ 1076{
652 int i; 1077 int i;
653 1078
654#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 1080 pix_colors = pix_colors_focused;
656#endif 1081#endif
657 1082
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1083 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 1084 {
1085 const char *name = rs[Rs_color + i];
1086
1087 if (!name)
1088 continue;
1089
660 rxvt_color xcol; 1090 rxvt_color xcol;
661 1091
662 if (!rs[Rs_color + i]) 1092 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 1093 {
667#ifndef XTERM_REVERSE_VIDEO 1094#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 1095 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 1096 name = def_colorName [1 - i];
670 else 1097 else
671#endif 1098#endif
672 rs[Rs_color + i] = def_colorName[i]; 1099 name = def_colorName [i];
673 1100
674 if (!rs[Rs_color + i]) 1101 if (!name)
675 continue; 1102 continue;
676 1103
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1104 if (!set_color (xcol, name))
678 { 1105 {
679 switch (i) 1106 switch (i)
680 { 1107 {
681 case Color_fg: 1108 case Color_fg:
682 case Color_bg: 1109 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 1110 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 1111 name = "";
686 break; 1112 break;
687#ifndef NO_CURSORCOLOR 1113#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 1114 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 1115#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 1116 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 1117 name = rs[Rs_color + Color_fg];
1118 xcol.set (this, name);
694 break; 1119 break;
695 default: 1120 default:
696 xcol = pix_colors[Color_bg]; /* None */ 1121 name = rs[Rs_color + Color_bg];
1122 xcol.set (this, name);
697 break; 1123 break;
698 } 1124 }
699 } 1125 }
700 } 1126 }
701 1127
702 pix_colors[i] = xcol; 1128 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 1129 rs[Rs_color + i] = name;
704 } 1130 }
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 1131
712 if (depth <= 2) 1132 if (depth <= 2)
713 { 1133 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 1134 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]; 1135 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]; 1136 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 1137 }
718 1138
719 /* 1139 /*
720 * get scrollBar shadow colors 1140 * get scrollBar shadow colors
721 * 1141 *
722 * The calculations of topShadow/bottomShadow values are adapted 1142 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 1143 * from the fvwm window manager.
724 */ 1144 */
725#ifdef KEEP_SCROLLCOLOR 1145#ifdef RXVT_SCROLLBAR
726
727 if (depth <= 2) 1146 if (depth <= 2)
728 { 1147 {
729 /* Monochrome */ 1148 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 1149 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 1150 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 1151 alias_color (Color_bottomShadow, Color_bg);
733 } 1152 }
734 else 1153 else
735 { 1154 {
736 rxvt_color xcol[2]; 1155 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 1156
741 xcol[1] = pix_colors[Color_scroll]; 1157 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 1158 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 1159
751 /* topShadowColor */ 1160 /* topShadowColor */
752 if (!xcol[1].set (this, 1161 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 1162 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 1163 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), 1164 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), 1165 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 1166 cscroll.a)
758 )); 1167 ))
759 xcol[1] = pix_colors[Color_White]; 1168 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 1169 }
763#endif /* KEEP_SCROLLCOLOR */ 1170#endif
1171
1172#ifdef OFF_FOCUS_FADING
1173 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1174 update_fade_color (i);
1175#endif
764} 1176}
765 1177
766/*----------------------------------------------------------------------*/ 1178/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 1179/* color aliases, fg/bg bright-bold */
768void 1180void
… …
771 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772 { 1184 {
773 int i = atoi (rs[Rs_color + idx]); 1185 int i = atoi (rs[Rs_color + idx]);
774 1186
775 if (i >= 8 && i <= 15) 1187 if (i >= 8 && i <= 15)
776 { /* bright colors */ 1188 /* bright colors */
777 i -= 8;
778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1189 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779 return; 1190 else if (i >= 0 && i <= 7)
780 } 1191 /* normal colors */
781
782 if (i >= 0 && i <= 7) /* normal colors */
783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1192 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784 } 1193 }
785} 1194}
786 1195
787/*----------------------------------------------------------------------*/ 1196/*----------------------------------------------------------------------*/
… …
807 1216
808 if (rsmod 1217 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 1218 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 1219 requestedmeta = rsmod[3] - '0';
811 1220
812 map = XGetModifierMapping (xdisp); 1221 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 1222 kc = map->modifiermap;
814 1223
815 for (i = 1; i < 6; i++) 1224 for (i = 1; i < 6; i++)
816 { 1225 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1226 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 1228 for (j = map->max_keypermod; j--; k++)
820 { 1229 {
821 if (kc[k] == 0) 1230 if (kc[k] == 0)
822 break; 1231 break;
823 1232
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1233 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 1234 {
826 case XK_Num_Lock: 1235 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 1236 ModNumLockMask = modmasks[i - 1];
828 continue; 1237 continue;
829 1238
… …
871 1280
872 if (i) 1281 if (i)
873 ModMetaMask = modmasks[i - 1]; 1282 ModMetaMask = modmasks[i - 1];
874} 1283}
875 1284
1285void
1286rxvt_term::set_icon (const char *file)
1287{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf)
1342 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return;
1345 }
1346
1347 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1348 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1349
1350 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1351 {
1352 rxvt_warn ("Icon image too big, continuing without.\n");
1353 g_object_unref (pixbuf);
1354 return;
1355 }
1356
1357 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1358 {
1359 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1360 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1361 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1362
1363 buffer [0] = w;
1364 buffer [1] = h;
1365 for (int i = 0; i < h; i++)
1366 {
1367 for (int j = 0; j < w; j++)
1368 {
1369 unsigned char *pixel = row + j * channels;
1370 long value;
1371
1372 if (channels == 4)
1373 value = pixel[3];
1374 else
1375 value = (unsigned char)0x00ff;
1376
1377 value = (value << 8) + pixel[0];
1378 value = (value << 8) + pixel[1];
1379 value = (value << 8) + pixel[2];
1380 buffer[(i * w + j) + 2] = value;
1381 }
1382
1383 row += rowstride;
1384 }
1385
1386 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer);
1389 }
1390 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1392
1393 g_object_unref (pixbuf);
1394#endif
1395}
1396
876/*----------------------------------------------------------------------*/ 1397/*----------------------------------------------------------------------*/
877/* rxvt_Create_Windows () - Open and map the window */ 1398/* Open and map the window */
878void 1399void
879rxvt_term::create_windows (int argc, const char *const *argv) 1400rxvt_term::create_windows (int argc, const char *const *argv)
880{ 1401{
881 XClassHint classHint; 1402 XClassHint classHint;
882 XWMHints wmHint; 1403 XWMHints wmHint;
883#if ENABLE_FRILLS 1404#if ENABLE_FRILLS
884 MWMHints mwmhints; 1405 MWMHints mwmhints = { };
885#endif 1406#endif
886 XGCValues gcvalue; 1407 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 1408 XSetWindowAttributes attributes;
888 Window top, parent; 1409 Window top, parent;
889 1410
890 dLocal (Display *, xdisp); 1411 dLocal (Display *, dpy);
891 1412
892 /* grab colors before netscape does */ 1413 /* grab colors before netscape does */
893 Get_Colours (); 1414 get_colours ();
894 1415
895 if (!set_fonts ()) 1416 if (!set_fonts ())
896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1417 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897 1418
898 parent = display->root; 1419 parent = display->root;
899 1420
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1421 attributes.override_redirect = !!option (Opt_override_redirect);
901 1422
902#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 1424 if (option (Opt_borderLess))
904 { 1425 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1426 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 1427 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1428 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908 attributes.override_redirect = true; 1429 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 1430 }
911 else 1431 else
912 { 1432 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 1433 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 1434 }
916 } 1435 }
917 else
918 mwmhints.flags = 0;
919#endif 1436#endif
920 1437
921#if ENABLE_XEMBED 1438#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 1439 if (rs[Rs_embed])
923 { 1440 {
924 XWindowAttributes wattr; 1441 XWindowAttributes wattr;
925 1442
926 parent = strtol (rs[Rs_embed], 0, 0); 1443 parent = strtol (rs[Rs_embed], 0, 0);
927 1444
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1445 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1446 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 1447
931 window_calc (wattr.width, wattr.height); 1448 window_calc (wattr.width, wattr.height);
932 } 1449 }
933#endif 1450#endif
934 1451
935 window_calc (0, 0); 1452 window_calc (0, 0);
936 1453
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 1454 /* sub-window placement & size in rxvt_term::resize_all_windows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 1455 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 1456 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 1457 attributes.colormap = cmap;
941 1458
942 top = XCreateWindow (xdisp, parent, 1459 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 1460 szHint.x, szHint.y,
944 szHint.width, szHint.height, 1461 szHint.width, szHint.height,
945 ext_bwidth, 1462 ext_bwidth,
946 depth, InputOutput, visual, 1463 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
948 &attributes); 1465 &attributes);
949 1466
950 this->parent[0] = top; 1467 this->parent = top;
951 1468
952 old_width = szHint.width; 1469 old_width = szHint.width;
953 old_height = szHint.height; 1470 old_height = szHint.height;
954 1471
955 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1472 set_title (rs [Rs_title]);
956 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1473 set_icon_name (rs [Rs_iconName]);
957 1474
958 classHint.res_name = (char *)rs[Rs_name]; 1475 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 1476 classHint.res_class = (char *)RESCLASS;
960 1477
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1478 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 1479 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 1481 wmHint.window_group = top;
965 1482
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 1484 &szHint, &wmHint, &classHint);
1485#if ENABLE_EWMH
1486 /*
1487 * set up icon hint
1488 * rs [Rs_iconfile] is path to icon
1489 */
1490
1491 if (rs [Rs_iconfile])
1492 {
1493 set_icon (rs [Rs_iconfile]);
1494 }
1495#endif
968 1496
969#if ENABLE_FRILLS 1497#if ENABLE_FRILLS
970 if (mwmhints.flags) 1498 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1499 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1500 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 1501#endif
974 1502
975 Atom protocols[] = { 1503 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 1504 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 1505#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 1506 xa[XA_NET_WM_PING],
979#endif 1507#endif
980 }; 1508 };
981 1509
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1510 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
983 1511
984#if ENABLE_FRILLS 1512#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 1513 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 1515#endif
988 1516
989#if ENABLE_EWMH 1517#if ENABLE_EWMH
990 long pid = getpid (); 1518 long pid = getpid ();
991 1519
992 XChangeProperty (xdisp, top, 1520 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1521 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 1522 PropModeReplace, (unsigned char *)&pid, 1);
995 1523
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1524 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 1525#endif
998 1526
999 XSelectInput (xdisp, top, 1527 XSelectInput (dpy, top,
1000 KeyPressMask 1528 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1529#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1530 | KeyReleaseMask
1003#endif 1531#endif
1004 | FocusChangeMask | VisibilityChangeMask 1532 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1533 | ExposureMask | StructureNotifyMask);
1006 1534
1007 termwin_ev.start (display, top); 1535 termwin_ev.start (display, top);
1008 1536
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1537 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1538 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 1539
1017 /* the vt window */ 1540 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1541 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1542 window_vt_x, window_vt_y,
1020 width, height, 1543 width, height,
1021 0, 1544 0,
1022 pix_colors_focused[Color_fg], 1545 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1546 pix_colors_focused[Color_bg]);
1024 1547
1025 attributes.bit_gravity = NorthWestGravity; 1548 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1549 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1550
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1551 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1552
1030 if (OPTION (Opt_pointerBlank)) 1553 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1554 vt_emask |= PointerMotionMask;
1032 else 1555 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1556 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1557
1035 vt_select_input (); 1558 vt_select_input ();
1036 1559
1037 vt_ev.start (display, vt); 1560 vt_ev.start (display, vt);
1038 1561
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 */ 1562 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1563 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1564 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1565 gcvalue.graphics_exposures = 0;
1060 1566
1061 gc = XCreateGC (xdisp, vt, 1567 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1568 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1569 &gcvalue);
1064 1570
1065 drawable = new rxvt_drawable (this, vt); 1571 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 1572
1076#ifdef OFF_FOCUS_FADING 1573#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1574 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1575 if (rs[Rs_fade])
1079 pix_colors = pix_colors_unfocused; 1576 pix_colors = pix_colors_unfocused;
1080#endif 1577#endif
1081 1578
1082 pointer_unblank (); 1579 pointer_unblank ();
1083 scr_recolour (); 1580 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} 1581}
1297 1582
1298/*----------------------------------------------------------------------*/ 1583/*----------------------------------------------------------------------*/
1299/* 1584/*
1300 * Run the command in a subprocess and return a file descriptor for the 1585 * Run the command in a subprocess and return a file descriptor for the
… …
1321 else 1606 else
1322#endif 1607#endif
1323 if (!pty->get ()) 1608 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 1610
1611 struct termios tio = def_tio;
1612
1613#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1615 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1616 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1617 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1618#endif
1619
1620 /* init terminal attributes */
1621 cfsetospeed (&tio, BAUDRATE);
1622 cfsetispeed (&tio, BAUDRATE);
1623 tcsetattr (pty->tty, TCSANOW, &tio);
1326 pty->set_utf8_mode (enc_utf8); 1624 pty->set_utf8_mode (enc_utf8);
1327 1625
1328 /* set initial window size */ 1626 /* set initial window size */
1329 tt_winch (); 1627 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 1628
1344#if ENABLE_FRILLS 1629#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1630 if (rs[Rs_pty_fd])
1346 return; 1631 return;
1347#endif 1632#endif
… …
1378 } 1663 }
1379 1664
1380 _exit (EXIT_FAILURE); 1665 _exit (EXIT_FAILURE);
1381 1666
1382 default: 1667 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1668 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1670
1386 pty->close_tty (); 1671 pty->close_tty ();
1387 1672
1388 child_ev.start (cmd_pid); 1673 child_ev.start (cmd_pid);
1389 1674
… …
1402int 1687int
1403rxvt_term::run_child (const char *const *argv) 1688rxvt_term::run_child (const char *const *argv)
1404{ 1689{
1405 char *login; 1690 char *login;
1406 1691
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1692 if (option (Opt_console))
1693 {
1410 { /* be virtual console, fail silently */ 1694 /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1695#ifdef TIOCCONS
1412 unsigned int on = 1; 1696 unsigned int on = 1;
1413 1697
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1698 ioctl (STDIN_FILENO, TIOCCONS, &on);
1415#elif defined (SRIOCSREDIR) 1699#elif defined (SRIOCSREDIR)
… …
1417 1701
1418 fd = open (CONSOLE, O_WRONLY, 0); 1702 fd = open (CONSOLE, O_WRONLY, 0);
1419 if (fd >= 0) 1703 if (fd >= 0)
1420 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1421 close (fd); 1705 close (fd);
1422#endif /* SRIOCSREDIR */ 1706#endif /* SRIOCSREDIR */
1423 } 1707 }
1424 1708
1425 /* reset signals and spin off the command interpreter */ 1709 /* reset signals and spin off the command interpreter */
1426 signal (SIGINT, SIG_DFL); 1710 signal (SIGINT, SIG_DFL);
1427 signal (SIGQUIT, SIG_DFL); 1711 signal (SIGQUIT, SIG_DFL);
1428 signal (SIGCHLD, SIG_DFL); 1712 signal (SIGCHLD, SIG_DFL);
1429 signal (SIGHUP, SIG_DFL); 1713 signal (SIGHUP, SIG_DFL);
1430 signal (SIGPIPE, SIG_DFL); 1714 signal (SIGPIPE, SIG_DFL);
1431 /* 1715 /*
1432 * mimick login's behavior by disabling the job control signals 1716 * mimic login's behavior by disabling the job control signals
1433 * a shell that wants them can turn them back on 1717 * a shell that wants them can turn them back on
1434 */ 1718 */
1435#ifdef SIGTSTP 1719#ifdef SIGTSTP
1436 signal (SIGTSTP, SIG_IGN); 1720 signal (SIGTSTP, SIG_IGN);
1437 signal (SIGTTIN, SIG_IGN); 1721 signal (SIGTTIN, SIG_IGN);
1438 signal (SIGTTOU, SIG_IGN); 1722 signal (SIGTTOU, SIG_IGN);
1439#endif /* SIGTSTP */ 1723#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 1724
1446 /* command interpreter path */ 1725 /* command interpreter path */
1447 if (argv != NULL) 1726 if (argv)
1448 { 1727 {
1449# ifdef DEBUG_CMD 1728# ifdef DEBUG_CMD
1450 int i; 1729 int i;
1451 1730
1452 for (i = 0; argv[i]; i++) 1731 for (i = 0; argv[i]; i++)
… …
1461 const char *argv0, *shell; 1740 const char *argv0, *shell;
1462 1741
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1742 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1743 shell = "/bin/sh";
1465 1744
1466 argv0 = (const char *)rxvt_r_basename (shell); 1745 argv0 = rxvt_basename (shell);
1467 1746
1468 if (OPTION (Opt_loginShell)) 1747 if (option (Opt_loginShell))
1469 { 1748 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1749 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1471 1750
1472 login[0] = '-'; 1751 login[0] = '-';
1473 strcpy (&login[1], argv0); 1752 strcpy (&login[1], argv0);
1474 argv0 = login; 1753 argv0 = login;
1475 } 1754 }
1476 1755
1477 execlp (shell, argv0, NULL); 1756 execlp (shell, argv0, (char *)0);
1478 /* no error message: STDERR is closed! */ 1757 /* no error message: STDERR is closed! */
1479 } 1758 }
1480 1759
1481 return -1; 1760 return -1;
1482} 1761}

Diff Legend

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