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

Diff Legend

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