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.215 by root, Mon Oct 8 15:36:13 2007 UTC vs.
Revision 1.289 by root, Mon Jan 3 03:05:47 2011 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * 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
20 * 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
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
45 59
46#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 62#include <sys/types.h>
49#include <sys/socket.h> 63#include <sys/socket.h>
50 64
51/* these next two are probably only on Sun (not Solaris) */ 65/* these next is probably only on Sun (not Solaris) */
52#ifdef HAVE_SYS_SOCKIO_H 66#ifdef HAVE_SYS_SOCKIO_H
53#include <sys/sockio.h> 67#include <sys/sockio.h>
54#endif
55#ifdef HAVE_SYS_BYTEORDER_H
56#include <sys/byteorder.h>
57#endif 68#endif
58 69
59#include <netinet/in.h> 70#include <netinet/in.h>
60#include <arpa/inet.h> 71#include <arpa/inet.h>
61#include <net/if.h> 72#include <net/if.h>
… …
129 140
130 return rval; 141 return rval;
131} 142}
132#endif 143#endif
133 144
134const char *const def_colorName[] = 145static const char *const def_colorName[] =
135 { 146 {
136 COLOR_FOREGROUND, 147 COLOR_FOREGROUND,
137 COLOR_BACKGROUND, 148 COLOR_BACKGROUND,
138 /* low-intensity colors */ 149 /* low-intensity colors */
139 "rgb:00/00/00", // 0: black (Black) 150 "rgb:00/00/00", // 0: black (Black)
… …
141 "rgb:00/cd/00", // 2: green (Green3) 152 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 153 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 154 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 155 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 156 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 157# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 158 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 159# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 160 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 161# endif
151 /* high-intensity colors */ 162 /* high-intensity colors */
152# ifdef XTERM_COLORS 163# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 164 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
160 "rgb:00/00/ff", // 4/12: bright blue (Blue) 171 "rgb:00/00/ff", // 4/12: bright blue (Blue)
161 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 172 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
162 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 173 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
163 "rgb:ff/ff/ff", // 7/15: bright white (White) 174 "rgb:ff/ff/ff", // 7/15: bright white (White)
164 175
176#if !USE_256_COLORS
165 // 88 xterm colours 177 // 88 xterm colours
166 "rgb:00/00/00", 178 "rgb:00/00/00",
167 "rgb:00/00/8b", 179 "rgb:00/00/8b",
168 "rgb:00/00/cd", 180 "rgb:00/00/cd",
169 "rgb:00/00/ff", 181 "rgb:00/00/ff",
… …
233 "rgb:8b/8b/8b", 245 "rgb:8b/8b/8b",
234 "rgb:a2/a2/a2", 246 "rgb:a2/a2/a2",
235 "rgb:b9/b9/b9", 247 "rgb:b9/b9/b9",
236 "rgb:d0/d0/d0", 248 "rgb:d0/d0/d0",
237 "rgb:e7/e7/e7", 249 "rgb:e7/e7/e7",
250#else
251 // 256 xterm colours
252 "rgb:00/00/00",
253 "rgb:00/00/5f",
254 "rgb:00/00/87",
255 "rgb:00/00/af",
256 "rgb:00/00/d7",
257 "rgb:00/00/ff",
258 "rgb:00/5f/00",
259 "rgb:00/5f/5f",
260 "rgb:00/5f/87",
261 "rgb:00/5f/af",
262 "rgb:00/5f/d7",
263 "rgb:00/5f/ff",
264 "rgb:00/87/00",
265 "rgb:00/87/5f",
266 "rgb:00/87/87",
267 "rgb:00/87/af",
268 "rgb:00/87/d7",
269 "rgb:00/87/ff",
270 "rgb:00/af/00",
271 "rgb:00/af/5f",
272 "rgb:00/af/87",
273 "rgb:00/af/af",
274 "rgb:00/af/d7",
275 "rgb:00/af/ff",
276 "rgb:00/d7/00",
277 "rgb:00/d7/5f",
278 "rgb:00/d7/87",
279 "rgb:00/d7/af",
280 "rgb:00/d7/d7",
281 "rgb:00/d7/ff",
282 "rgb:00/ff/00",
283 "rgb:00/ff/5f",
284 "rgb:00/ff/87",
285 "rgb:00/ff/af",
286 "rgb:00/ff/d7",
287 "rgb:00/ff/ff",
288 "rgb:5f/00/00",
289 "rgb:5f/00/5f",
290 "rgb:5f/00/87",
291 "rgb:5f/00/af",
292 "rgb:5f/00/d7",
293 "rgb:5f/00/ff",
294 "rgb:5f/5f/00",
295 "rgb:5f/5f/5f",
296 "rgb:5f/5f/87",
297 "rgb:5f/5f/af",
298 "rgb:5f/5f/d7",
299 "rgb:5f/5f/ff",
300 "rgb:5f/87/00",
301 "rgb:5f/87/5f",
302 "rgb:5f/87/87",
303 "rgb:5f/87/af",
304 "rgb:5f/87/d7",
305 "rgb:5f/87/ff",
306 "rgb:5f/af/00",
307 "rgb:5f/af/5f",
308 "rgb:5f/af/87",
309 "rgb:5f/af/af",
310 "rgb:5f/af/d7",
311 "rgb:5f/af/ff",
312 "rgb:5f/d7/00",
313 "rgb:5f/d7/5f",
314 "rgb:5f/d7/87",
315 "rgb:5f/d7/af",
316 "rgb:5f/d7/d7",
317 "rgb:5f/d7/ff",
318 "rgb:5f/ff/00",
319 "rgb:5f/ff/5f",
320 "rgb:5f/ff/87",
321 "rgb:5f/ff/af",
322 "rgb:5f/ff/d7",
323 "rgb:5f/ff/ff",
324 "rgb:87/00/00",
325 "rgb:87/00/5f",
326 "rgb:87/00/87",
327 "rgb:87/00/af",
328 "rgb:87/00/d7",
329 "rgb:87/00/ff",
330 "rgb:87/5f/00",
331 "rgb:87/5f/5f",
332 "rgb:87/5f/87",
333 "rgb:87/5f/af",
334 "rgb:87/5f/d7",
335 "rgb:87/5f/ff",
336 "rgb:87/87/00",
337 "rgb:87/87/5f",
338 "rgb:87/87/87",
339 "rgb:87/87/af",
340 "rgb:87/87/d7",
341 "rgb:87/87/ff",
342 "rgb:87/af/00",
343 "rgb:87/af/5f",
344 "rgb:87/af/87",
345 "rgb:87/af/af",
346 "rgb:87/af/d7",
347 "rgb:87/af/ff",
348 "rgb:87/d7/00",
349 "rgb:87/d7/5f",
350 "rgb:87/d7/87",
351 "rgb:87/d7/af",
352 "rgb:87/d7/d7",
353 "rgb:87/d7/ff",
354 "rgb:87/ff/00",
355 "rgb:87/ff/5f",
356 "rgb:87/ff/87",
357 "rgb:87/ff/af",
358 "rgb:87/ff/d7",
359 "rgb:87/ff/ff",
360 "rgb:af/00/00",
361 "rgb:af/00/5f",
362 "rgb:af/00/87",
363 "rgb:af/00/af",
364 "rgb:af/00/d7",
365 "rgb:af/00/ff",
366 "rgb:af/5f/00",
367 "rgb:af/5f/5f",
368 "rgb:af/5f/87",
369 "rgb:af/5f/af",
370 "rgb:af/5f/d7",
371 "rgb:af/5f/ff",
372 "rgb:af/87/00",
373 "rgb:af/87/5f",
374 "rgb:af/87/87",
375 "rgb:af/87/af",
376 "rgb:af/87/d7",
377 "rgb:af/87/ff",
378 "rgb:af/af/00",
379 "rgb:af/af/5f",
380 "rgb:af/af/87",
381 "rgb:af/af/af",
382 "rgb:af/af/d7",
383 "rgb:af/af/ff",
384 "rgb:af/d7/00",
385 "rgb:af/d7/5f",
386 "rgb:af/d7/87",
387 "rgb:af/d7/af",
388 "rgb:af/d7/d7",
389 "rgb:af/d7/ff",
390 "rgb:af/ff/00",
391 "rgb:af/ff/5f",
392 "rgb:af/ff/87",
393 "rgb:af/ff/af",
394 "rgb:af/ff/d7",
395 "rgb:af/ff/ff",
396 "rgb:d7/00/00",
397 "rgb:d7/00/5f",
398 "rgb:d7/00/87",
399 "rgb:d7/00/af",
400 "rgb:d7/00/d7",
401 "rgb:d7/00/ff",
402 "rgb:d7/5f/00",
403 "rgb:d7/5f/5f",
404 "rgb:d7/5f/87",
405 "rgb:d7/5f/af",
406 "rgb:d7/5f/d7",
407 "rgb:d7/5f/ff",
408 "rgb:d7/87/00",
409 "rgb:d7/87/5f",
410 "rgb:d7/87/87",
411 "rgb:d7/87/af",
412 "rgb:d7/87/d7",
413 "rgb:d7/87/ff",
414 "rgb:d7/af/00",
415 "rgb:d7/af/5f",
416 "rgb:d7/af/87",
417 "rgb:d7/af/af",
418 "rgb:d7/af/d7",
419 "rgb:d7/af/ff",
420 "rgb:d7/d7/00",
421 "rgb:d7/d7/5f",
422 "rgb:d7/d7/87",
423 "rgb:d7/d7/af",
424 "rgb:d7/d7/d7",
425 "rgb:d7/d7/ff",
426 "rgb:d7/ff/00",
427 "rgb:d7/ff/5f",
428 "rgb:d7/ff/87",
429 "rgb:d7/ff/af",
430 "rgb:d7/ff/d7",
431 "rgb:d7/ff/ff",
432 "rgb:ff/00/00",
433 "rgb:ff/00/5f",
434 "rgb:ff/00/87",
435 "rgb:ff/00/af",
436 "rgb:ff/00/d7",
437 "rgb:ff/00/ff",
438 "rgb:ff/5f/00",
439 "rgb:ff/5f/5f",
440 "rgb:ff/5f/87",
441 "rgb:ff/5f/af",
442 "rgb:ff/5f/d7",
443 "rgb:ff/5f/ff",
444 "rgb:ff/87/00",
445 "rgb:ff/87/5f",
446 "rgb:ff/87/87",
447 "rgb:ff/87/af",
448 "rgb:ff/87/d7",
449 "rgb:ff/87/ff",
450 "rgb:ff/af/00",
451 "rgb:ff/af/5f",
452 "rgb:ff/af/87",
453 "rgb:ff/af/af",
454 "rgb:ff/af/d7",
455 "rgb:ff/af/ff",
456 "rgb:ff/d7/00",
457 "rgb:ff/d7/5f",
458 "rgb:ff/d7/87",
459 "rgb:ff/d7/af",
460 "rgb:ff/d7/d7",
461 "rgb:ff/d7/ff",
462 "rgb:ff/ff/00",
463 "rgb:ff/ff/5f",
464 "rgb:ff/ff/87",
465 "rgb:ff/ff/af",
466 "rgb:ff/ff/d7",
467 "rgb:ff/ff/ff",
468 "rgb:08/08/08",
469 "rgb:12/12/12",
470 "rgb:1c/1c/1c",
471 "rgb:26/26/26",
472 "rgb:30/30/30",
473 "rgb:3a/3a/3a",
474 "rgb:44/44/44",
475 "rgb:4e/4e/4e",
476 "rgb:58/58/58",
477 "rgb:62/62/62",
478 "rgb:6c/6c/6c",
479 "rgb:76/76/76",
480 "rgb:80/80/80",
481 "rgb:8a/8a/8a",
482 "rgb:94/94/94",
483 "rgb:9e/9e/9e",
484 "rgb:a8/a8/a8",
485 "rgb:b2/b2/b2",
486 "rgb:bc/bc/bc",
487 "rgb:c6/c6/c6",
488 "rgb:d0/d0/d0",
489 "rgb:da/da/da",
490 "rgb:e4/e4/e4",
491 "rgb:ee/ee/ee",
492#endif
238 493
239#ifndef NO_CURSORCOLOR 494#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 495 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 496 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 497#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 498 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 499 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 500 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 501#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 502 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 503 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 504 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 505 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 506#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 507#if ENABLE_FRILLS
253 NULL, // Color_underline 508 NULL, // Color_underline
254#endif 509#endif
255#ifdef OPTION_HC 510#ifdef OPTION_HC
256 NULL, 511 NULL,
512 NULL,
257#endif 513#endif
258#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 514 COLOR_SCROLLBAR,
515#ifdef RXVT_SCROLLBAR
260 COLOR_SCROLLTROUGH, 516 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 517#endif
262#if ENABLE_TRANSPARENCY 518#if ENABLE_TRANSPARENCY
263 NULL, 519 NULL,
264#endif 520#endif
265#if OFF_FOCUS_FADING 521#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 522 "rgb:00/00/00",
267#endif 523#endif
268 }; 524 };
269 525
270bool 526void
271rxvt_term::init_vars () 527rxvt_term::init_vars ()
272{ 528{
273 pix_colors = // 529 pix_colors = pix_colors_focused;
274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275#ifdef OFF_FOCUS_FADING
276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277#endif
278
279 530
280 MEvent.time = CurrentTime; 531 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 532 MEvent.button = AnyButton;
282 want_refresh = 1; 533 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 534 priv_modes = SavedModes = PrivMode_Default;
284 ncol = 80; 535 ncol = 80;
285 nrow = 24; 536 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 537 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 538 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 539 lineSpace = LINESPACE;
540 letterSpace = LETTERSPACE;
289 saveLines = SAVELINES; 541 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 542
292 refresh_type = SLOW_REFRESH; 543 refresh_type = SLOW_REFRESH;
293 544
294 oldcursor.row = oldcursor.col = -1; 545 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1;
296 546
297 set_option (Opt_scrollBar); 547 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput); 548 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll); 549 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll); 550 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen); 551 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 552 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 553 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 554 set_option (Opt_intensityStyles);
555 set_option (Opt_iso14755);
305 set_option (Opt_iso14755_52); 556 set_option (Opt_iso14755_52);
306 557 set_option (Opt_buffered);
307 return true;
308}
309
310void
311rxvt_term::init_secondary ()
312{
313 int i;
314
315 /*
316 * Close all unused file descriptors
317 * We don't want them, we don't need them.
318 */
319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
320 {
321 /* TODO: BOO HISS */
322 dup2 (STDERR_FILENO, STDIN_FILENO);
323 }
324 else if (i != STDIN_FILENO)
325 {
326 dup2 (i, STDIN_FILENO);
327 close (i);
328 }
329
330 dup2 (STDERR_FILENO, STDOUT_FILENO);
331
332#if 0 // schmorp sayz closing filies is murder
333 for (i = STDERR_FILENO + 1; i < num_fds; i++)
334 {
335#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
336 if (i == 4 || i == 7)
337 continue;
338#endif
339 close (i);
340 }
341#endif
342} 558}
343 559
344/*----------------------------------------------------------------------*/ 560/*----------------------------------------------------------------------*/
345const char ** 561const char **
346rxvt_term::init_resources (int argc, const char *const *argv) 562rxvt_term::init_resources (int argc, const char *const *argv)
… …
353 */ 569 */
354 for (r_argc = 0; r_argc < argc; r_argc++) 570 for (r_argc = 0; r_argc < argc; r_argc++)
355 if (!strcmp (argv[r_argc], "-e")) 571 if (!strcmp (argv[r_argc], "-e"))
356 break; 572 break;
357 573
574 if (r_argc == argc)
575 cmd_argv = NULL;
576 else if (!argv[r_argc + 1])
577 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
578 else
579 {
580 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
581
582 for (i = 0; i < argc - r_argc - 1; i++)
583 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
584
585 cmd_argv[i] = NULL;
586 }
587
358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 588 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
359 589
360 for (i = 0; i < r_argc; i++) 590 for (i = 0; i < r_argc; i++)
361 r_argv[i] = (const char *)argv[i]; 591 r_argv[i] = (const char *)argv[i];
362 592
363 r_argv[i] = NULL; 593 r_argv[i] = NULL;
364
365 if (r_argc == argc)
366 cmd_argv = NULL;
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
376 594
377 rs[Rs_name] = rxvt_basename (argv[0]); 595 rs[Rs_name] = rxvt_basename (argv[0]);
378 596
379 /* 597 /*
380 * Open display, get options/resources and create the window 598 * Open display, get options/resources and create the window
… …
384 rs[Rs_display_name] = ":0"; 602 rs[Rs_display_name] = ":0";
385 603
386 get_options (r_argc, r_argv); 604 get_options (r_argc, r_argv);
387 605
388 if (!(display = displays.get (rs[Rs_display_name]))) 606 if (!(display = displays.get (rs[Rs_display_name])))
607 {
608 free (r_argv);
389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 609 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
610 }
390 611
391 // using a local pointer decreases code size a lot 612 // using a local pointer decreases code size a lot
392 xa = display->xa; 613 xa = display->xa;
393 614
394 set (display); 615 set (display);
… …
397#if XFT 618#if XFT
398 if (rs[Rs_depth]) 619 if (rs[Rs_depth])
399 select_visual (strtol (rs[Rs_depth], 0, 0)); 620 select_visual (strtol (rs[Rs_depth], 0, 0));
400#endif 621#endif
401 622
402#ifdef HAVE_AFTERIMAGE
403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif
405 free (r_argv); 623 free (r_argv);
406 624
407 for (int i = NUM_RESOURCES; i--; ) 625 for (int i = NUM_RESOURCES; i--; )
408 if (rs [i] == resval_undef) 626 if (rs [i] == resval_undef)
409 rs [i] = 0; 627 rs [i] = 0;
628
629#ifdef HAVE_AFTERIMAGE
630 set_application_name ((char *)rs[Rs_name]);
631 set_output_threshold (OUTPUT_LEVEL_WARNING);
632#endif
633
634#ifdef HAVE_PIXBUF
635 g_type_init ();
636#endif
410 637
411#if ENABLE_PERL 638#if ENABLE_PERL
412 if (!rs[Rs_perl_ext_1]) 639 if (!rs[Rs_perl_ext_1])
413 rs[Rs_perl_ext_1] = "default"; 640 rs[Rs_perl_ext_1] = "default";
414 641
… …
426 */ 653 */
427 if (cmd_argv && cmd_argv[0]) 654 if (cmd_argv && cmd_argv[0])
428 { 655 {
429 if (!rs[Rs_title]) 656 if (!rs[Rs_title])
430 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 657 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
658
431 if (!rs[Rs_iconName]) 659 if (!rs[Rs_iconName])
432 rs[Rs_iconName] = rs[Rs_title]; 660 rs[Rs_iconName] = rs[Rs_title];
433 } 661 }
434 else 662 else
435 { 663 {
436 if (!rs[Rs_title]) 664 if (!rs[Rs_title])
437 rs[Rs_title] = rs[Rs_name]; 665 rs[Rs_title] = rs[Rs_name];
666
438 if (!rs[Rs_iconName]) 667 if (!rs[Rs_iconName])
439 rs[Rs_iconName] = rs[Rs_name]; 668 rs[Rs_iconName] = rs[Rs_name];
440 } 669 }
441 670
442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 671 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
449 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 678 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 679 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
451 680
452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 681 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
453 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 682 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
683
684 if (rs[Rs_letterSpace])
685 letterSpace = atoi (rs[Rs_letterSpace]);
454#endif 686#endif
455 687
456#ifdef POINTER_BLANK 688#ifdef POINTER_BLANK
457 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 689 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
458 pointerBlankDelay = i; 690 pointerBlankDelay = i;
… …
461#endif 693#endif
462 694
463 /* no point having a scrollbar without having any scrollback! */ 695 /* no point having a scrollbar without having any scrollback! */
464 if (!saveLines) 696 if (!saveLines)
465 set_option (Opt_scrollBar, 0); 697 set_option (Opt_scrollBar, 0);
466
467#ifdef PRINTPIPE
468 if (!rs[Rs_print_pipe])
469 rs[Rs_print_pipe] = PRINTPIPE;
470#endif
471 698
472 if (!rs[Rs_cutchars]) 699 if (!rs[Rs_cutchars])
473 rs[Rs_cutchars] = CUTCHARS; 700 rs[Rs_cutchars] = CUTCHARS;
474 701
475#ifndef NO_BACKSPACE_KEY 702#ifndef NO_BACKSPACE_KEY
… …
488# else 715# else
489 rs[Rs_delete_key] = "\033[3~"; 716 rs[Rs_delete_key] = "\033[3~";
490# endif 717# endif
491#endif 718#endif
492 719
493#ifdef HAVE_SCROLLBARS 720 scrollBar.setup (this);
494 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
495#endif
496 721
497#ifdef XTERM_REVERSE_VIDEO 722#ifdef XTERM_REVERSE_VIDEO
498 /* this is how xterm implements reverseVideo */ 723 /* this is how xterm implements reverseVideo */
499 if (option (Opt_reverseVideo)) 724 if (option (Opt_reverseVideo))
500 { 725 {
… …
520 color_aliases (Color_fg); 745 color_aliases (Color_fg);
521 color_aliases (Color_bg); 746 color_aliases (Color_bg);
522#ifndef NO_CURSORCOLOR 747#ifndef NO_CURSORCOLOR
523 color_aliases (Color_cursor); 748 color_aliases (Color_cursor);
524 color_aliases (Color_cursor2); 749 color_aliases (Color_cursor2);
525#endif /* NO_CURSORCOLOR */ 750#endif /* NO_CURSORCOLOR */
526 color_aliases (Color_pointer_fg); 751 color_aliases (Color_pointer_fg);
527 color_aliases (Color_pointer_bg); 752 color_aliases (Color_pointer_bg);
528 color_aliases (Color_border); 753 color_aliases (Color_border);
529#ifndef NO_BOLD_UNDERLINE_REVERSE 754#ifndef NO_BOLD_UNDERLINE_REVERSE
530 color_aliases (Color_BD); 755 color_aliases (Color_BD);
531 color_aliases (Color_UL); 756 color_aliases (Color_UL);
532 color_aliases (Color_RV); 757 color_aliases (Color_RV);
533#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 758#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
534 759
535 if (!rs[Rs_color + Color_border]) 760 if (!rs[Rs_color + Color_border])
536 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 761 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
537 762
538 return cmd_argv; 763 return cmd_argv;
764}
765
766/*----------------------------------------------------------------------*/
767void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
769{
770 this->envv = envv;
771
772 SET_R (this);
773 set_locale ("");
774 set_environ (envv); // a few things in X do not call setlocale :(
775
776 init_vars ();
777
778 const char **cmd_argv = init_resources (argc, argv);
779
780#ifdef KEYSYM_RESOURCE
781 keyboard->register_done ();
782#endif
783
784 if (const char *path = rs[Rs_chdir])
785 if (*path) // ignored if empty
786 {
787 if (*path != '/')
788 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
789
790 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 }
793
794 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
796
797 pty = ptytty::create ();
798
799 create_windows (argc, argv);
800
801 init_xlocale ();
802
803 scr_poweron (); // initialize screen
804
805#if 0
806 XSynchronize (dpy, True);
807#endif
808
809 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP
812 {
813 bgPixmap.set_target (this);
814 bgPixmap.invalidate ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bgPixmap.set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif
856
857#if ENABLE_PERL
858 rootwin_ev.start (display, display->root);
859#endif
860
861 set_colorfgbg ();
862
863 init_command (cmd_argv);
864
865 free (cmd_argv);
866
867 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ);
869
870 HOOK_INVOKE ((this, HOOK_START, DT_END));
871
872#if ENABLE_XEMBED
873 if (rs[Rs_embed])
874 {
875 long info[2] = { 0, XEMBED_MAPPED };
876
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2);
879 }
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]);
884
885 refresh_check ();
539} 886}
540 887
541/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
542void 889void
543rxvt_term::init_env () 890rxvt_term::init_env ()
544{ 891{
545 int i;
546 char *val; 892 char *val;
547 893
548#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
549 /* Fixup display_name for export over pty to any interested terminal 895 /* Fixup display_name for export over pty to any interested terminal
550 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 896 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
558 */ 904 */
559 val = rxvt_network_display (rs[Rs_display_name]); 905 val = rxvt_network_display (rs[Rs_display_name]);
560 rs[Rs_display_name] = (const char *)val; 906 rs[Rs_display_name] = (const char *)val;
561 907
562 if (val == NULL) 908 if (val == NULL)
563#endif /* DISPLAY_IS_IP */ 909#endif /* DISPLAY_IS_IP */
564 val = XDisplayString (dpy); 910 val = XDisplayString (dpy);
565 911
566 if (rs[Rs_display_name] == NULL) 912 if (rs[Rs_display_name] == NULL)
567 rs[Rs_display_name] = val; /* use broken `:0' value */ 913 rs[Rs_display_name] = val; /* use broken `:0' value */
568 914
569 i = strlen (val);
570 env_display = (char *)rxvt_malloc (i + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
571 916
572 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
573 918
574 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
575 920
… …
608#ifdef HAVE_UNSETENV 953#ifdef HAVE_UNSETENV
609 /* avoid passing old settings and confusing term size */ 954 /* avoid passing old settings and confusing term size */
610 unsetenv ("LINES"); 955 unsetenv ("LINES");
611 unsetenv ("COLUMNS"); 956 unsetenv ("COLUMNS");
612 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
613#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
614} 959}
615 960
616/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
617/* 962/*
618 * This is more or less stolen straight from XFree86 xterm. 963 * This is more or less stolen straight from XFree86 xterm.
… …
639 984
640 this->locale = "C"; 985 this->locale = "C";
641 } 986 }
642 987
643 988
644 this->locale = rxvt_strdup (this->locale); 989 this->locale = strdup (this->locale);
645 SET_LOCALE (this->locale); 990 SET_LOCALE (this->locale);
646 mbstate.reset (); 991 mbstate.reset ();
647#endif 992#endif
648 993
649#if HAVE_NL_LANGINFO 994#if HAVE_NL_LANGINFO
… …
722 run_command (argv); 1067 run_command (argv);
723} 1068}
724 1069
725/*----------------------------------------------------------------------*/ 1070/*----------------------------------------------------------------------*/
726void 1071void
727rxvt_term::Get_Colours () 1072rxvt_term::get_colours ()
728{ 1073{
729 int i; 1074 int i;
730 1075
731#ifdef OFF_FOCUS_FADING 1076#ifdef OFF_FOCUS_FADING
732 pix_colors = pix_colors_focused; 1077 pix_colors = pix_colors_focused;
733#endif 1078#endif
734 1079
735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1080 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
736 { 1081 {
737 const char *name = rs[Rs_color + i]; 1082 const char *name = rs[Rs_color + i];
738 1083
739 if (!name) 1084 if (!name)
… …
792 * get scrollBar shadow colors 1137 * get scrollBar shadow colors
793 * 1138 *
794 * The calculations of topShadow/bottomShadow values are adapted 1139 * The calculations of topShadow/bottomShadow values are adapted
795 * from the fvwm window manager. 1140 * from the fvwm window manager.
796 */ 1141 */
797#ifdef KEEP_SCROLLCOLOR 1142#ifdef RXVT_SCROLLBAR
798 if (depth <= 2) 1143 if (depth <= 2)
799 { 1144 {
800 /* Monochrome */ 1145 /* Monochrome */
801 alias_color (Color_scroll, Color_fg); 1146 alias_color (Color_scroll, Color_fg);
802 alias_color (Color_topShadow, Color_bg); 1147 alias_color (Color_topShadow, Color_bg);
… …
817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1162 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
818 cscroll.a) 1163 cscroll.a)
819 )) 1164 ))
820 alias_color (Color_topShadow, Color_White); 1165 alias_color (Color_topShadow, Color_White);
821 } 1166 }
822#endif /* KEEP_SCROLLCOLOR */ 1167#endif
823 1168
824#ifdef OFF_FOCUS_FADING 1169#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1170 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i); 1171 update_fade_color (i);
827#endif 1172#endif
… …
835 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1180 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
836 { 1181 {
837 int i = atoi (rs[Rs_color + idx]); 1182 int i = atoi (rs[Rs_color + idx]);
838 1183
839 if (i >= 8 && i <= 15) 1184 if (i >= 8 && i <= 15)
840 { /* bright colors */ 1185 /* bright colors */
841 i -= 8;
842 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1186 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
843 return; 1187 else if (i >= 0 && i <= 7)
844 } 1188 /* normal colors */
845
846 if (i >= 0 && i <= 7) /* normal colors */
847 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1189 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
848 } 1190 }
849} 1191}
850 1192
851/*----------------------------------------------------------------------*/ 1193/*----------------------------------------------------------------------*/
… …
935 1277
936 if (i) 1278 if (i)
937 ModMetaMask = modmasks[i - 1]; 1279 ModMetaMask = modmasks[i - 1];
938} 1280}
939 1281
1282void
1283rxvt_term::set_icon (const char *file)
1284{
1285#ifdef HAVE_AFTERIMAGE
1286 init_asv ();
1287
1288 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1289 if (!im)
1290 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return;
1293 }
1294
1295 unsigned int w = im->width;
1296 unsigned int h = im->height;
1297
1298 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1299 {
1300 rxvt_warn ("Icon image too big, continuing without.\n");
1301 destroy_asimage (&im);
1302 return;
1303 }
1304
1305 ASImage *result = scale_asimage (asv, im,
1306 w, h, ASA_ARGB32,
1307 100, ASIMAGE_QUALITY_DEFAULT);
1308 destroy_asimage (&im);
1309
1310 if (!result)
1311 {
1312 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1313 return;
1314 }
1315
1316 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1317 if (buffer)
1318 {
1319 ARGB32 *asbuf = result->alt.argb32;
1320 buffer [0] = w;
1321 buffer [1] = h;
1322
1323 for (unsigned int i = 0; i < w * h; ++i)
1324 buffer [i + 2] = asbuf [i];
1325
1326 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1327 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1328 free (buffer);
1329 }
1330 else
1331 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1332
1333 destroy_asimage (&result);
1334#endif
1335
1336#ifdef HAVE_PIXBUF
1337 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1338 if (!pixbuf)
1339 {
1340 rxvt_warn ("Loading image icon failed, continuing without.\n");
1341 return;
1342 }
1343
1344 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1345 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1346
1347 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1348 {
1349 rxvt_warn ("Icon image too big, continuing without.\n");
1350 g_object_unref (pixbuf);
1351 return;
1352 }
1353
1354 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1355 {
1356 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1357 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1358 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1359
1360 buffer [0] = w;
1361 buffer [1] = h;
1362 for (int i = 0; i < h; i++)
1363 {
1364 for (int j = 0; j < w; j++)
1365 {
1366 unsigned char *pixel = row + j * channels;
1367 long value;
1368
1369 if (channels == 4)
1370 value = pixel[3];
1371 else
1372 value = (unsigned char)0x00ff;
1373
1374 value = (value << 8) + pixel[0];
1375 value = (value << 8) + pixel[1];
1376 value = (value << 8) + pixel[2];
1377 buffer[(i * w + j) + 2] = value;
1378 }
1379
1380 row += rowstride;
1381 }
1382
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer);
1386 }
1387 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1389
1390 g_object_unref (pixbuf);
1391#endif
1392}
1393
940/*----------------------------------------------------------------------*/ 1394/*----------------------------------------------------------------------*/
941/* rxvt_Create_Windows () - Open and map the window */ 1395/* rxvt_Create_Windows () - Open and map the window */
942void 1396void
943rxvt_term::create_windows (int argc, const char *const *argv) 1397rxvt_term::create_windows (int argc, const char *const *argv)
944{ 1398{
… …
952 Window top, parent; 1406 Window top, parent;
953 1407
954 dLocal (Display *, dpy); 1408 dLocal (Display *, dpy);
955 1409
956 /* grab colors before netscape does */ 1410 /* grab colors before netscape does */
957 Get_Colours (); 1411 get_colours ();
958 1412
959 if (!set_fonts ()) 1413 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1414 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961 1415
962 parent = display->root; 1416 parent = display->root;
… …
1010 this->parent[0] = top; 1464 this->parent[0] = top;
1011 1465
1012 old_width = szHint.width; 1466 old_width = szHint.width;
1013 old_height = szHint.height; 1467 old_height = szHint.height;
1014 1468
1015 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1469 set_title (rs [Rs_title]);
1016 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1470 set_icon_name (rs [Rs_iconName]);
1017 1471
1018 classHint.res_name = (char *)rs[Rs_name]; 1472 classHint.res_name = (char *)rs[Rs_name];
1019 classHint.res_class = (char *)RESCLASS; 1473 classHint.res_class = (char *)RESCLASS;
1020 1474
1021 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1475 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1023 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1477 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1024 wmHint.window_group = top; 1478 wmHint.window_group = top;
1025 1479
1026 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1480 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1027 &szHint, &wmHint, &classHint); 1481 &szHint, &wmHint, &classHint);
1482#if ENABLE_EWMH
1483 /*
1484 * set up icon hint
1485 * rs [Rs_iconfile] is path to icon
1486 */
1487
1488 if (rs [Rs_iconfile])
1489 {
1490 set_icon (rs [Rs_iconfile]);
1491 }
1492#endif
1028 1493
1029#if ENABLE_FRILLS 1494#if ENABLE_FRILLS
1030 if (mwmhints.flags) 1495 if (mwmhints.flags)
1031 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1496 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1032 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1497 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1037#if ENABLE_EWMH 1502#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING], 1503 xa[XA_NET_WM_PING],
1039#endif 1504#endif
1040 }; 1505 };
1041 1506
1042 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1043 1508
1044#if ENABLE_FRILLS 1509#if ENABLE_FRILLS
1045 if (rs[Rs_transient_for]) 1510 if (rs[Rs_transient_for])
1046 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1047#endif 1512#endif
… …
1066 1531
1067 termwin_ev.start (display, top); 1532 termwin_ev.start (display, top);
1068 1533
1069 /* vt cursor: Black-on-White is standard, but this is more popular */ 1534 /* vt cursor: Black-on-White is standard, but this is more popular */
1070 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1535 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1071
1072#ifdef HAVE_SCROLLBARS
1073 /* cursor scrollBar: Black-on-White */
1074 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1075#endif
1076 1536
1077 /* the vt window */ 1537 /* the vt window */
1078 vt = XCreateSimpleWindow (dpy, top, 1538 vt = XCreateSimpleWindow (dpy, top,
1079 window_vt_x, window_vt_y, 1539 window_vt_x, window_vt_y,
1080 width, height, 1540 width, height,
… …
1105 GCForeground | GCBackground | GCGraphicsExposures, 1565 GCForeground | GCBackground | GCGraphicsExposures,
1106 &gcvalue); 1566 &gcvalue);
1107 1567
1108 drawable = new rxvt_drawable (this, vt); 1568 drawable = new rxvt_drawable (this, vt);
1109 1569
1110#ifdef RXVT_SCROLLBAR
1111 gcvalue.foreground = pix_colors[Color_topShadow];
1112 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1114 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1116 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117#endif
1118
1119#ifdef OFF_FOCUS_FADING 1570#ifdef OFF_FOCUS_FADING
1120 // initially we are in unfocused state 1571 // initially we are in unfocused state
1121 if (rs[Rs_fade]) 1572 if (rs[Rs_fade])
1122 pix_colors = pix_colors_unfocused; 1573 pix_colors = pix_colors_unfocused;
1123#endif 1574#endif
1124 1575
1125 pointer_unblank (); 1576 pointer_unblank ();
1126 scr_recolour (); 1577 scr_recolour ();
1127}
1128
1129/* ------------------------------------------------------------------------- *
1130 * GET TTY CURRENT STATE *
1131 * ------------------------------------------------------------------------- */
1132void
1133rxvt_get_ttymode (ttymode_t *tio, int erase)
1134{
1135 /*
1136 * standard System V termios interface
1137 */
1138 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1139 {
1140 // return error - use system defaults,
1141 // where possible, and zero elsewhere
1142 memset (tio, 0, sizeof (ttymode_t));
1143
1144 tio->c_cc[VINTR] = CINTR;
1145 tio->c_cc[VQUIT] = CQUIT;
1146 tio->c_cc[VERASE] = CERASE;
1147#ifdef VERASE2
1148 tio->c_cc[VERASE2] = CERASE2;
1149#endif
1150 tio->c_cc[VKILL] = CKILL;
1151 tio->c_cc[VSTART] = CSTART;
1152 tio->c_cc[VSTOP] = CSTOP;
1153 tio->c_cc[VSUSP] = CSUSP;
1154# ifdef VDSUSP
1155 tio->c_cc[VDSUSP] = CDSUSP;
1156# endif
1157# ifdef VREPRINT
1158 tio->c_cc[VREPRINT] = CRPRNT;
1159# endif
1160# ifdef VDISCRD
1161 tio->c_cc[VDISCRD] = CFLUSH;
1162# endif
1163# ifdef VWERSE
1164 tio->c_cc[VWERSE] = CWERASE;
1165# endif
1166# ifdef VLNEXT
1167 tio->c_cc[VLNEXT] = CLNEXT;
1168# endif
1169 }
1170
1171 tio->c_cc[VEOF] = CEOF;
1172 tio->c_cc[VEOL] = VDISABLE;
1173# ifdef VEOL2
1174 tio->c_cc[VEOL2] = VDISABLE;
1175# endif
1176# ifdef VSWTC
1177 tio->c_cc[VSWTC] = VDISABLE;
1178# endif
1179# ifdef VSWTCH
1180 tio->c_cc[VSWTCH] = VDISABLE;
1181# endif
1182# if VMIN != VEOF
1183 tio->c_cc[VMIN] = 1;
1184# endif
1185# if VTIME != VEOL
1186 tio->c_cc[VTIME] = 0;
1187# endif
1188
1189 if (erase != -1)
1190 tio->c_cc[VERASE] = (char)erase;
1191
1192 /* input modes */
1193 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1194# ifdef IMAXBEL
1195 | IMAXBEL
1196# endif
1197 | IXON);
1198
1199 /* output modes */
1200 tio->c_oflag = (OPOST | ONLCR);
1201
1202 /* control modes */
1203 tio->c_cflag = (CS8 | CREAD);
1204
1205 /* line discipline modes */
1206 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1207# if defined (ECHOCTL) && defined (ECHOKE)
1208 | ECHOCTL | ECHOKE
1209# endif
1210 | ECHOE | ECHOK);
1211
1212 /*
1213 * Debugging
1214 */
1215#ifdef DEBUG_TTYMODE
1216#ifdef HAVE_TERMIOS_H
1217 /* c_iflag bits */
1218 fprintf (stderr, "Input flags\n");
1219
1220 /* cpp token stringize doesn't work on all machines <sigh> */
1221# define FOO(flag,name) \
1222 if ((tio->c_iflag) & flag) \
1223 fprintf (stderr, "%s ", name)
1224
1225 /* c_iflag bits */
1226 FOO (IGNBRK, "IGNBRK");
1227 FOO (BRKINT, "BRKINT");
1228 FOO (IGNPAR, "IGNPAR");
1229 FOO (PARMRK, "PARMRK");
1230 FOO (INPCK, "INPCK");
1231 FOO (ISTRIP, "ISTRIP");
1232 FOO (INLCR, "INLCR");
1233 FOO (IGNCR, "IGNCR");
1234 FOO (ICRNL, "ICRNL");
1235 FOO (IXON, "IXON");
1236 FOO (IXOFF, "IXOFF");
1237# ifdef IUCLC
1238 FOO (IUCLC, "IUCLC");
1239# endif
1240# ifdef IXANY
1241 FOO (IXANY, "IXANY");
1242# endif
1243# ifdef IMAXBEL
1244 FOO (IMAXBEL, "IMAXBEL");
1245# endif
1246
1247 fprintf (stderr, "\n");
1248
1249# undef FOO
1250# define FOO(entry, name) \
1251 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1252
1253 FOO (VINTR, "VINTR");
1254 FOO (VQUIT, "VQUIT");
1255 FOO (VERASE, "VERASE");
1256 FOO (VKILL, "VKILL");
1257 FOO (VEOF, "VEOF");
1258 FOO (VEOL, "VEOL");
1259# ifdef VEOL2
1260 FOO (VEOL2, "VEOL2");
1261# endif
1262# ifdef VSWTC
1263 FOO (VSWTC, "VSWTC");
1264# endif
1265# ifdef VSWTCH
1266 FOO (VSWTCH, "VSWTCH");
1267# endif
1268 FOO (VSTART, "VSTART");
1269 FOO (VSTOP, "VSTOP");
1270 FOO (VSUSP, "VSUSP");
1271# ifdef VDSUSP
1272 FOO (VDSUSP, "VDSUSP");
1273# endif
1274# ifdef VREPRINT
1275 FOO (VREPRINT, "VREPRINT");
1276# endif
1277# ifdef VDISCRD
1278 FOO (VDISCRD, "VDISCRD");
1279# endif
1280# ifdef VWERSE
1281 FOO (VWERSE, "VWERSE");
1282# endif
1283# ifdef VLNEXT
1284 FOO (VLNEXT, "VLNEXT");
1285# endif
1286
1287 fprintf (stderr, "\n");
1288# undef FOO
1289# endif /* HAVE_TERMIOS_H */
1290#endif /* DEBUG_TTYMODE */
1291} 1578}
1292 1579
1293/*----------------------------------------------------------------------*/ 1580/*----------------------------------------------------------------------*/
1294/* 1581/*
1295 * Run the command in a subprocess and return a file descriptor for the 1582 * Run the command in a subprocess and return a file descriptor for the
… …
1316 else 1603 else
1317#endif 1604#endif
1318 if (!pty->get ()) 1605 if (!pty->get ())
1319 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1606 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1320 1607
1321 int er; 1608 struct termios tio = def_tio;
1322 1609
1323#ifndef NO_BACKSPACE_KEY 1610#ifndef NO_BACKSPACE_KEY
1324 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1611 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1325 er = rs[Rs_backspace_key][0]; 1612 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1326 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1613 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */ 1614 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1328 else
1329#endif 1615#endif
1330 er = -1;
1331 1616
1332 rxvt_get_ttymode (&tio, er); 1617 /* init terminal attributes */
1333 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1618 cfsetospeed (&tio, BAUDRATE);
1619 cfsetispeed (&tio, BAUDRATE);
1620 tcsetattr (pty->tty, TCSANOW, &tio);
1334 pty->set_utf8_mode (enc_utf8); 1621 pty->set_utf8_mode (enc_utf8);
1335 1622
1336 /* set initial window size */ 1623 /* set initial window size */
1337 tt_winch (); 1624 tt_winch ();
1338 1625
… …
1398rxvt_term::run_child (const char *const *argv) 1685rxvt_term::run_child (const char *const *argv)
1399{ 1686{
1400 char *login; 1687 char *login;
1401 1688
1402 if (option (Opt_console)) 1689 if (option (Opt_console))
1690 {
1403 { /* be virtual console, fail silently */ 1691 /* be virtual console, fail silently */
1404#ifdef TIOCCONS 1692#ifdef TIOCCONS
1405 unsigned int on = 1; 1693 unsigned int on = 1;
1406 1694
1407 ioctl (STDIN_FILENO, TIOCCONS, &on); 1695 ioctl (STDIN_FILENO, TIOCCONS, &on);
1408#elif defined (SRIOCSREDIR) 1696#elif defined (SRIOCSREDIR)
… …
1410 1698
1411 fd = open (CONSOLE, O_WRONLY, 0); 1699 fd = open (CONSOLE, O_WRONLY, 0);
1412 if (fd >= 0) 1700 if (fd >= 0)
1413 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1701 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1414 close (fd); 1702 close (fd);
1415#endif /* SRIOCSREDIR */ 1703#endif /* SRIOCSREDIR */
1416 } 1704 }
1417 1705
1418 /* reset signals and spin off the command interpreter */ 1706 /* reset signals and spin off the command interpreter */
1419 signal (SIGINT, SIG_DFL); 1707 signal (SIGINT, SIG_DFL);
1420 signal (SIGQUIT, SIG_DFL); 1708 signal (SIGQUIT, SIG_DFL);
1421 signal (SIGCHLD, SIG_DFL); 1709 signal (SIGCHLD, SIG_DFL);
1422 signal (SIGHUP, SIG_DFL); 1710 signal (SIGHUP, SIG_DFL);
1423 signal (SIGPIPE, SIG_DFL); 1711 signal (SIGPIPE, SIG_DFL);
1424 /* 1712 /*
1425 * mimick login's behavior by disabling the job control signals 1713 * mimic login's behavior by disabling the job control signals
1426 * a shell that wants them can turn them back on 1714 * a shell that wants them can turn them back on
1427 */ 1715 */
1428#ifdef SIGTSTP 1716#ifdef SIGTSTP
1429 signal (SIGTSTP, SIG_IGN); 1717 signal (SIGTSTP, SIG_IGN);
1430 signal (SIGTTIN, SIG_IGN); 1718 signal (SIGTTIN, SIG_IGN);
1431 signal (SIGTTOU, SIG_IGN); 1719 signal (SIGTTOU, SIG_IGN);
1432#endif /* SIGTSTP */ 1720#endif /* SIGTSTP */
1433
1434 // unblock signals (signals are blocked by iom.C
1435 sigset_t ss;
1436 sigemptyset (&ss);
1437 sigprocmask (SIG_SETMASK, &ss, 0);
1438 1721
1439 /* command interpreter path */ 1722 /* command interpreter path */
1440 if (argv) 1723 if (argv)
1441 { 1724 {
1442# ifdef DEBUG_CMD 1725# ifdef DEBUG_CMD
… …
1454 const char *argv0, *shell; 1737 const char *argv0, *shell;
1455 1738
1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1739 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1457 shell = "/bin/sh"; 1740 shell = "/bin/sh";
1458 1741
1459 argv0 = (const char *)rxvt_basename (shell); 1742 argv0 = rxvt_basename (shell);
1460 1743
1461 if (option (Opt_loginShell)) 1744 if (option (Opt_loginShell))
1462 { 1745 {
1463 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1746 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1464 1747

Diff Legend

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