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.214 by ayin, Fri Sep 14 17:10:34 2007 UTC vs.
Revision 1.298 by sf-exg, Fri Aug 19 17:42:09 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 <schmorp@schmorp.de>
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>
… …
129 143
130 return rval; 144 return rval;
131} 145}
132#endif 146#endif
133 147
134const char *const def_colorName[] = 148static const char *const def_colorName[] =
135 { 149 {
136 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
137 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
138 /* low-intensity colors */ 152 /* low-intensity colors */
139 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
141 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 162# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 164# endif
151 /* high-intensity colors */ 165 /* high-intensity colors */
152# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
160 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
161 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
162 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
163 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
164 178
179#if !USE_256_COLORS
165 // 88 xterm colours 180 // 88 xterm colours
166 "rgb:00/00/00", 181 "rgb:00/00/00",
167 "rgb:00/00/8b", 182 "rgb:00/00/8b",
168 "rgb:00/00/cd", 183 "rgb:00/00/cd",
169 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
233 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
234 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
235 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
236 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
237 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
238 496
239#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 503 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 510#if ENABLE_FRILLS
253 NULL, // Color_underline 511 NULL, // Color_underline
254#endif 512#endif
255#ifdef OPTION_HC 513#ifdef OPTION_HC
256 NULL, 514 NULL,
515 NULL,
257#endif 516#endif
258#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
260 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 520#endif
262#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
263 NULL, 522 NULL,
264#endif 523#endif
265#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 525 "rgb:00/00/00",
267#endif 526#endif
268 }; 527 };
269 528
270bool 529void
271rxvt_term::init_vars () 530rxvt_term::init_vars ()
272{ 531{
273 pix_colors = // 532 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 533
280 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
282 want_refresh = 1; 536 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
284 ncol = 80; 538 ncol = 80;
285 nrow = 24; 539 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
289 saveLines = SAVELINES; 544 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 545
292 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
293 547
294 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1;
296 549
297 set_option (Opt_scrollBar); 550 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput); 551 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll); 552 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
305 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
306 560 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} 561}
343 562
344/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
345const char ** 564const char **
346rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
353 */ 572 */
354 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
355 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
356 break; 575 break;
357 576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
359 592
360 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
361 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
362 595
363 r_argv[i] = NULL; 596 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 597
377 rs[Rs_name] = rxvt_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
378 599
379 /* 600 /*
380 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
… …
384 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
385 606
386 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
387 608
388 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
390 614
391 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
392 xa = display->xa; 616 xa = display->xa;
393 617
394 set (display); 618 set (display);
… …
397#if XFT 621#if XFT
398 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
399 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
400#endif 624#endif
401 625
402#ifdef HAVE_AFTERIMAGE
403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif
405 free (r_argv); 626 free (r_argv);
406 627
407 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
408 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
409 rs [i] = 0; 630 rs [i] = 0;
… …
426 */ 647 */
427 if (cmd_argv && cmd_argv[0]) 648 if (cmd_argv && cmd_argv[0])
428 { 649 {
429 if (!rs[Rs_title]) 650 if (!rs[Rs_title])
430 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 651 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
652
431 if (!rs[Rs_iconName]) 653 if (!rs[Rs_iconName])
432 rs[Rs_iconName] = rs[Rs_title]; 654 rs[Rs_iconName] = rs[Rs_title];
433 } 655 }
434 else 656 else
435 { 657 {
436 if (!rs[Rs_title]) 658 if (!rs[Rs_title])
437 rs[Rs_title] = rs[Rs_name]; 659 rs[Rs_title] = rs[Rs_name];
660
438 if (!rs[Rs_iconName]) 661 if (!rs[Rs_iconName])
439 rs[Rs_iconName] = rs[Rs_name]; 662 rs[Rs_iconName] = rs[Rs_name];
440 } 663 }
441 664
442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 665 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
449 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 672 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 673 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
451 674
452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 675 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
453 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 676 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
677
678 if (rs[Rs_letterSpace])
679 letterSpace = atoi (rs[Rs_letterSpace]);
454#endif 680#endif
455 681
456#ifdef POINTER_BLANK 682#ifdef POINTER_BLANK
457 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
458 pointerBlankDelay = i; 684 pointerBlankDelay = i;
… …
461#endif 687#endif
462 688
463 /* no point having a scrollbar without having any scrollback! */ 689 /* no point having a scrollbar without having any scrollback! */
464 if (!saveLines) 690 if (!saveLines)
465 set_option (Opt_scrollBar, 0); 691 set_option (Opt_scrollBar, 0);
466
467#ifdef PRINTPIPE
468 if (!rs[Rs_print_pipe])
469 rs[Rs_print_pipe] = PRINTPIPE;
470#endif
471 692
472 if (!rs[Rs_cutchars]) 693 if (!rs[Rs_cutchars])
473 rs[Rs_cutchars] = CUTCHARS; 694 rs[Rs_cutchars] = CUTCHARS;
474 695
475#ifndef NO_BACKSPACE_KEY 696#ifndef NO_BACKSPACE_KEY
… …
488# else 709# else
489 rs[Rs_delete_key] = "\033[3~"; 710 rs[Rs_delete_key] = "\033[3~";
490# endif 711# endif
491#endif 712#endif
492 713
493#ifdef HAVE_SCROLLBARS 714 scrollBar.setup (this);
494 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
495#endif
496 715
497#ifdef XTERM_REVERSE_VIDEO 716#ifdef XTERM_REVERSE_VIDEO
498 /* this is how xterm implements reverseVideo */ 717 /* this is how xterm implements reverseVideo */
499 if (option (Opt_reverseVideo)) 718 if (option (Opt_reverseVideo))
500 { 719 {
… …
520 color_aliases (Color_fg); 739 color_aliases (Color_fg);
521 color_aliases (Color_bg); 740 color_aliases (Color_bg);
522#ifndef NO_CURSORCOLOR 741#ifndef NO_CURSORCOLOR
523 color_aliases (Color_cursor); 742 color_aliases (Color_cursor);
524 color_aliases (Color_cursor2); 743 color_aliases (Color_cursor2);
525#endif /* NO_CURSORCOLOR */ 744#endif /* NO_CURSORCOLOR */
526 color_aliases (Color_pointer_fg); 745 color_aliases (Color_pointer_fg);
527 color_aliases (Color_pointer_bg); 746 color_aliases (Color_pointer_bg);
528 color_aliases (Color_border); 747 color_aliases (Color_border);
529#ifndef NO_BOLD_UNDERLINE_REVERSE 748#ifndef NO_BOLD_UNDERLINE_REVERSE
530 color_aliases (Color_BD); 749 color_aliases (Color_BD);
531 color_aliases (Color_UL); 750 color_aliases (Color_UL);
532 color_aliases (Color_RV); 751 color_aliases (Color_RV);
533#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 752#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
534 753
535 if (!rs[Rs_color + Color_border]) 754 if (!rs[Rs_color + Color_border])
536 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 755 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
537 756
538 return cmd_argv; 757 return cmd_argv;
758}
759
760/*----------------------------------------------------------------------*/
761void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
763{
764 this->envv = envv;
765
766 SET_R (this);
767 set_locale ("");
768 set_environ (envv); // a few things in X do not call setlocale :(
769
770 init_vars ();
771
772 const char **cmd_argv = init_resources (argc, argv);
773
774#ifdef KEYSYM_RESOURCE
775 keyboard->register_done ();
776#endif
777
778 if (const char *path = rs[Rs_chdir])
779 if (*path) // ignored if empty
780 {
781 if (*path != '/')
782 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
783
784 if (chdir (path))
785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
786 }
787
788 if (option (Opt_scrollBar))
789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
790
791 pty = ptytty::create ();
792
793 create_windows (argc, argv);
794
795 init_xlocale ();
796
797 scr_poweron (); // initialize screen
798
799#if 0
800 XSynchronize (dpy, True);
801#endif
802
803 if (option (Opt_scrollBar))
804 scrollBar.resize (); /* create and map scrollbar */
805#ifdef HAVE_BG_PIXMAP
806 {
807 bg_init ();
808
809#ifdef ENABLE_TRANSPARENCY
810 if (option (Opt_transparent))
811 {
812 bg_set_transparent ();
813
814 if (rs [Rs_blurradius])
815 bg_set_blur (rs [Rs_blurradius]);
816
817 if (ISSET_PIXCOLOR (Color_tint))
818 bg_set_tint (pix_colors_focused [Color_tint]);
819
820 if (rs [Rs_shade])
821 bg_set_shade (rs [Rs_shade]);
822
823 bg_set_root_pixmap ();
824 XSelectInput (dpy, display->root, PropertyChangeMask);
825 rootwin_ev.start (display, display->root);
826 }
827#endif
828
829#ifdef BG_IMAGE_FROM_FILE
830 if (rs[Rs_backgroundPixmap])
831 {
832 if (bg_set_file (rs[Rs_backgroundPixmap]))
833 if (!bg_window_position_sensitive ())
834 update_background ();
835 }
836#endif
837 }
838#endif
839
840#if ENABLE_PERL
841 rootwin_ev.start (display, display->root);
842#endif
843
844 set_colorfgbg ();
845
846 init_command (cmd_argv);
847
848 free (cmd_argv);
849
850 if (pty->pty >= 0)
851 pty_ev.start (pty->pty, ev::READ);
852
853 HOOK_INVOKE ((this, HOOK_START, DT_END));
854
855#if ENABLE_XEMBED
856 if (rs[Rs_embed])
857 {
858 long info[2] = { 0, XEMBED_MAPPED };
859
860 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
861 32, PropModeReplace, (unsigned char *)&info, 2);
862 }
863#endif
864
865 XMapWindow (dpy, vt);
866 XMapWindow (dpy, parent);
867
868 refresh_check ();
539} 869}
540 870
541/*----------------------------------------------------------------------*/ 871/*----------------------------------------------------------------------*/
542void 872void
543rxvt_term::init_env () 873rxvt_term::init_env ()
544{ 874{
545 int i;
546 char *val; 875 char *val;
547 876
548#ifdef DISPLAY_IS_IP 877#ifdef DISPLAY_IS_IP
549 /* Fixup display_name for export over pty to any interested terminal 878 /* 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 879 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
558 */ 887 */
559 val = rxvt_network_display (rs[Rs_display_name]); 888 val = rxvt_network_display (rs[Rs_display_name]);
560 rs[Rs_display_name] = (const char *)val; 889 rs[Rs_display_name] = (const char *)val;
561 890
562 if (val == NULL) 891 if (val == NULL)
563#endif /* DISPLAY_IS_IP */ 892#endif /* DISPLAY_IS_IP */
564 val = XDisplayString (dpy); 893 val = XDisplayString (dpy);
565 894
566 if (rs[Rs_display_name] == NULL) 895 if (rs[Rs_display_name] == NULL)
567 rs[Rs_display_name] = val; /* use broken `:0' value */ 896 rs[Rs_display_name] = val; /* use broken `:0' value */
568 897
569 i = strlen (val);
570 env_display = (char *)rxvt_malloc (i + 9); 898 env_display = (char *)rxvt_malloc (strlen (val) + 9);
571 899
572 sprintf (env_display, "DISPLAY=%s", val); 900 sprintf (env_display, "DISPLAY=%s", val);
573 901
574 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 902 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
575 903
576 /* add entries to the environment: 904 /* add entries to the environment:
577 * @ DISPLAY: in case we started with -display 905 * @ DISPLAY: in case we started with -display
578 * @ WINDOWID: X window id number of the window 906 * @ WINDOWID: X window id number of the window
579 * @ COLORTERM: terminal sub-name and also indicates its color 907 * @ COLORTERM: terminal sub-name and also indicates its color
… …
608#ifdef HAVE_UNSETENV 936#ifdef HAVE_UNSETENV
609 /* avoid passing old settings and confusing term size */ 937 /* avoid passing old settings and confusing term size */
610 unsetenv ("LINES"); 938 unsetenv ("LINES");
611 unsetenv ("COLUMNS"); 939 unsetenv ("COLUMNS");
612 unsetenv ("TERMCAP"); /* terminfo should be okay */ 940 unsetenv ("TERMCAP"); /* terminfo should be okay */
613#endif /* HAVE_UNSETENV */ 941#endif /* HAVE_UNSETENV */
614} 942}
615 943
616/*----------------------------------------------------------------------*/ 944/*----------------------------------------------------------------------*/
617/* 945/*
618 * This is more or less stolen straight from XFree86 xterm. 946 * This is more or less stolen straight from XFree86 xterm.
… …
639 967
640 this->locale = "C"; 968 this->locale = "C";
641 } 969 }
642 970
643 971
644 this->locale = rxvt_strdup (this->locale); 972 this->locale = strdup (this->locale);
645 SET_LOCALE (this->locale); 973 SET_LOCALE (this->locale);
646 mbstate.reset (); 974 mbstate.reset ();
647#endif 975#endif
648 976
649#if HAVE_NL_LANGINFO 977#if HAVE_NL_LANGINFO
… …
722 run_command (argv); 1050 run_command (argv);
723} 1051}
724 1052
725/*----------------------------------------------------------------------*/ 1053/*----------------------------------------------------------------------*/
726void 1054void
727rxvt_term::Get_Colours () 1055rxvt_term::get_colours ()
728{ 1056{
729 int i; 1057 int i;
730 1058
731#ifdef OFF_FOCUS_FADING 1059#ifdef OFF_FOCUS_FADING
732 pix_colors = pix_colors_focused; 1060 pix_colors = pix_colors_focused;
733#endif 1061#endif
734 1062
735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1063 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
736 { 1064 {
737 const char *name = rs[Rs_color + i]; 1065 const char *name = rs[Rs_color + i];
738 1066
739 if (!name) 1067 if (!name)
… …
792 * get scrollBar shadow colors 1120 * get scrollBar shadow colors
793 * 1121 *
794 * The calculations of topShadow/bottomShadow values are adapted 1122 * The calculations of topShadow/bottomShadow values are adapted
795 * from the fvwm window manager. 1123 * from the fvwm window manager.
796 */ 1124 */
797#ifdef KEEP_SCROLLCOLOR 1125#ifdef RXVT_SCROLLBAR
798 if (depth <= 2) 1126 if (depth <= 2)
799 { 1127 {
800 /* Monochrome */ 1128 /* Monochrome */
801 alias_color (Color_scroll, Color_fg); 1129 alias_color (Color_scroll, Color_fg);
802 alias_color (Color_topShadow, Color_bg); 1130 alias_color (Color_topShadow, Color_bg);
… …
817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1145 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
818 cscroll.a) 1146 cscroll.a)
819 )) 1147 ))
820 alias_color (Color_topShadow, Color_White); 1148 alias_color (Color_topShadow, Color_White);
821 } 1149 }
822#endif /* KEEP_SCROLLCOLOR */ 1150#endif
823 1151
824#ifdef OFF_FOCUS_FADING 1152#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1153 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i); 1154 update_fade_color (i);
827#endif 1155#endif
… …
835 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
836 { 1164 {
837 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
838 1166
839 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
840 { /* bright colors */ 1168 /* bright colors */
841 i -= 8;
842 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1169 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
843 return; 1170 else if (i >= 0 && i <= 7)
844 } 1171 /* normal colors */
845
846 if (i >= 0 && i <= 7) /* normal colors */
847 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1172 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
848 } 1173 }
849} 1174}
850 1175
851/*----------------------------------------------------------------------*/ 1176/*----------------------------------------------------------------------*/
… …
935 1260
936 if (i) 1261 if (i)
937 ModMetaMask = modmasks[i - 1]; 1262 ModMetaMask = modmasks[i - 1];
938} 1263}
939 1264
1265void
1266rxvt_term::set_icon (const char *file)
1267{
1268#ifdef HAVE_AFTERIMAGE
1269 init_asv ();
1270
1271 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1272 if (!im)
1273 {
1274 rxvt_warn ("Loading image icon failed, continuing without.\n");
1275 return;
1276 }
1277
1278 unsigned int w = im->width;
1279 unsigned int h = im->height;
1280
1281 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1282 {
1283 rxvt_warn ("Icon image too big, continuing without.\n");
1284 destroy_asimage (&im);
1285 return;
1286 }
1287
1288 ASImage *result = scale_asimage (asv, im,
1289 w, h, ASA_ARGB32,
1290 100, ASIMAGE_QUALITY_DEFAULT);
1291 destroy_asimage (&im);
1292
1293 if (!result)
1294 {
1295 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1296 return;
1297 }
1298
1299 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1300 if (buffer)
1301 {
1302 ARGB32 *asbuf = result->alt.argb32;
1303 buffer [0] = w;
1304 buffer [1] = h;
1305
1306 for (unsigned int i = 0; i < w * h; ++i)
1307 buffer [i + 2] = asbuf [i];
1308
1309 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1310 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1311 free (buffer);
1312 }
1313 else
1314 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1315
1316 destroy_asimage (&result);
1317#endif
1318
1319#ifdef HAVE_PIXBUF
1320 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1321 if (!pixbuf)
1322 {
1323 rxvt_warn ("Loading image icon failed, continuing without.\n");
1324 return;
1325 }
1326
1327 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1328 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1329
1330 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1331 {
1332 rxvt_warn ("Icon image too big, continuing without.\n");
1333 g_object_unref (pixbuf);
1334 return;
1335 }
1336
1337 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1338 {
1339 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1340 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1342
1343 buffer [0] = w;
1344 buffer [1] = h;
1345 for (int i = 0; i < h; i++)
1346 {
1347 for (int j = 0; j < w; j++)
1348 {
1349 unsigned char *pixel = row + j * channels;
1350 long value;
1351
1352 if (channels == 4)
1353 value = pixel[3];
1354 else
1355 value = (unsigned char)0x00ff;
1356
1357 value = (value << 8) + pixel[0];
1358 value = (value << 8) + pixel[1];
1359 value = (value << 8) + pixel[2];
1360 buffer[(i * w + j) + 2] = value;
1361 }
1362
1363 row += rowstride;
1364 }
1365
1366 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1367 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1368 free (buffer);
1369 }
1370 else
1371 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1372
1373 g_object_unref (pixbuf);
1374#endif
1375}
1376
940/*----------------------------------------------------------------------*/ 1377/*----------------------------------------------------------------------*/
941/* rxvt_Create_Windows () - Open and map the window */ 1378/* Open and map the window */
942void 1379void
943rxvt_term::create_windows (int argc, const char *const *argv) 1380rxvt_term::create_windows (int argc, const char *const *argv)
944{ 1381{
945 XClassHint classHint; 1382 XClassHint classHint;
946 XWMHints wmHint; 1383 XWMHints wmHint;
… …
952 Window top, parent; 1389 Window top, parent;
953 1390
954 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
955 1392
956 /* grab colors before netscape does */ 1393 /* grab colors before netscape does */
957 Get_Colours (); 1394 get_colours ();
958 1395
959 if (!set_fonts ()) 1396 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1397 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961 1398
962 parent = display->root; 1399 parent = display->root;
… …
992 } 1429 }
993#endif 1430#endif
994 1431
995 window_calc (0, 0); 1432 window_calc (0, 0);
996 1433
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 1434 /* sub-window placement & size in rxvt_term::resize_all_windows () */
998 attributes.background_pixel = pix_colors_focused [Color_border]; 1435 attributes.background_pixel = pix_colors_focused [Color_border];
999 attributes.border_pixel = pix_colors_focused [Color_border]; 1436 attributes.border_pixel = pix_colors_focused [Color_border];
1000 attributes.colormap = cmap; 1437 attributes.colormap = cmap;
1001 1438
1002 top = XCreateWindow (dpy, parent, 1439 top = XCreateWindow (dpy, parent,
… …
1005 ext_bwidth, 1442 ext_bwidth,
1006 depth, InputOutput, visual, 1443 depth, InputOutput, visual,
1007 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1444 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1008 &attributes); 1445 &attributes);
1009 1446
1010 this->parent[0] = top; 1447 this->parent = top;
1011 1448
1012 old_width = szHint.width; 1449 old_width = szHint.width;
1013 old_height = szHint.height; 1450 old_height = szHint.height;
1014 1451
1015 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1452 set_title (rs [Rs_title]);
1016 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1453 set_icon_name (rs [Rs_iconName]);
1017 1454
1018 classHint.res_name = (char *)rs[Rs_name]; 1455 classHint.res_name = (char *)rs[Rs_name];
1019 classHint.res_class = (char *)RESCLASS; 1456 classHint.res_class = (char *)RESCLASS;
1020 1457
1021 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1458 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1023 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1460 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1024 wmHint.window_group = top; 1461 wmHint.window_group = top;
1025 1462
1026 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1463 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1027 &szHint, &wmHint, &classHint); 1464 &szHint, &wmHint, &classHint);
1465#if ENABLE_EWMH
1466 /*
1467 * set up icon hint
1468 * rs [Rs_iconfile] is path to icon
1469 */
1470
1471 if (rs [Rs_iconfile])
1472 {
1473 set_icon (rs [Rs_iconfile]);
1474 }
1475#endif
1028 1476
1029#if ENABLE_FRILLS 1477#if ENABLE_FRILLS
1030 if (mwmhints.flags) 1478 if (mwmhints.flags)
1031 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1479 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1032 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1480 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1037#if ENABLE_EWMH 1485#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING], 1486 xa[XA_NET_WM_PING],
1039#endif 1487#endif
1040 }; 1488 };
1041 1489
1042 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1490 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1043 1491
1044#if ENABLE_FRILLS 1492#if ENABLE_FRILLS
1045 if (rs[Rs_transient_for]) 1493 if (rs[Rs_transient_for])
1046 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1494 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1047#endif 1495#endif
… …
1066 1514
1067 termwin_ev.start (display, top); 1515 termwin_ev.start (display, top);
1068 1516
1069 /* vt cursor: Black-on-White is standard, but this is more popular */ 1517 /* vt cursor: Black-on-White is standard, but this is more popular */
1070 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1518 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 1519
1077 /* the vt window */ 1520 /* the vt window */
1078 vt = XCreateSimpleWindow (dpy, top, 1521 vt = XCreateSimpleWindow (dpy, top,
1079 window_vt_x, window_vt_y, 1522 window_vt_x, window_vt_y,
1080 width, height, 1523 width, height,
… …
1105 GCForeground | GCBackground | GCGraphicsExposures, 1548 GCForeground | GCBackground | GCGraphicsExposures,
1106 &gcvalue); 1549 &gcvalue);
1107 1550
1108 drawable = new rxvt_drawable (this, vt); 1551 drawable = new rxvt_drawable (this, vt);
1109 1552
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 1553#ifdef OFF_FOCUS_FADING
1120 // initially we are in unfocused state 1554 // initially we are in unfocused state
1121 if (rs[Rs_fade]) 1555 if (rs[Rs_fade])
1122 pix_colors = pix_colors_unfocused; 1556 pix_colors = pix_colors_unfocused;
1123#endif 1557#endif
1124 1558
1125 pointer_unblank (); 1559 pointer_unblank ();
1126 scr_recolour (); 1560 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} 1561}
1292 1562
1293/*----------------------------------------------------------------------*/ 1563/*----------------------------------------------------------------------*/
1294/* 1564/*
1295 * Run the command in a subprocess and return a file descriptor for the 1565 * Run the command in a subprocess and return a file descriptor for the
… …
1316 else 1586 else
1317#endif 1587#endif
1318 if (!pty->get ()) 1588 if (!pty->get ())
1319 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1589 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1320 1590
1321 int er; 1591 struct termios tio = def_tio;
1322 1592
1323#ifndef NO_BACKSPACE_KEY 1593#ifndef NO_BACKSPACE_KEY
1324 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1594 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1325 er = rs[Rs_backspace_key][0]; 1595 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1326 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1596 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */ 1597 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1328 else
1329#endif 1598#endif
1330 er = -1;
1331 1599
1332 rxvt_get_ttymode (&tio, er); 1600 /* init terminal attributes */
1333 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1601 cfsetospeed (&tio, BAUDRATE);
1602 cfsetispeed (&tio, BAUDRATE);
1603 tcsetattr (pty->tty, TCSANOW, &tio);
1334 pty->set_utf8_mode (enc_utf8); 1604 pty->set_utf8_mode (enc_utf8);
1335 1605
1336 /* set initial window size */ 1606 /* set initial window size */
1337 tt_winch (); 1607 tt_winch ();
1338 1608
… …
1398rxvt_term::run_child (const char *const *argv) 1668rxvt_term::run_child (const char *const *argv)
1399{ 1669{
1400 char *login; 1670 char *login;
1401 1671
1402 if (option (Opt_console)) 1672 if (option (Opt_console))
1673 {
1403 { /* be virtual console, fail silently */ 1674 /* be virtual console, fail silently */
1404#ifdef TIOCCONS 1675#ifdef TIOCCONS
1405 unsigned int on = 1; 1676 unsigned int on = 1;
1406 1677
1407 ioctl (STDIN_FILENO, TIOCCONS, &on); 1678 ioctl (STDIN_FILENO, TIOCCONS, &on);
1408#elif defined (SRIOCSREDIR) 1679#elif defined (SRIOCSREDIR)
… …
1410 1681
1411 fd = open (CONSOLE, O_WRONLY, 0); 1682 fd = open (CONSOLE, O_WRONLY, 0);
1412 if (fd >= 0) 1683 if (fd >= 0)
1413 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1684 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1414 close (fd); 1685 close (fd);
1415#endif /* SRIOCSREDIR */ 1686#endif /* SRIOCSREDIR */
1416 } 1687 }
1417 1688
1418 /* reset signals and spin off the command interpreter */ 1689 /* reset signals and spin off the command interpreter */
1419 signal (SIGINT, SIG_DFL); 1690 signal (SIGINT, SIG_DFL);
1420 signal (SIGQUIT, SIG_DFL); 1691 signal (SIGQUIT, SIG_DFL);
1421 signal (SIGCHLD, SIG_DFL); 1692 signal (SIGCHLD, SIG_DFL);
1422 signal (SIGHUP, SIG_DFL); 1693 signal (SIGHUP, SIG_DFL);
1423 signal (SIGPIPE, SIG_DFL); 1694 signal (SIGPIPE, SIG_DFL);
1424 /* 1695 /*
1425 * mimick login's behavior by disabling the job control signals 1696 * mimic login's behavior by disabling the job control signals
1426 * a shell that wants them can turn them back on 1697 * a shell that wants them can turn them back on
1427 */ 1698 */
1428#ifdef SIGTSTP 1699#ifdef SIGTSTP
1429 signal (SIGTSTP, SIG_IGN); 1700 signal (SIGTSTP, SIG_IGN);
1430 signal (SIGTTIN, SIG_IGN); 1701 signal (SIGTTIN, SIG_IGN);
1431 signal (SIGTTOU, SIG_IGN); 1702 signal (SIGTTOU, SIG_IGN);
1432#endif /* SIGTSTP */ 1703#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 1704
1439 /* command interpreter path */ 1705 /* command interpreter path */
1440 if (argv) 1706 if (argv)
1441 { 1707 {
1442# ifdef DEBUG_CMD 1708# ifdef DEBUG_CMD
… …
1454 const char *argv0, *shell; 1720 const char *argv0, *shell;
1455 1721
1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1722 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1457 shell = "/bin/sh"; 1723 shell = "/bin/sh";
1458 1724
1459 argv0 = (const char *)rxvt_basename (shell); 1725 argv0 = rxvt_basename (shell);
1460 1726
1461 if (option (Opt_loginShell)) 1727 if (option (Opt_loginShell))
1462 { 1728 {
1463 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1729 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1464 1730

Diff Legend

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