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.199 by sasha, Fri Aug 3 22:40:10 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 TINTING 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 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0;
211 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1;
216 556
217 set_option (Opt_scrollBar); 557 set_option (Opt_scrollBar);
218 set_option (Opt_scrollTtyOutput); 558 set_option (Opt_scrollTtyOutput);
219 set_option (Opt_jumpScroll); 559 set_option (Opt_jumpScroll);
220 set_option (Opt_skipScroll); 560 set_option (Opt_skipScroll);
221 set_option (Opt_secondaryScreen); 561 set_option (Opt_secondaryScreen);
222 set_option (Opt_secondaryScroll); 562 set_option (Opt_secondaryScroll);
223 set_option (Opt_pastableTabs); 563 set_option (Opt_pastableTabs);
224 set_option (Opt_intensityStyles); 564 set_option (Opt_intensityStyles);
565 set_option (Opt_iso14755);
225 set_option (Opt_iso14755_52); 566 set_option (Opt_iso14755_52);
226 567 set_option (Opt_buffered);
227 return true;
228}
229
230void
231rxvt_term::init_secondary ()
232{
233 int i;
234
235 /*
236 * Close all unused file descriptors
237 * We don't want them, we don't need them.
238 */
239 if ((i = open ("/dev/null", O_RDONLY)) < 0)
240 {
241 /* TODO: BOO HISS */
242 dup2 (STDERR_FILENO, STDIN_FILENO);
243 }
244 else if (i > STDIN_FILENO)
245 {
246 dup2 (i, STDIN_FILENO);
247 close (i);
248 }
249
250 dup2 (STDERR_FILENO, STDOUT_FILENO);
251
252#if 0 // schmorp sayz closing filies is murder
253 for (i = STDERR_FILENO + 1; i < num_fds; i++)
254 {
255#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
256 if (i == 4 || i == 7)
257 continue;
258#endif
259 close (i);
260 }
261#endif
262} 568}
263 569
264/*----------------------------------------------------------------------*/ 570/*----------------------------------------------------------------------*/
265const char ** 571const char **
266rxvt_term::init_resources (int argc, const char *const *argv) 572rxvt_term::init_resources (int argc, const char *const *argv)
267{ 573{
268 int i, r_argc; 574 int i;
269 char *val;
270 const char **cmd_argv, **r_argv; 575 const char **cmd_argv;
271 576
272 /*
273 * Look for -e option. Find => split and make cmd_argv[] of command args
274 */
275 for (r_argc = 0; r_argc < argc; r_argc++)
276 if (!strcmp (argv[r_argc], "-e"))
277 break;
278
279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
280
281 for (i = 0; i < r_argc; i++)
282 r_argv[i] = (const char *)argv[i];
283
284 r_argv[i] = NULL;
285
286 if (r_argc == argc)
287 cmd_argv = NULL;
288 else
289 {
290 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
291
292 for (i = 0; i < argc - r_argc - 1; i++)
293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
294
295 cmd_argv[i] = NULL;
296 }
297
298 rs[Rs_name] = rxvt_r_basename (argv[0]); 577 rs[Rs_name] = rxvt_basename (argv[0]);
299 578
300 /* 579 /*
301 * Open display, get options/resources and create the window 580 * Open display, get options/resources and create the window
302 */ 581 */
303 582
304 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 583 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
305 rs[Rs_display_name] = ":0"; 584 rs[Rs_display_name] = ":0";
306 585
307 get_options (r_argc, r_argv); 586 cmd_argv = get_options (argc, argv);
308 587
309 if (!(display = displays.get (rs[Rs_display_name]))) 588 if (!(display = displays.get (rs[Rs_display_name])))
310 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]);
311 590
312 // using a local pointer decreases code size a lot 591 // using a local pointer decreases code size a lot
313 xa = display->xa; 592 xa = display->xa;
314 593
315 set (display); 594 set (display);
316 extract_resources (); 595 extract_resources ();
317 596
318#if XFT 597#if ENABLE_FRILLS
319 if (rs[Rs_depth]) 598 if (rs[Rs_visual])
320 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));
321#endif 602#endif
322
323#ifdef HAVE_AFTERIMAGE
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
326 free (r_argv);
327 603
328 for (int i = NUM_RESOURCES; i--; ) 604 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef) 605 if (rs [i] == resval_undef)
330 rs [i] = 0; 606 rs [i] = 0;
331 607
… …
339 { 615 {
340 rxvt_perl.init (this); 616 rxvt_perl.init (this);
341 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 617 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
342 } 618 }
343#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 ();
344 624
345 /* 625 /*
346 * set any defaults not already set 626 * set any defaults not already set
347 */ 627 */
348 if (cmd_argv && cmd_argv[0]) 628 if (cmd_argv && cmd_argv[0])
349 { 629 {
350 if (!rs[Rs_title]) 630 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 631 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
632
352 if (!rs[Rs_iconName]) 633 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 634 rs[Rs_iconName] = rs[Rs_title];
354 } 635 }
355 else 636 else
356 { 637 {
357 if (!rs[Rs_title]) 638 if (!rs[Rs_title])
358 rs[Rs_title] = rs[Rs_name]; 639 rs[Rs_title] = rs[Rs_name];
640
359 if (!rs[Rs_iconName]) 641 if (!rs[Rs_iconName])
360 rs[Rs_iconName] = rs[Rs_name]; 642 rs[Rs_iconName] = rs[Rs_name];
361 } 643 }
362 644
363 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 645 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
370 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)
371 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 653 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372 654
373 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 655 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374 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]);
375#endif 660#endif
376 661
377#ifdef POINTER_BLANK 662#ifdef POINTER_BLANK
378 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 663 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
379 pointerBlankDelay = i; 664 pointerBlankDelay = i;
380 else 665 else
381 pointerBlankDelay = 2; 666 pointerBlankDelay = 2;
382#endif 667#endif
383 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
384 /* no point having a scrollbar without having any scrollback! */ 676 /* no point having a scrollbar without having any scrollback! */
385 if (!saveLines) 677 if (!saveLines)
386 set_option (Opt_scrollBar, 0); 678 set_option (Opt_scrollBar, 0);
387 679
388#ifdef PRINTPIPE
389 if (!rs[Rs_print_pipe])
390 rs[Rs_print_pipe] = PRINTPIPE;
391#endif
392
393 if (!rs[Rs_cutchars]) 680 if (!rs[Rs_cutchars])
394 rs[Rs_cutchars] = CUTCHARS; 681 rs[Rs_cutchars] = CUTCHARS;
395 682
396#ifndef NO_BACKSPACE_KEY 683#ifndef NO_BACKSPACE_KEY
397 if (!rs[Rs_backspace_key]) 684 if (!rs[Rs_backspace_key])
398# ifdef DEFAULT_BACKSPACE 685# ifdef DEFAULT_BACKSPACE
399 key_backspace = DEFAULT_BACKSPACE; 686 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
400# else 687# else
401 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 688 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
402# endif 689# endif
403 else
404 {
405 val = strdup (rs[Rs_backspace_key]);
406 rxvt_Str_trim (val);
407 rxvt_Str_escaped (val);
408 key_backspace = val;
409 }
410#endif 690#endif
411 691
412#ifndef NO_DELETE_KEY 692#ifndef NO_DELETE_KEY
413 if (!rs[Rs_delete_key]) 693 if (!rs[Rs_delete_key])
414# ifdef DEFAULT_DELETE 694# ifdef DEFAULT_DELETE
415 key_delete = DEFAULT_DELETE; 695 rs[Rs_delete_key] = DEFAULT_DELETE;
416# else 696# else
417 key_delete = "\033[3~"; 697 rs[Rs_delete_key] = "\033[3~";
418# endif 698# endif
419 else
420 {
421 val = strdup (rs[Rs_delete_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_delete = val;
425 }
426#endif 699#endif
427 if (rs[Rs_answerbackstring])
428 {
429 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431 }
432 700
433#ifdef HAVE_SCROLLBARS 701 scrollBar.setup (this);
434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
435#endif
436 702
437#ifdef XTERM_REVERSE_VIDEO 703#ifdef XTERM_REVERSE_VIDEO
438 /* this is how xterm implements reverseVideo */ 704 /* this is how xterm implements reverseVideo */
439 if (option (Opt_reverseVideo)) 705 if (option (Opt_reverseVideo))
440 { 706 {
… …
460 color_aliases (Color_fg); 726 color_aliases (Color_fg);
461 color_aliases (Color_bg); 727 color_aliases (Color_bg);
462#ifndef NO_CURSORCOLOR 728#ifndef NO_CURSORCOLOR
463 color_aliases (Color_cursor); 729 color_aliases (Color_cursor);
464 color_aliases (Color_cursor2); 730 color_aliases (Color_cursor2);
465#endif /* NO_CURSORCOLOR */ 731#endif /* NO_CURSORCOLOR */
466 color_aliases (Color_pointer_fg); 732 color_aliases (Color_pointer_fg);
467 color_aliases (Color_pointer_bg); 733 color_aliases (Color_pointer_bg);
468 color_aliases (Color_border); 734 color_aliases (Color_border);
469#ifndef NO_BOLD_UNDERLINE_REVERSE 735#ifndef NO_BOLD_UNDERLINE_REVERSE
470 color_aliases (Color_BD); 736 color_aliases (Color_BD);
471 color_aliases (Color_UL); 737 color_aliases (Color_UL);
472 color_aliases (Color_RV); 738 color_aliases (Color_RV);
473#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 739#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
474 740
475 if (!rs[Rs_color + Color_border]) 741 if (!rs[Rs_color + Color_border])
476 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 742 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
477 743
478 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 ();
479} 881}
480 882
481/*----------------------------------------------------------------------*/ 883/*----------------------------------------------------------------------*/
482void 884void
483rxvt_term::init_env () 885rxvt_term::init_env ()
484{ 886{
485 int i;
486 unsigned int u;
487 char *val; 887 char *val;
888 char *env_display;
889 char *env_windowid;
890 char *env_colorfgbg;
891 char *env_term;
488 892
489#ifdef DISPLAY_IS_IP 893#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 894 /* Fixup display_name for export over pty to any interested terminal
491 * 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
492 * (for the first non-loopback interface) that we get from 896 * (for the first non-loopback interface) that we get from
… …
499 */ 903 */
500 val = rxvt_network_display (rs[Rs_display_name]); 904 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 905 rs[Rs_display_name] = (const char *)val;
502 906
503 if (val == NULL) 907 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 908#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (dpy); 909 val = XDisplayString (dpy);
506 910
507 if (rs[Rs_display_name] == NULL) 911 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 912 rs[Rs_display_name] = val; /* use broken `:0' value */
509 913
510 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 914 env_display = (char *)rxvt_malloc (strlen (val) + 9);
512 915
513 sprintf (env_display, "DISPLAY=%s", val); 916 sprintf (env_display, "DISPLAY=%s", val);
514 917
918 env_windowid = (char *)rxvt_malloc (21);
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
516 920
517 /* add entries to the environment: 921 /* add entries to the environment:
518 * @ DISPLAY: in case we started with -display 922 * @ DISPLAY: in case we started with -display
519 * @ WINDOWID: X window id number of the window 923 * @ WINDOWID: X window id number of the window
520 * @ COLORTERM: terminal sub-name and also indicates its color 924 * @ COLORTERM: terminal sub-name and also indicates its color
… …
523 * @ COLORFGBG: fg;bg color codes 927 * @ COLORFGBG: fg;bg color codes
524 */ 928 */
525 putenv (env_display); 929 putenv (env_display);
526 putenv (env_windowid); 930 putenv (env_windowid);
527 931
528 if (env_colorfgbg) 932 env_colorfgbg = get_colorfgbg ();
529 putenv (env_colorfgbg); 933 putenv (env_colorfgbg);
530 934
531#ifdef RXVT_TERMINFO 935#ifdef RXVT_TERMINFO
532 putenv ("TERMINFO=" RXVT_TERMINFO); 936 putenv ("TERMINFO=" RXVT_TERMINFO);
533#endif 937#endif
534 938
… …
537 else 941 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 942 putenv ("COLORTERM=" COLORTERMENVFULL);
539 943
540 if (rs[Rs_term_name] != NULL) 944 if (rs[Rs_term_name] != NULL)
541 { 945 {
542 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);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 947 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 948 putenv (env_term);
545 } 949 }
546 else 950 else
547 putenv ("TERM=" TERMENV); 951 putenv ("TERM=" TERMENV);
… …
549#ifdef HAVE_UNSETENV 953#ifdef HAVE_UNSETENV
550 /* avoid passing old settings and confusing term size */ 954 /* avoid passing old settings and confusing term size */
551 unsetenv ("LINES"); 955 unsetenv ("LINES");
552 unsetenv ("COLUMNS"); 956 unsetenv ("COLUMNS");
553 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
554#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
555} 959}
556 960
557/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
558/*
559 * This is more or less stolen straight from XFree86 xterm.
560 * This should support all European type languages.
561 */
562void 962void
563rxvt_term::set_locale (const char *locale) 963rxvt_term::set_locale (const char *locale)
564{ 964{
565 set_environ (envv); 965 set_environ (env);
566 966
567#if HAVE_XSETLOCALE || HAVE_SETLOCALE
568 free (this->locale); 967 free (this->locale);
569 this->locale = setlocale (LC_CTYPE, locale); 968 this->locale = setlocale (LC_CTYPE, locale);
570 969
571 if (!this->locale) 970 if (!this->locale)
572 { 971 {
… …
580 979
581 this->locale = "C"; 980 this->locale = "C";
582 } 981 }
583 982
584 983
585 this->locale = rxvt_strdup (this->locale); 984 this->locale = strdup (this->locale);
586 SET_LOCALE (this->locale); 985 SET_LOCALE (this->locale);
587 mbstate.reset (); 986 mbstate.reset ();
588#endif
589 987
590#if HAVE_NL_LANGINFO 988#if HAVE_NL_LANGINFO
591 char *codeset = strdup (nl_langinfo (CODESET)); 989 char *codeset = nl_langinfo (CODESET);
592 // /^UTF.?8/i 990 // /^UTF.?8/i
593 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 991 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
594 && (codeset[1] == 'T' || codeset[1] == 't') 992 && (codeset[1] == 'T' || codeset[1] == 't')
595 && (codeset[2] == 'F' || codeset[2] == 'f') 993 && (codeset[2] == 'F' || codeset[2] == 'f')
596 && (codeset[3] == '8' || codeset[4] == '8'); 994 && (codeset[3] == '8' || codeset[4] == '8');
597 free (codeset);
598#else 995#else
599 enc_utf8 = 0; 996 enc_utf8 = 0;
600#endif 997#endif
601} 998}
602 999
603void 1000void
604rxvt_term::init_xlocale () 1001rxvt_term::init_xlocale ()
605{ 1002{
606 set_environ (envv); 1003 set_environ (env);
607 1004
608#ifdef USE_XIM 1005#if USE_XIM
609 if (!locale) 1006 if (!locale)
610 rxvt_warn ("setting locale failed, working without locale support.\n"); 1007 rxvt_warn ("setting locale failed, continuing without locale support.\n");
611 else 1008 else
612 { 1009 {
613 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
614 1011
615 if (!XSupportsLocale ()) 1012 if (!XSupportsLocale ())
616 { 1013 {
617 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");
618 return; 1015 return;
619 } 1016 }
620 1017
621 im_ev.start (display); 1018 im_ev.start (display);
622 1019
… …
647 priv_modes |= PrivMode_Keypress; 1044 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 1045 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 1046 priv_modes |= PrivMode_smoothScroll;
650 1047
651#ifndef NO_BACKSPACE_KEY 1048#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 1049 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 1050 priv_modes |= PrivMode_HaveBackSpace;
654#endif 1051#endif
655 1052
656 /* add value for scrollBar */ 1053 /* add value for scrollBar */
657 if (scrollBar.state) 1054 if (scrollBar.state)
… …
663 run_command (argv); 1060 run_command (argv);
664} 1061}
665 1062
666/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
667void 1064void
668rxvt_term::Get_Colours () 1065rxvt_term::get_colors ()
669{ 1066{
670 int i; 1067 int i;
671 1068
672#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
673 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
674#endif 1071#endif
675 1072
676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < NRS_COLORS; i++)
677 {
678 const char *name = rs[Rs_color + i]; 1074 if (const char *name = rs[Rs_color + i])
679
680 if (!name)
681 continue;
682
683 rxvt_color xcol;
684
685 if (!set_color (xcol, name)) 1075 set_color (pix_colors [i], name);
686 {
687#ifndef XTERM_REVERSE_VIDEO
688 if (i < 2 && option (Opt_reverseVideo))
689 name = def_colorName [1 - i];
690 else
691#endif
692 name = def_colorName [i];
693
694 if (!name)
695 continue;
696
697 if (!set_color (xcol, name))
698 {
699 switch (i)
700 {
701 case Color_fg:
702 case Color_bg:
703 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
704 name = "";
705 break;
706#ifndef NO_CURSORCOLOR
707 case Color_cursor2:
708#endif
709 case Color_pointer_fg:
710 name = rs[Rs_color + Color_fg];
711 xcol.set (this, name);
712 break;
713 default:
714 name = rs[Rs_color + Color_bg];
715 xcol.set (this, name);
716 break;
717 }
718 }
719 }
720
721 pix_colors[i] = xcol;
722 rs[Rs_color + i] = name;
723 }
724
725 if (depth <= 2)
726 {
727 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
728 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
729 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
730 }
731 1076
732 /* 1077 /*
733 * get scrollBar shadow colors 1078 * get scrollBar shadow colors
734 * 1079 *
735 * The calculations of topShadow/bottomShadow values are adapted 1080 * The calculations of topShadow/bottomShadow values are adapted
736 * from the fvwm window manager. 1081 * from the fvwm window manager.
737 */ 1082 */
738#ifdef KEEP_SCROLLCOLOR 1083#ifdef RXVT_SCROLLBAR
739 if (depth <= 2)
740 {
741 /* Monochrome */
742 alias_color (Color_scroll, Color_fg);
743 alias_color (Color_topShadow, Color_bg);
744 alias_color (Color_bottomShadow, Color_bg);
745 }
746 else
747 {
748 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1084 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
749 1085
750 rgba cscroll; 1086 rgba cscroll;
751 pix_colors [Color_scroll].get (cscroll); 1087 pix_colors [Color_scroll].get (cscroll);
752 1088
753 /* topShadowColor */ 1089 /* topShadowColor */
754 if (!pix_colors[Color_topShadow].set (this, 1090 if (!pix_colors[Color_topShadow].set (this,
755 rgba ( 1091 rgba (
756 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),
757 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),
758 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),
759 cscroll.a) 1095 cscroll.a)
760 )) 1096 ))
761 alias_color (Color_topShadow, Color_White); 1097 alias_color (Color_topShadow, Color_White);
762 } 1098#endif
763#endif /* KEEP_SCROLLCOLOR */
764 1099
765#ifdef OFF_FOCUS_FADING 1100#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < NRS_COLORS; i++)
767 update_fade_color (i); 1102 update_fade_color (i, true);
768#endif 1103#endif
769} 1104}
770 1105
771/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
772/* color aliases, fg/bg bright-bold */ 1107/* color aliases, fg/bg bright-bold */
773void 1108void
774rxvt_term::color_aliases (int idx) 1109rxvt_term::color_aliases (int idx)
775{ 1110{
776 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1111 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
777 { 1112 {
778 int i = atoi (rs[Rs_color + idx]); 1113 int i = atoi (rs[Rs_color + idx]);
779 1114
780 if (i >= 8 && i <= 15) 1115 if (i >= 8 && i <= 15)
781 { /* bright colors */ 1116 /* bright colors */
782 i -= 8;
783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1117 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
784 return; 1118 else if (i >= 0 && i <= 7)
785 } 1119 /* normal colors */
786
787 if (i >= 0 && i <= 7) /* normal colors */
788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1120 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
789 } 1121 }
790} 1122}
791 1123
792/*----------------------------------------------------------------------*/ 1124/*----------------------------------------------------------------------*/
… …
824 for (j = map->max_keypermod; j--; k++) 1156 for (j = map->max_keypermod; j--; k++)
825 { 1157 {
826 if (kc[k] == 0) 1158 if (kc[k] == 0)
827 break; 1159 break;
828 1160
829 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1161 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
830 { 1162 {
831 case XK_Num_Lock: 1163 case XK_Num_Lock:
832 ModNumLockMask = modmasks[i - 1]; 1164 ModNumLockMask = modmasks[i - 1];
833 continue; 1165 continue;
834 1166
… …
876 1208
877 if (i) 1209 if (i)
878 ModMetaMask = modmasks[i - 1]; 1210 ModMetaMask = modmasks[i - 1];
879} 1211}
880 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
881/*----------------------------------------------------------------------*/ 1274/*----------------------------------------------------------------------*/
882/* rxvt_Create_Windows () - Open and map the window */ 1275/* Open and map the window */
883void 1276void
884rxvt_term::create_windows (int argc, const char *const *argv) 1277rxvt_term::create_windows (int argc, const char *const *argv)
885{ 1278{
886 XClassHint classHint; 1279 XClassHint classHint;
887 XWMHints wmHint; 1280 XWMHints wmHint;
… …
893 Window top, parent; 1286 Window top, parent;
894 1287
895 dLocal (Display *, dpy); 1288 dLocal (Display *, dpy);
896 1289
897 /* grab colors before netscape does */ 1290 /* grab colors before netscape does */
898 Get_Colours (); 1291 get_colors ();
899 1292
900 if (!set_fonts ()) 1293 if (!set_fonts ())
901 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");
902 1295
903 parent = display->root; 1296 parent = display->root;
… …
907#if ENABLE_FRILLS 1300#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 1301 if (option (Opt_borderLess))
909 { 1302 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1303 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 1304 {
912 /* 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");
913 attributes.override_redirect = true; 1306 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 1307 }
916 else 1308 else
917 { 1309 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 1310 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 1311 }
921 } 1312 }
922 else
923 mwmhints.flags = 0;
924#endif 1313#endif
925 1314
926#if ENABLE_XEMBED 1315#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 1316 if (rs[Rs_embed])
928 { 1317 {
… …
937 } 1326 }
938#endif 1327#endif
939 1328
940 window_calc (0, 0); 1329 window_calc (0, 0);
941 1330
942 /* sub-window placement & size in rxvt_resize_subwindows () */ 1331 /* sub-window placement & size in rxvt_term::resize_all_windows () */
943 attributes.background_pixel = pix_colors_focused [Color_border]; 1332 attributes.background_pixel = pix_colors_focused [Color_border];
944 attributes.border_pixel = pix_colors_focused [Color_border]; 1333 attributes.border_pixel = pix_colors_focused [Color_border];
945 attributes.colormap = cmap; 1334 attributes.colormap = cmap;
946 1335
947 top = XCreateWindow (dpy, parent, 1336 top = XCreateWindow (dpy, parent,
… …
950 ext_bwidth, 1339 ext_bwidth,
951 depth, InputOutput, visual, 1340 depth, InputOutput, visual,
952 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1341 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
953 &attributes); 1342 &attributes);
954 1343
955 this->parent[0] = top; 1344 this->parent = top;
956 1345
957 old_width = szHint.width; 1346 set_title (rs [Rs_title]);
958 old_height = szHint.height; 1347 set_icon_name (rs [Rs_iconName]);
959
960 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
961 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
962 1348
963 classHint.res_name = (char *)rs[Rs_name]; 1349 classHint.res_name = (char *)rs[Rs_name];
964 classHint.res_class = (char *)RESCLASS; 1350 classHint.res_class = (char *)RESCLASS;
965 1351
966 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1352 wmHint.flags = InputHint | StateHint | WindowGroupHint;
967 wmHint.input = True; 1353 wmHint.input = True;
968 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1354 wmHint.initial_state = option (Opt_iconic) ? IconicState
1355 : option (Opt_dockapp) ? WithdrawnState
1356 : NormalState;
969 wmHint.window_group = top; 1357 wmHint.window_group = top;
970 1358
971 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1359 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972 &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
973 1370
974#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
975 if (mwmhints.flags) 1372 if (mwmhints.flags)
976 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,
977 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1374 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
982#if ENABLE_EWMH 1379#if ENABLE_EWMH
983 xa[XA_NET_WM_PING], 1380 xa[XA_NET_WM_PING],
984#endif 1381#endif
985 }; 1382 };
986 1383
987 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1384 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
988 1385
989#if ENABLE_FRILLS 1386#if ENABLE_FRILLS
990 if (rs[Rs_transient_for]) 1387 if (rs[Rs_transient_for])
991 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1388 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
992#endif 1389#endif
… …
1010 | ExposureMask | StructureNotifyMask); 1407 | ExposureMask | StructureNotifyMask);
1011 1408
1012 termwin_ev.start (display, top); 1409 termwin_ev.start (display, top);
1013 1410
1014 /* 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
1015 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1423 TermWin_cursor = XCreateFontCursor (dpy, shape);
1016
1017#ifdef HAVE_SCROLLBARS
1018 /* cursor scrollBar: Black-on-White */
1019 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1020#endif
1021 1424
1022 /* the vt window */ 1425 /* the vt window */
1023 vt = XCreateSimpleWindow (dpy, top, 1426 vt = XCreateSimpleWindow (dpy, top,
1024 window_vt_x, window_vt_y, 1427 window_vt_x, window_vt_y,
1025 width, height, 1428 vt_width, vt_height,
1026 0, 1429 0,
1027 pix_colors_focused[Color_fg], 1430 pix_colors_focused[Color_fg],
1028 pix_colors_focused[Color_bg]); 1431 pix_colors_focused[Color_bg]);
1029 1432
1030 attributes.bit_gravity = NorthWestGravity; 1433 attributes.bit_gravity = NorthWestGravity;
… …
1039 1442
1040 vt_select_input (); 1443 vt_select_input ();
1041 1444
1042 vt_ev.start (display, vt); 1445 vt_ev.start (display, vt);
1043 1446
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL)
1046 {
1047 const char *p = rs[Rs_backgroundPixmap];
1048
1049 if ((p = strchr (p, ';')) != NULL)
1050 {
1051 p++;
1052 bgPixmap.handle_geometry (p);
1053 }
1054
1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1056 scr_touch (true);
1057 }
1058#endif
1059
1060 /* graphics context for the vt window */ 1447 /* graphics context for the vt window */
1061 gcvalue.foreground = pix_colors[Color_fg]; 1448 gcvalue.foreground = pix_colors[Color_fg];
1062 gcvalue.background = pix_colors[Color_bg]; 1449 gcvalue.background = pix_colors[Color_bg];
1063 gcvalue.graphics_exposures = 0; 1450 gcvalue.graphics_exposures = 0;
1064 1451
… …
1066 GCForeground | GCBackground | GCGraphicsExposures, 1453 GCForeground | GCBackground | GCGraphicsExposures,
1067 &gcvalue); 1454 &gcvalue);
1068 1455
1069 drawable = new rxvt_drawable (this, vt); 1456 drawable = new rxvt_drawable (this, vt);
1070 1457
1071#ifdef RXVT_SCROLLBAR
1072 gcvalue.foreground = pix_colors[Color_topShadow];
1073 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[Color_bottomShadow];
1075 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1077 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078#endif
1079
1080#ifdef OFF_FOCUS_FADING 1458#ifdef OFF_FOCUS_FADING
1081 // initially we are in unfocused state 1459 // initially we are in unfocused state
1082 if (rs[Rs_fade]) 1460 if (rs[Rs_fade])
1083 pix_colors = pix_colors_unfocused; 1461 pix_colors = pix_colors_unfocused;
1084#endif 1462#endif
1085 1463
1086 pointer_unblank (); 1464 pointer_unblank ();
1087 scr_recolour (); 1465 scr_recolor ();
1088}
1089
1090/* ------------------------------------------------------------------------- *
1091 * GET TTY CURRENT STATE *
1092 * ------------------------------------------------------------------------- */
1093void
1094rxvt_get_ttymode (ttymode_t *tio, int erase)
1095{
1096 /*
1097 * standard System V termios interface
1098 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1100 {
1101 // return error - use system defaults,
1102 // where possible, and zero elsewhere
1103 memset (tio, 0, sizeof (ttymode_t));
1104
1105 tio->c_cc[VINTR] = CINTR;
1106 tio->c_cc[VQUIT] = CQUIT;
1107 tio->c_cc[VERASE] = CERASE;
1108#ifdef VERASE2
1109 tio->c_cc[VERASE2] = CERASE2;
1110#endif
1111 tio->c_cc[VKILL] = CKILL;
1112 tio->c_cc[VSTART] = CSTART;
1113 tio->c_cc[VSTOP] = CSTOP;
1114 tio->c_cc[VSUSP] = CSUSP;
1115# ifdef VDSUSP
1116 tio->c_cc[VDSUSP] = CDSUSP;
1117# endif
1118# ifdef VREPRINT
1119 tio->c_cc[VREPRINT] = CRPRNT;
1120# endif
1121# ifdef VDISCRD
1122 tio->c_cc[VDISCRD] = CFLUSH;
1123# endif
1124# ifdef VWERSE
1125 tio->c_cc[VWERSE] = CWERASE;
1126# endif
1127# ifdef VLNEXT
1128 tio->c_cc[VLNEXT] = CLNEXT;
1129# endif
1130 }
1131
1132 tio->c_cc[VEOF] = CEOF;
1133 tio->c_cc[VEOL] = VDISABLE;
1134# ifdef VEOL2
1135 tio->c_cc[VEOL2] = VDISABLE;
1136# endif
1137# ifdef VSWTC
1138 tio->c_cc[VSWTC] = VDISABLE;
1139# endif
1140# ifdef VSWTCH
1141 tio->c_cc[VSWTCH] = VDISABLE;
1142# endif
1143# if VMIN != VEOF
1144 tio->c_cc[VMIN] = 1;
1145# endif
1146# if VTIME != VEOL
1147 tio->c_cc[VTIME] = 0;
1148# endif
1149
1150 if (erase != -1)
1151 tio->c_cc[VERASE] = (char)erase;
1152
1153 /* input modes */
1154 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1155# ifdef IMAXBEL
1156 | IMAXBEL
1157# endif
1158 | IXON);
1159
1160 /* output modes */
1161 tio->c_oflag = (OPOST | ONLCR);
1162
1163 /* control modes */
1164 tio->c_cflag = (CS8 | CREAD);
1165
1166 /* line discipline modes */
1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1168# if defined (ECHOCTL) && defined (ECHOKE)
1169 | ECHOCTL | ECHOKE
1170# endif
1171 | ECHOE | ECHOK);
1172
1173 /*
1174 * Debugging
1175 */
1176#ifdef DEBUG_TTYMODE
1177#ifdef HAVE_TERMIOS_H
1178 /* c_iflag bits */
1179 fprintf (stderr, "Input flags\n");
1180
1181 /* cpp token stringize doesn't work on all machines <sigh> */
1182# define FOO(flag,name) \
1183 if ((tio->c_iflag) & flag) \
1184 fprintf (stderr, "%s ", name)
1185
1186 /* c_iflag bits */
1187 FOO (IGNBRK, "IGNBRK");
1188 FOO (BRKINT, "BRKINT");
1189 FOO (IGNPAR, "IGNPAR");
1190 FOO (PARMRK, "PARMRK");
1191 FOO (INPCK, "INPCK");
1192 FOO (ISTRIP, "ISTRIP");
1193 FOO (INLCR, "INLCR");
1194 FOO (IGNCR, "IGNCR");
1195 FOO (ICRNL, "ICRNL");
1196 FOO (IXON, "IXON");
1197 FOO (IXOFF, "IXOFF");
1198# ifdef IUCLC
1199 FOO (IUCLC, "IUCLC");
1200# endif
1201# ifdef IXANY
1202 FOO (IXANY, "IXANY");
1203# endif
1204# ifdef IMAXBEL
1205 FOO (IMAXBEL, "IMAXBEL");
1206# endif
1207
1208 fprintf (stderr, "\n");
1209
1210# undef FOO
1211# define FOO(entry, name) \
1212 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1213
1214 FOO (VINTR, "VINTR");
1215 FOO (VQUIT, "VQUIT");
1216 FOO (VERASE, "VERASE");
1217 FOO (VKILL, "VKILL");
1218 FOO (VEOF, "VEOF");
1219 FOO (VEOL, "VEOL");
1220# ifdef VEOL2
1221 FOO (VEOL2, "VEOL2");
1222# endif
1223# ifdef VSWTC
1224 FOO (VSWTC, "VSWTC");
1225# endif
1226# ifdef VSWTCH
1227 FOO (VSWTCH, "VSWTCH");
1228# endif
1229 FOO (VSTART, "VSTART");
1230 FOO (VSTOP, "VSTOP");
1231 FOO (VSUSP, "VSUSP");
1232# ifdef VDSUSP
1233 FOO (VDSUSP, "VDSUSP");
1234# endif
1235# ifdef VREPRINT
1236 FOO (VREPRINT, "VREPRINT");
1237# endif
1238# ifdef VDISCRD
1239 FOO (VDISCRD, "VDISCRD");
1240# endif
1241# ifdef VWERSE
1242 FOO (VWERSE, "VWERSE");
1243# endif
1244# ifdef VLNEXT
1245 FOO (VLNEXT, "VLNEXT");
1246# endif
1247
1248 fprintf (stderr, "\n");
1249# undef FOO
1250# endif /* HAVE_TERMIOS_H */
1251#endif /* DEBUG_TTYMODE */
1252} 1466}
1253 1467
1254/*----------------------------------------------------------------------*/ 1468/*----------------------------------------------------------------------*/
1255/* 1469/*
1256 * 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
… …
1268 if (pty->pty >= 0) 1482 if (pty->pty >= 0)
1269 { 1483 {
1270 if (getfd_hook) 1484 if (getfd_hook)
1271 pty->pty = (*getfd_hook) (pty->pty); 1485 pty->pty = (*getfd_hook) (pty->pty);
1272 1486
1273 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1487 if (pty->pty < 0)
1274 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1488 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1275 } 1489 }
1276 } 1490 }
1277 else 1491 else
1278#endif 1492#endif
1279 if (!pty->get ()) 1493 if (!pty->get ())
1280 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1494 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1281 1495
1282 int er; 1496 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1497
1498 struct termios tio = def_tio;
1283 1499
1284#ifndef NO_BACKSPACE_KEY 1500#ifndef NO_BACKSPACE_KEY
1285 if (key_backspace[0] && !key_backspace[1]) 1501 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1286 er = key_backspace[0]; 1502 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1287 else if (strcmp (key_backspace, "DEC") == 0) 1503 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1288 er = '\177'; /* the initial state anyway */ 1504 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1289 else
1290#endif 1505#endif
1291 er = -1;
1292 1506
1293 rxvt_get_ttymode (&tio, er); 1507 /* init terminal attributes */
1294 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1508 cfsetospeed (&tio, BAUDRATE);
1509 cfsetispeed (&tio, BAUDRATE);
1510 tcsetattr (pty->tty, TCSANOW, &tio);
1295 pty->set_utf8_mode (enc_utf8); 1511 pty->set_utf8_mode (enc_utf8);
1296 1512
1297 /* set initial window size */ 1513 /* set initial window size */
1298 tt_winch (); 1514 tt_winch ();
1299 1515
… …
1335 1551
1336 _exit (EXIT_FAILURE); 1552 _exit (EXIT_FAILURE);
1337 1553
1338 default: 1554 default:
1339 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
1340 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1562 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1563 }
1341 1564
1342 pty->close_tty (); 1565 pty->close_tty ();
1343 1566
1344 child_ev.start (cmd_pid); 1567 child_ev.start (cmd_pid);
1345 1568
… …
1359rxvt_term::run_child (const char *const *argv) 1582rxvt_term::run_child (const char *const *argv)
1360{ 1583{
1361 char *login; 1584 char *login;
1362 1585
1363 if (option (Opt_console)) 1586 if (option (Opt_console))
1587 {
1364 { /* be virtual console, fail silently */ 1588 /* be virtual console, fail silently */
1365#ifdef TIOCCONS 1589#ifdef TIOCCONS
1366 unsigned int on = 1; 1590 unsigned int on = 1;
1367 1591
1368 ioctl (STDIN_FILENO, TIOCCONS, &on); 1592 ioctl (STDIN_FILENO, TIOCCONS, &on);
1369#elif defined (SRIOCSREDIR) 1593#elif defined (SRIOCSREDIR)
1370 int fd; 1594 int fd;
1371 1595
1372 fd = open (CONSOLE, O_WRONLY, 0); 1596 fd = open (CONSOLE, O_WRONLY, 0);
1373 if (fd >= 0) 1597 if (fd >= 0)
1374 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1598 {
1599 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1375 close (fd); 1600 close (fd);
1376#endif /* SRIOCSREDIR */ 1601 }
1602#endif /* SRIOCSREDIR */
1377 } 1603 }
1378 1604
1379 /* reset signals and spin off the command interpreter */ 1605 /* reset signals and spin off the command interpreter */
1380 signal (SIGINT, SIG_DFL); 1606 signal (SIGINT, SIG_DFL);
1381 signal (SIGQUIT, SIG_DFL); 1607 signal (SIGQUIT, SIG_DFL);
1382 signal (SIGCHLD, SIG_DFL); 1608 signal (SIGCHLD, SIG_DFL);
1383 signal (SIGHUP, SIG_DFL); 1609 signal (SIGHUP, SIG_DFL);
1384 signal (SIGPIPE, SIG_DFL); 1610 signal (SIGPIPE, SIG_DFL);
1385 /* 1611 /*
1386 * mimick login's behavior by disabling the job control signals 1612 * mimic login's behavior by disabling the job control signals
1387 * a shell that wants them can turn them back on 1613 * a shell that wants them can turn them back on
1388 */ 1614 */
1389#ifdef SIGTSTP 1615#ifdef SIGTSTP
1390 signal (SIGTSTP, SIG_IGN); 1616 signal (SIGTSTP, SIG_IGN);
1391 signal (SIGTTIN, SIG_IGN); 1617 signal (SIGTTIN, SIG_IGN);
1392 signal (SIGTTOU, SIG_IGN); 1618 signal (SIGTTOU, SIG_IGN);
1393#endif /* SIGTSTP */ 1619#endif /* SIGTSTP */
1394
1395 // unblock signals (signals are blocked by iom.C
1396 sigset_t ss;
1397 sigemptyset (&ss);
1398 sigprocmask (SIG_SETMASK, &ss, 0);
1399 1620
1400 /* command interpreter path */ 1621 /* command interpreter path */
1401 if (argv != NULL) 1622 if (argv)
1402 { 1623 {
1403# ifdef DEBUG_CMD 1624# ifdef DEBUG_CMD
1404 int i; 1625 int i;
1405 1626
1406 for (i = 0; argv[i]; i++) 1627 for (i = 0; argv[i]; i++)
… …
1415 const char *argv0, *shell; 1636 const char *argv0, *shell;
1416 1637
1417 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1638 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1418 shell = "/bin/sh"; 1639 shell = "/bin/sh";
1419 1640
1420 argv0 = (const char *)rxvt_r_basename (shell); 1641 argv0 = rxvt_basename (shell);
1421 1642
1422 if (option (Opt_loginShell)) 1643 if (option (Opt_loginShell))
1423 { 1644 {
1424 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1645 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1425 1646
1426 login[0] = '-'; 1647 login[0] = '-';
1427 strcpy (&login[1], argv0); 1648 strcpy (&login[1], argv0);
1428 argv0 = login; 1649 argv0 = login;
1429 } 1650 }
1430 1651
1431 execlp (shell, argv0, NULL); 1652 execlp (shell, argv0, (char *)0);
1432 /* no error message: STDERR is closed! */ 1653 /* no error message: STDERR is closed! */
1433 } 1654 }
1434 1655
1435 return -1; 1656 return -1;
1436} 1657}

Diff Legend

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