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

Diff Legend

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