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.124 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.205 by sasha, Fri Aug 10 22:10:36 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
47#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
48 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
49 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
50 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
51 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
52 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
53 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
54# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
55 "Grey90", /* 7: white (#E5E5E5) */ 57# else
56# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57 "AntiqueWhite", /* 7: white (#FAEBD7) */
58# endif 59# endif
59 /* high-intensity colors */ 60 /* high-intensity colors */
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
66 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
67 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
72 "White", /* 7/15: bright white (#FFFFFF) */
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 176#endif
216 }; 177 };
217 178
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226 187
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None;
232#endif
233 188
234 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 191 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 193 ncol = 80;
241 nrow = 24; 194 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 198 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
247 200
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 202
252 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
256 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
257#endif 215#endif
258
259 last_bot = last_state = -1; 216 last_bot = last_state = -1;
260 217
261#ifdef MENUBAR 218 set_option (Opt_scrollBar);
262 menu_readonly = 1; 219 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 220 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 221 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 222 set_option (Opt_secondaryScreen);
266#endif 223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
267 227
268 return true; 228 return true;
269} 229}
270 230
271void 231void
… …
309 int i, r_argc; 269 int i, r_argc;
310 char *val; 270 char *val;
311 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
312 272
313 /* 273 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 275 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
318 break; 278 break;
319 279
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 281
322 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 300
341 /* 301 /*
342 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
343 */ 303 */
304
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 305 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 306 rs[Rs_display_name] = ":0";
346 307
347 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
348 309
349 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
352 extract_resources (); 317 extract_resources ();
318
319#if XFT
320 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
353 free (r_argv); 327 free (r_argv);
328
329 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef)
331 rs [i] = 0;
332
333#if ENABLE_PERL
334 if (!rs[Rs_perl_ext_1])
335 rs[Rs_perl_ext_1] = "default";
336
337 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
338 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
339 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
340 {
341 rxvt_perl.init (this);
342 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
343 }
344#endif
354 345
355 /* 346 /*
356 * set any defaults not already set 347 * set any defaults not already set
357 */ 348 */
358 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
… …
369 if (!rs[Rs_iconName]) 360 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 361 rs[Rs_iconName] = rs[Rs_name];
371 } 362 }
372 363
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = min (i, MAX_POSITIVE_INT16); 365 saveLines = min (i, MAX_SAVELINES);
375 366
376#if ENABLE_FRILLS 367#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, MAX_POSITIVE_INT16); 369 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379 370
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 371 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 ext_bwidth = min (i, MAX_POSITIVE_INT16); 372 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382 373
383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 374 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
384 lineSpace = min (i, MAX_POSITIVE_INT16); 375 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
385#endif 376#endif
386 377
387#ifdef POINTER_BLANK 378#ifdef POINTER_BLANK
388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 379 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
389 pointerBlankDelay = i; 380 pointerBlankDelay = i;
… …
391 pointerBlankDelay = 2; 382 pointerBlankDelay = 2;
392#endif 383#endif
393 384
394 /* no point having a scrollbar without having any scrollback! */ 385 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 386 if (!saveLines)
396 options &= ~Opt_scrollBar; 387 set_option (Opt_scrollBar, 0);
397 388
398#ifdef PRINTPIPE 389#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 390 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 391 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 392#endif
… …
444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
445#endif 436#endif
446 437
447#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
448 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
449 if (options & Opt_reverseVideo) 440 if (option (Opt_reverseVideo))
450 { 441 {
451 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
452 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
444
453 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
454 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 446 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
455 } 447 }
456#endif 448#endif
457 449
… …
459 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
460 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
461 453
462#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
463 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
464 if (options & Opt_reverseVideo) 456 if (option (Opt_reverseVideo))
465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
466#endif 458#endif
467 459
468 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
469 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
509 val = rxvt_network_display (rs[Rs_display_name]); 501 val = rxvt_network_display (rs[Rs_display_name]);
510 rs[Rs_display_name] = (const char *)val; 502 rs[Rs_display_name] = (const char *)val;
511 503
512 if (val == NULL) 504 if (val == NULL)
513#endif /* DISPLAY_IS_IP */ 505#endif /* DISPLAY_IS_IP */
514 val = XDisplayString (display->display); 506 val = XDisplayString (dpy);
515 507
516 if (rs[Rs_display_name] == NULL) 508 if (rs[Rs_display_name] == NULL)
517 rs[Rs_display_name] = val; /* use broken `:0' value */ 509 rs[Rs_display_name] = val; /* use broken `:0' value */
518 510
519 i = strlen (val); 511 i = strlen (val);
520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
521 513
522 sprintf (env_display, "DISPLAY=%s", val); 514 sprintf (env_display, "DISPLAY=%s", val);
523 515
524 /* avoiding the math library: 516 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
527 ;
528 max_it (i, 1);
529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
530
531 sprintf (env_windowid, "WINDOWID=%u",
532 (unsigned int)parent[0]);
533 517
534 /* add entries to the environment: 518 /* add entries to the environment:
535 * @ DISPLAY: in case we started with -display 519 * @ DISPLAY: in case we started with -display
536 * @ WINDOWID: X window id number of the window 520 * @ WINDOWID: X window id number of the window
537 * @ COLORTERM: terminal sub-name and also indicates its color 521 * @ COLORTERM: terminal sub-name and also indicates its color
… …
539 * @ TERMINFO: path to terminfo directory 523 * @ TERMINFO: path to terminfo directory
540 * @ COLORFGBG: fg;bg color codes 524 * @ COLORFGBG: fg;bg color codes
541 */ 525 */
542 putenv (env_display); 526 putenv (env_display);
543 putenv (env_windowid); 527 putenv (env_windowid);
528
544 if (env_colorfgbg) 529 if (env_colorfgbg)
545 putenv (env_colorfgbg); 530 putenv (env_colorfgbg);
546 531
547#ifdef RXVT_TERMINFO 532#ifdef RXVT_TERMINFO
548 putenv ("TERMINFO=" RXVT_TERMINFO); 533 putenv ("TERMINFO=" RXVT_TERMINFO);
549#endif 534#endif
550 535
551 if (display->depth <= 2) 536 if (depth <= 2)
552 putenv ("COLORTERM=" COLORTERMENV "-mono"); 537 putenv ("COLORTERM=" COLORTERMENV "-mono");
553 else 538 else
554 putenv ("COLORTERM=" COLORTERMENVFULL); 539 putenv ("COLORTERM=" COLORTERMENVFULL);
555 540
556 if (rs[Rs_term_name] != NULL) 541 if (rs[Rs_term_name] != NULL)
… …
576 * This should support all European type languages. 561 * This should support all European type languages.
577 */ 562 */
578void 563void
579rxvt_term::set_locale (const char *locale) 564rxvt_term::set_locale (const char *locale)
580{ 565{
566 set_environ (envv);
567
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 568#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 569 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 570 this->locale = setlocale (LC_CTYPE, locale);
584 571
585 if (!this->locale) 572 if (!this->locale)
586 { 573 {
587 if (*locale) 574 if (*locale)
588 { 575 {
589 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 576 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590 setlocale (LC_CTYPE, ""); 577 setlocale (LC_CTYPE, "C");
591 } 578 }
592 else 579 else
593 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 580 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594 581
595 this->locale = ""; 582 this->locale = "C";
596 } 583 }
597 584
598 585
599 this->locale = rxvt_strdup (this->locale); 586 this->locale = rxvt_strdup (this->locale);
600 SET_LOCALE (this->locale); 587 SET_LOCALE (this->locale);
… …
615} 602}
616 603
617void 604void
618rxvt_term::init_xlocale () 605rxvt_term::init_xlocale ()
619{ 606{
607 set_environ (envv);
608
620#ifdef USE_XIM 609#ifdef USE_XIM
621 if (!locale) 610 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 611 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 612 else
624 { 613 {
… …
646 * Initialize the command connection. 635 * Initialize the command connection.
647 * This should be called after the X server connection is established. 636 * This should be called after the X server connection is established.
648 */ 637 */
649 638
650#ifdef META8_OPTION 639#ifdef META8_OPTION
651 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 640 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
652#endif 641#endif
653 642
654 get_ourmods (); 643 get_ourmods ();
655 644
656 if (!(options & Opt_scrollTtyOutput)) 645 if (!option (Opt_scrollTtyOutput))
657 priv_modes |= PrivMode_TtyOutputInh; 646 priv_modes |= PrivMode_TtyOutputInh;
658 if (options & Opt_scrollTtyKeypress) 647 if (option (Opt_scrollTtyKeypress))
659 priv_modes |= PrivMode_Keypress; 648 priv_modes |= PrivMode_Keypress;
660 if (!(options & Opt_jumpScroll)) 649 if (!option (Opt_jumpScroll))
661 priv_modes |= PrivMode_smoothScroll; 650 priv_modes |= PrivMode_smoothScroll;
662 651
663#ifndef NO_BACKSPACE_KEY 652#ifndef NO_BACKSPACE_KEY
664 if (strcmp (key_backspace, "DEC") == 0) 653 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 654 priv_modes |= PrivMode_HaveBackSpace;
666#endif 655#endif
667 656
668 /* add value for scrollBar */ 657 /* add value for scrollBar */
669 if (scrollbar_visible ()) 658 if (scrollBar.state)
670 { 659 {
671 priv_modes |= PrivMode_scrollBar; 660 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 661 SavedModes |= PrivMode_scrollBar;
673 } 662 }
674
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 }
680
681#ifdef CURSOR_BLINK
682 if (options & Opt_cursorBlink)
683 (void)gettimeofday (&lastcursorchange, NULL);
684#endif
685 663
686 run_command (argv); 664 run_command (argv);
687} 665}
688 666
689/*----------------------------------------------------------------------*/ 667/*----------------------------------------------------------------------*/
… …
694 672
695#ifdef OFF_FOCUS_FADING 673#ifdef OFF_FOCUS_FADING
696 pix_colors = pix_colors_focused; 674 pix_colors = pix_colors_focused;
697#endif 675#endif
698 676
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 677 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
700 { 678 {
679 const char *name = rs[Rs_color + i];
680
681 if (!name)
682 continue;
683
701 rxvt_color xcol; 684 rxvt_color xcol;
702 685
703 if (!rs[Rs_color + i]) 686 if (!set_color (xcol, name))
704 continue;
705
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707 { 687 {
708#ifndef XTERM_REVERSE_VIDEO 688#ifndef XTERM_REVERSE_VIDEO
709 if (i < 2 && (options & Opt_reverseVideo)) 689 if (i < 2 && option (Opt_reverseVideo))
710 rs[Rs_color + i] = def_colorName[!i]; 690 name = def_colorName [1 - i];
711 else 691 else
712#endif 692#endif
713 rs[Rs_color + i] = def_colorName[i]; 693 name = def_colorName [i];
714 694
715 if (!rs[Rs_color + i]) 695 if (!name)
716 continue; 696 continue;
717 697
718 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 698 if (!set_color (xcol, name))
719 { 699 {
720 switch (i) 700 switch (i)
721 { 701 {
722 case Color_fg: 702 case Color_fg:
723 case Color_bg: 703 case Color_bg:
724 /* fatal: need bg/fg color */
725 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 704 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
726 /* NOTREACHED */ 705 name = "";
727 break; 706 break;
728#ifndef NO_CURSORCOLOR 707#ifndef NO_CURSORCOLOR
729 case Color_cursor2: 708 case Color_cursor2:
730 xcol = pix_colors[Color_fg]; 709#endif
731 break;
732#endif /* ! NO_CURSORCOLOR */
733 case Color_pointer_fg: 710 case Color_pointer_fg:
734 xcol = pix_colors[Color_fg]; 711 name = rs[Rs_color + Color_fg];
712 xcol.set (this, name);
735 break; 713 break;
736 default: 714 default:
737 xcol = pix_colors[Color_bg]; /* None */ 715 name = rs[Rs_color + Color_bg];
716 xcol.set (this, name);
738 break; 717 break;
739 } 718 }
740 } 719 }
741 } 720 }
742 721
743 pix_colors[i] = xcol; 722 pix_colors[i] = xcol;
744 SET_PIXCOLOR (i); 723 rs[Rs_color + i] = name;
745 }
746
747#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade])
749 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
750 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
751#endif
752
753 if (display->depth <= 2)
754 { 724 }
725
726 if (depth <= 2)
727 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 728 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 729 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
757 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 730 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
758 } 731 }
759 732
760 /* 733 /*
761 * get scrollBar/menuBar shadow colors 734 * get scrollBar shadow colors
762 * 735 *
763 * The calculations of topShadow/bottomShadow values are adapted 736 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 737 * from the fvwm window manager.
765 */ 738 */
766#ifdef KEEP_SCROLLCOLOR 739#ifdef KEEP_SCROLLCOLOR
767
768 if (display->depth <= 2) 740 if (depth <= 2)
769 { 741 {
770 /* Monochrome */ 742 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 743 alias_color (Color_scroll, Color_fg);
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 744 alias_color (Color_topShadow, Color_bg);
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 745 alias_color (Color_bottomShadow, Color_bg);
774 } 746 }
775 else 747 else
776 { 748 {
777 rxvt_color xcol[2]; 749 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
778 /* xcol[0] == white
779 * xcol[1] == top shadow
780 * xcol[2] == bot shadow */
781 750
782 xcol[1] = pix_colors[Color_scroll]; 751 rgba cscroll;
783 xcol[0].set (display, 65535, 65535, 65535); 752 pix_colors [Color_scroll].get (cscroll);
784
785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
786
787 xcol[0].get (display, pr0, pg0, pb0);
788 xcol[1].get (display, pr1, pg1, pb1);
789
790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
791 753
792 /* topShadowColor */ 754 /* topShadowColor */
793 if (!xcol[1].set (display, 755 if (!pix_colors[Color_topShadow].set (this,
794 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 756 rgba (
795 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 757 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
796 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 758 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
797 xcol[1] = pix_colors[Color_White]; 759 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
798 760 cscroll.a)
799 pix_colors[Color_topShadow] = xcol[1]; 761 ))
762 alias_color (Color_topShadow, Color_White);
800 } 763 }
801#endif /* KEEP_SCROLLCOLOR */ 764#endif /* KEEP_SCROLLCOLOR */
765
766#ifdef OFF_FOCUS_FADING
767 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
768 update_fade_color (i);
769#endif
802} 770}
803 771
804/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
805/* color aliases, fg/bg bright-bold */ 773/* color aliases, fg/bg bright-bold */
806void 774void
… …
811 int i = atoi (rs[Rs_color + idx]); 779 int i = atoi (rs[Rs_color + idx]);
812 780
813 if (i >= 8 && i <= 15) 781 if (i >= 8 && i <= 15)
814 { /* bright colors */ 782 { /* bright colors */
815 i -= 8; 783 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 784 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 785 return;
819#endif
820 } 786 }
821 787
822 if (i >= 0 && i <= 7) /* normal colors */ 788 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 789 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 790 }
… …
847 813
848 if (rsmod 814 if (rsmod
849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
850 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
851 817
852 map = XGetModifierMapping (display->display); 818 map = XGetModifierMapping (dpy);
853 kc = map->modifiermap; 819 kc = map->modifiermap;
854 820
855 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
856 { 822 {
857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
859 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
860 { 826 {
861 if (kc[k] == 0) 827 if (kc[k] == 0)
862 break; 828 break;
863 829
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 830 switch (XKeycodeToKeysym (dpy, kc[k], 0))
865 { 831 {
866 case XK_Num_Lock: 832 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
868 continue; 834 continue;
869 835
… …
919rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
920{ 886{
921 XClassHint classHint; 887 XClassHint classHint;
922 XWMHints wmHint; 888 XWMHints wmHint;
923#if ENABLE_FRILLS 889#if ENABLE_FRILLS
924 Atom prop = None;
925 MWMHints mwmhints; 890 MWMHints mwmhints = { };
926#endif 891#endif
927 XGCValues gcvalue; 892 XGCValues gcvalue;
928 long vt_emask;
929 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
930 XWindowAttributes gattr;
931 Window top, parent; 894 Window top, parent;
932 dDisp;
933 895
934#ifdef USING_W11LIB 896 dLocal (Display *, dpy);
935 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif
938 897
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 898 /* grab colors before netscape does */
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 899 Get_Colours ();
941 900
942 if (options & Opt_transparent) 901 if (!set_fonts ())
943 { 902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 903
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 904 parent = display->root;
946 } 905
906 attributes.override_redirect = !!option (Opt_override_redirect);
947 907
948#if ENABLE_FRILLS 908#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 909 if (option (Opt_borderLess))
950 { 910 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 911 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
952
953 if (prop == None)
954 { 912 {
955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 913 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
956#ifdef PREFER_24BIT
957 attributes.override_redirect = TRUE; 914 attributes.override_redirect = true;
958#endif
959 mwmhints.flags = 0; 915 mwmhints.flags = 0;
960 } 916 }
961 else 917 else
962 { 918 {
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 919 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
966 } 922 }
967 else 923 else
968 mwmhints.flags = 0; 924 mwmhints.flags = 0;
969#endif 925#endif
970 926
971 /* grab colors before netscape does */
972 Get_Colours ();
973
974 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976
977 parent = DefaultRootWindow (disp);
978
979#if ENABLE_XEMBED 927#if ENABLE_XEMBED
980 if (rs[Rs_embed]) 928 if (rs[Rs_embed])
981 { 929 {
982 XWindowAttributes wattr; 930 XWindowAttributes wattr;
983 931
984 parent = strtol (rs[Rs_embed], 0, 0); 932 parent = strtol (rs[Rs_embed], 0, 0);
985 933
986 if (!XGetWindowAttributes (disp, parent, &wattr)) 934 if (!XGetWindowAttributes (dpy, parent, &wattr))
987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 935 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
988 936
989 window_calc (wattr.width, wattr.height); 937 window_calc (wattr.width, wattr.height);
990 } 938 }
991#endif 939#endif
992 940
993 window_calc (0, 0); 941 window_calc (0, 0);
994 942
995 /* sub-window placement & size in rxvt_resize_subwindows () */ 943 /* sub-window placement & size in rxvt_resize_subwindows () */
996#ifdef PREFER_24BIT
997 attributes.background_pixel = pix_colors_focused[Color_border]; 944 attributes.background_pixel = pix_colors_focused [Color_border];
998 attributes.border_pixel = pix_colors_focused[Color_border]; 945 attributes.border_pixel = pix_colors_focused [Color_border];
999 attributes.colormap = display->cmap; 946 attributes.colormap = cmap;
947
1000 top = XCreateWindow (disp, parent, 948 top = XCreateWindow (dpy, parent,
1001 szHint.x, szHint.y, 949 szHint.x, szHint.y,
1002 szHint.width, szHint.height, 950 szHint.width, szHint.height,
1003 ext_bwidth, 951 ext_bwidth,
1004 display->depth, InputOutput, 952 depth, InputOutput, visual,
1005 display->visual,
1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 953 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1007#else 954 &attributes);
1008 top = XCreateSimpleWindow (disp, parent,
1009 szHint.x, szHint.y,
1010 szHint.width, szHint.height,
1011 ext_bwidth,
1012 pix_colors_focused[Color_border],
1013 pix_colors_focused[Color_border]);
1014#endif
1015 955
1016 this->parent[0] = top; 956 this->parent[0] = top;
1017 957
1018 old_width = szHint.width; 958 old_width = szHint.width;
1019 old_height = szHint.height; 959 old_height = szHint.height;
1020 960
1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 961 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1022 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 962 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1023 963
1024 classHint.res_name = (char *)rs[Rs_name]; 964 classHint.res_name = (char *)rs[Rs_name];
1025 classHint.res_class = (char *)RESCLASS; 965 classHint.res_class = (char *)RESCLASS;
1026 966
1027 wmHint.flags = InputHint | StateHint | WindowGroupHint; 967 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1028 wmHint.input = True; 968 wmHint.input = True;
1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 969 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1030 wmHint.window_group = top; 970 wmHint.window_group = top;
1031 971
1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 972 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1033 &szHint, &wmHint, &classHint); 973 &szHint, &wmHint, &classHint);
974
975#if ENABLE_FRILLS
976 if (mwmhints.flags)
977 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
978 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
979#endif
1034 980
1035 Atom protocols[] = { 981 Atom protocols[] = {
1036 xa[XA_WM_DELETE_WINDOW], 982 xa[XA_WM_DELETE_WINDOW],
1037#if ENABLE_EWMH 983#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING], 984 xa[XA_NET_WM_PING],
1039#endif 985#endif
1040 }; 986 };
1041 987
1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 988 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
989
990#if ENABLE_FRILLS
991 if (rs[Rs_transient_for])
992 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
993#endif
1043 994
1044#if ENABLE_EWMH 995#if ENABLE_EWMH
1045 long pid = getpid (); 996 long pid = getpid ();
1046 997
1047 XChangeProperty (disp, top, 998 XChangeProperty (dpy, top,
1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 999 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1049 PropModeReplace, (unsigned char *)&pid, 1); 1000 PropModeReplace, (unsigned char *)&pid, 1);
1050 1001
1051 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1002 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1052#endif 1003#endif
1053 1004
1054 XSelectInput (disp, top, 1005 XSelectInput (dpy, top,
1055 KeyPressMask 1006 KeyPressMask
1056#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1007#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1057 | KeyReleaseMask 1008 | KeyReleaseMask
1058#endif 1009#endif
1059 | FocusChangeMask | VisibilityChangeMask 1010 | FocusChangeMask | VisibilityChangeMask
1060 | ExposureMask | StructureNotifyMask); 1011 | ExposureMask | StructureNotifyMask);
1061 1012
1062 termwin_ev.start (display, top); 1013 termwin_ev.start (display, top);
1063 1014
1064#if ENABLE_FRILLS
1065 if (mwmhints.flags)
1066 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1067 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1068#endif
1069
1070 /* vt cursor: Black-on-White is standard, but this is more popular */ 1015 /* vt cursor: Black-on-White is standard, but this is more popular */
1071 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1016 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1072 1017
1073#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1018#ifdef HAVE_SCROLLBARS
1074 /* cursor (menuBar/scrollBar): Black-on-White */ 1019 /* cursor scrollBar: Black-on-White */
1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1020 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1076#endif 1021#endif
1077 1022
1078 /* the vt window */ 1023 /* the vt window */
1079 vt = XCreateSimpleWindow (disp, top, 1024 vt = XCreateSimpleWindow (dpy, top,
1080 window_vt_x,
1081 window_vt_y, 1025 window_vt_x, window_vt_y,
1082 TermWin_TotalWidth (), 1026 width, height,
1083 TermWin_TotalHeight (),
1084 0, 1027 0,
1085 pix_colors_focused[Color_fg], 1028 pix_colors_focused[Color_fg],
1086 pix_colors_focused[Color_bg]); 1029 pix_colors_focused[Color_bg]);
1087#ifdef DEBUG_X
1088 XStoreName (disp, vt, "vt window");
1089#endif
1090 1030
1091 attributes.bit_gravity = NorthWestGravity; 1031 attributes.bit_gravity = NorthWestGravity;
1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1032 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1093 1033
1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1095 1035
1096#ifdef POINTER_BLANK
1097 if (options & Opt_pointerBlank) 1036 if (option (Opt_pointerBlank))
1098 vt_emask |= PointerMotionMask; 1037 vt_emask |= PointerMotionMask;
1099 else 1038 else
1100#endif
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1039 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1040
1103 XSelectInput (disp, vt, vt_emask); 1041 vt_select_input ();
1042
1104 vt_ev.start (display, vt); 1043 vt_ev.start (display, vt);
1105 1044
1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107 if (menuBar_height ())
1108 {
1109 menuBar.win = XCreateSimpleWindow (disp, top,
1110 window_vt_x, 0,
1111 TermWin_TotalWidth (),
1112 menuBar_TotalHeight (),
1113 0,
1114 pix_colors_focused[Color_fg],
1115 pix_colors_focused[Color_scroll]);
1116
1117#ifdef DEBUG_X
1118 XStoreName (disp, menuBar.win, "menubar");
1119#endif
1120
1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1122
1123 XDefineCursor (disp, menuBar.win,
1124 XCreateFontCursor (disp, XC_left_ptr));
1125
1126 XSelectInput (disp, menuBar.win,
1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1128 menubar_ev.start (display, menuBar.win);
1129 }
1130#endif
1131
1132#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! (options & Opt_transparent))
1135 {
1136 const char *p = rs[Rs_backgroundPixmap];
1137
1138 if ((p = strchr (p, ';')) != NULL)
1139 {
1140 p++;
1141 scale_pixmap (p);
1142 }
1143
1144 set_bgPixmap (rs[Rs_backgroundPixmap]);
1145 scr_touch (true);
1146 }
1147#endif
1148
1149 /* graphics context for the vt window */ 1045 /* graphics context for the vt window */
1150 gcvalue.foreground = pix_colors[Color_fg]; 1046 gcvalue.foreground = pix_colors[Color_fg];
1151 gcvalue.background = pix_colors[Color_bg]; 1047 gcvalue.background = pix_colors[Color_bg];
1152 gcvalue.graphics_exposures = 1; 1048 gcvalue.graphics_exposures = 0;
1049
1153 gc = XCreateGC (disp, vt, 1050 gc = XCreateGC (dpy, vt,
1154 GCForeground | GCBackground | GCGraphicsExposures, 1051 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1052 &gcvalue);
1156 1053
1157 drawable = new rxvt_drawable (display, vt); 1054 drawable = new rxvt_drawable (this, vt);
1158 1055
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1056#ifdef RXVT_SCROLLBAR
1160 gcvalue.foreground = pix_colors[Color_topShadow]; 1057 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1058 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1059 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1060 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1061 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1062 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1166#endif 1063#endif
1167 1064
1168#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1169 // initially we are in unfocused state 1066 // initially we are in unfocused state
1170 if (rs[Rs_fade]) 1067 if (rs[Rs_fade])
1171 pix_colors = pix_colors_unfocused; 1068 pix_colors = pix_colors_unfocused;
1172#endif 1069#endif
1173 1070
1174 pointer_unblank (); 1071 pointer_unblank ();
1175 scr_recolour (); 1072 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1186} 1073}
1187 1074
1188/* ------------------------------------------------------------------------- * 1075/* ------------------------------------------------------------------------- *
1189 * GET TTY CURRENT STATE * 1076 * GET TTY CURRENT STATE *
1190 * ------------------------------------------------------------------------- */ 1077 * ------------------------------------------------------------------------- */
1191void 1078void
1192rxvt_get_ttymode (ttymode_t *tio, int erase) 1079rxvt_get_ttymode (ttymode_t *tio, int erase)
1193{ 1080{
1194#ifdef HAVE_TERMIOS_H
1195 /* 1081 /*
1196 * standard System V termios interface 1082 * standard System V termios interface
1197 */ 1083 */
1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1084 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1199 { 1085 {
1200 /* return error - use system defaults */ 1086 // return error - use system defaults,
1087 // where possible, and zero elsewhere
1088 memset (tio, 0, sizeof (ttymode_t));
1089
1201 tio->c_cc[VINTR] = CINTR; 1090 tio->c_cc[VINTR] = CINTR;
1202 tio->c_cc[VQUIT] = CQUIT; 1091 tio->c_cc[VQUIT] = CQUIT;
1203 tio->c_cc[VERASE] = CERASE; 1092 tio->c_cc[VERASE] = CERASE;
1093#ifdef VERASE2
1094 tio->c_cc[VERASE2] = CERASE2;
1095#endif
1204 tio->c_cc[VKILL] = CKILL; 1096 tio->c_cc[VKILL] = CKILL;
1205 tio->c_cc[VSTART] = CSTART; 1097 tio->c_cc[VSTART] = CSTART;
1206 tio->c_cc[VSTOP] = CSTOP; 1098 tio->c_cc[VSTOP] = CSTOP;
1207 tio->c_cc[VSUSP] = CSUSP; 1099 tio->c_cc[VSUSP] = CSUSP;
1208# ifdef VDSUSP 1100# ifdef VDSUSP
… …
1260 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1152 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1261# if defined (ECHOCTL) && defined (ECHOKE) 1153# if defined (ECHOCTL) && defined (ECHOKE)
1262 | ECHOCTL | ECHOKE 1154 | ECHOCTL | ECHOKE
1263# endif 1155# endif
1264 | ECHOE | ECHOK); 1156 | ECHOE | ECHOK);
1265# else /* HAVE_TERMIOS_H */
1266
1267 /*
1268 * sgtty interface
1269 */
1270
1271 /* get parameters -- gtty */
1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1273 {
1274 tio->sg.sg_erase = CERASE; /* ^H */
1275 tio->sg.sg_kill = CKILL; /* ^U */
1276 }
1277
1278 if (erase != -1)
1279 tio->sg.sg_erase = (char)erase;
1280
1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1282
1283 /* get special characters */
1284 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1285 {
1286 tio->tc.t_intrc = CINTR; /* ^C */
1287 tio->tc.t_quitc = CQUIT; /* ^\ */
1288 tio->tc.t_startc = CSTART; /* ^Q */
1289 tio->tc.t_stopc = CSTOP; /* ^S */
1290 tio->tc.t_eofc = CEOF; /* ^D */
1291 tio->tc.t_brkc = -1;
1292 }
1293
1294 /* get local special chars */
1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1296 {
1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1299 tio->lc.t_rprntc = CRPRNT; /* ^R */
1300 tio->lc.t_flushc = CFLUSH; /* ^O */
1301 tio->lc.t_werasc = CWERASE; /* ^W */
1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1303 }
1304 /* get line discipline */
1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1306# ifdef NTTYDISC
1307 tio->line = NTTYDISC;
1308# endif /* NTTYDISC */
1309
1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1311#endif /* HAVE_TERMIOS_H */
1312 1157
1313 /* 1158 /*
1314 * Debugging 1159 * Debugging
1315 */ 1160 */
1316#ifdef DEBUG_TTYMODE 1161#ifdef DEBUG_TTYMODE
… …
1401rxvt_term::run_command (const char *const *argv) 1246rxvt_term::run_command (const char *const *argv)
1402{ 1247{
1403#if ENABLE_FRILLS 1248#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd]) 1249 if (rs[Rs_pty_fd])
1405 { 1250 {
1406 pty.pty = atoi (rs[Rs_pty_fd]); 1251 pty->pty = atoi (rs[Rs_pty_fd]);
1407 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1252
1253 if (pty->pty >= 0)
1254 {
1255 if (getfd_hook)
1256 pty->pty = (*getfd_hook) (pty->pty);
1257
1258 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1259 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1260 }
1408 } 1261 }
1409 else 1262 else
1410#endif 1263#endif
1411 if (!pty.get ()) 1264 if (!pty->get ())
1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1265 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1413
1414 pty.set_utf8_mode (enc_utf8);
1415
1416 /* set initial window size */
1417 tt_winch ();
1418 1266
1419 int er; 1267 int er;
1420 1268
1421#ifndef NO_BACKSPACE_KEY 1269#ifndef NO_BACKSPACE_KEY
1422 if (key_backspace[0] && !key_backspace[1]) 1270 if (key_backspace[0] && !key_backspace[1])
… …
1426 else 1274 else
1427#endif 1275#endif
1428 er = -1; 1276 er = -1;
1429 1277
1430 rxvt_get_ttymode (&tio, er); 1278 rxvt_get_ttymode (&tio, er);
1279 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1280 pty->set_utf8_mode (enc_utf8);
1281
1282 /* set initial window size */
1283 tt_winch ();
1431 1284
1432#if ENABLE_FRILLS 1285#if ENABLE_FRILLS
1433 if (rs[Rs_pty_fd]) 1286 if (rs[Rs_pty_fd])
1434 return; 1287 return;
1435#endif 1288#endif
1436 1289
1437#ifndef __QNX__
1438 /* spin off the command interpreter */ 1290 /* spin off the command interpreter */
1439 switch (cmd_pid = fork ()) 1291 switch (cmd_pid = fork ())
1440 { 1292 {
1441 case -1: 1293 case -1:
1442 { 1294 {
… …
1444 rxvt_fatal ("can't fork, aborting.\n"); 1296 rxvt_fatal ("can't fork, aborting.\n");
1445 } 1297 }
1446 case 0: 1298 case 0:
1447 init_env (); 1299 init_env ();
1448 1300
1449 if (!pty.make_controlling_tty ()) 1301 if (!pty->make_controlling_tty ())
1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1302 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1451 else 1303 else
1452 { 1304 {
1453 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1305 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1454 dup2 (pty.tty, STDIN_FILENO); 1306 dup2 (pty->tty, STDIN_FILENO);
1455 dup2 (pty.tty, STDOUT_FILENO); 1307 dup2 (pty->tty, STDOUT_FILENO);
1456 dup2 (pty.tty, STDERR_FILENO); 1308 dup2 (pty->tty, STDERR_FILENO);
1457 1309
1458 // close all our file handles that we do no longer need 1310 // close all our file handles that we do no longer need
1459 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1311 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1460 { 1312 {
1461 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1313 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1462 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1314 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1463 } 1315 }
1464 1316
1465 run_child (argv); 1317 run_child (argv);
1466 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1318 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1467 } 1319 }
1468 1320
1469 _exit (EXIT_FAILURE); 1321 _exit (EXIT_FAILURE);
1470 1322
1471 default: 1323 default:
1472 { 1324 if (!option (Opt_utmpInhibit))
1473#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1325 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1474 int fdstdin;
1475 1326
1476 fdstdin = dup (STDIN_FILENO); 1327 pty->close_tty ();
1477 dup2 (pty.tty, STDIN_FILENO);
1478#endif
1479 1328
1480#ifdef UTMP_SUPPORT 1329 child_ev.start (cmd_pid);
1481 privileged_utmp (SAVE);
1482#endif
1483 1330
1484#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1331 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1485
1486 dup2 (fdstdin, STDIN_FILENO);
1487 close (fdstdin);
1488#endif
1489 }
1490
1491 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1492 break; 1332 break;
1493 } 1333 }
1494#else /* __QNX__ uses qnxspawn () */
1495 fchmod (pty.tty, 0622);
1496 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1497 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1498
1499 if (run_child (argv) == -1)
1500 exit (EXIT_FAILURE);
1501#endif
1502} 1334}
1503 1335
1504/* ------------------------------------------------------------------------- * 1336/* ------------------------------------------------------------------------- *
1505 * CHILD PROCESS OPERATIONS * 1337 * CHILD PROCESS OPERATIONS *
1506 * ------------------------------------------------------------------------- */ 1338 * ------------------------------------------------------------------------- */
… …
1511int 1343int
1512rxvt_term::run_child (const char *const *argv) 1344rxvt_term::run_child (const char *const *argv)
1513{ 1345{
1514 char *login; 1346 char *login;
1515 1347
1516 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1517
1518 if (options & Opt_console) 1348 if (option (Opt_console))
1519 { /* be virtual console, fail silently */ 1349 { /* be virtual console, fail silently */
1520#ifdef TIOCCONS 1350#ifdef TIOCCONS
1521 unsigned int on = 1; 1351 unsigned int on = 1;
1522 1352
1523 ioctl (STDIN_FILENO, TIOCCONS, &on); 1353 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1550 // unblock signals (signals are blocked by iom.C 1380 // unblock signals (signals are blocked by iom.C
1551 sigset_t ss; 1381 sigset_t ss;
1552 sigemptyset (&ss); 1382 sigemptyset (&ss);
1553 sigprocmask (SIG_SETMASK, &ss, 0); 1383 sigprocmask (SIG_SETMASK, &ss, 0);
1554 1384
1555#ifndef __QNX__
1556 /* command interpreter path */ 1385 /* command interpreter path */
1557 if (argv != NULL) 1386 if (argv != NULL)
1558 { 1387 {
1559# ifdef DEBUG_CMD 1388# ifdef DEBUG_CMD
1560 int i; 1389 int i;
… …
1566 execvp (argv[0], (char *const *)argv); 1395 execvp (argv[0], (char *const *)argv);
1567 /* no error message: STDERR is closed! */ 1396 /* no error message: STDERR is closed! */
1568 } 1397 }
1569 else 1398 else
1570 { 1399 {
1571 const char *argv0, *shell; 1400 const char *argv0, *shell;
1572 1401
1573 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1402 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1574 shell = "/bin/sh"; 1403 shell = "/bin/sh";
1575 1404
1576 argv0 = (const char *)rxvt_r_basename (shell); 1405 argv0 = (const char *)rxvt_r_basename (shell);
1577 1406
1578 if (options & Opt_loginShell) 1407 if (option (Opt_loginShell))
1579 { 1408 {
1580 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1409 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1581 1410
1582 login[0] = '-'; 1411 login[0] = '-';
1583 strcpy (&login[1], argv0); 1412 strcpy (&login[1], argv0);
1584 argv0 = login; 1413 argv0 = login;
1585 } 1414 }
1415
1586 execlp (shell, argv0, NULL); 1416 execlp (shell, argv0, NULL);
1587 /* no error message: STDERR is closed! */ 1417 /* no error message: STDERR is closed! */
1588 } 1418 }
1589 1419
1590#else /* __QNX__ uses qnxspawn () */
1591
1592 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1593 char *command = NULL, fullcommand[_MAX_PATH];
1594 char **arg_v, *arg_a[2] = { NULL, NULL };
1595
1596 if (argv != NULL)
1597 {
1598 if (access (argv[0], X_OK) == -1)
1599 {
1600 if (strchr (argv[0], '/') == NULL)
1601 {
1602 searchenv (argv[0], "PATH", fullcommand);
1603
1604 if (fullcommand[0] != '\0')
1605 command = fullcommand;
1606 }
1607
1608 if (access (command, X_OK) == -1)
1609 return -1;
1610 }
1611 else
1612 command = argv[0];
1613
1614 arg_v = argv;
1615 }
1616 else
1617 {
1618 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1619 command = "/bin/sh";
1620
1621 arg_a[0] = my_basename (command);
1622
1623 if (options & Opt_loginShell)
1624 {
1625 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1626
1627 login[0] = '-';
1628 strcpy (&login[1], arg_a[0]);
1629 arg_a[0] = login;
1630 }
1631
1632 arg_v = arg_a;
1633 }
1634
1635 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1636 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1637 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1638 command, arg_v, environ, iov_a, 0);
1639 if (login)
1640 free (login);
1641
1642 pty.close_tty ();
1643 return pty.pty;
1644#endif
1645
1646 return -1; 1420 return -1;
1647} 1421}
1648 1422
1649/*----------------------- end-of-file (C source) -----------------------*/ 1423/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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