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.205 by sasha, Fri Aug 10 22:10:36 2007 UTC vs.
Revision 1.344 by sf-exg, Tue Jun 16 11:58:26 2015 UTC

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

Diff Legend

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